2 files changed, 21 insertions, 37 deletions
diff --git a/hosts/yashinoki/configuration.nix b/hosts/yashinoki/configuration.nix
index 8df933e..c7a30b0 100644
--- a/hosts/yashinoki/configuration.nix
+++ b/hosts/yashinoki/configuration.nix
@@ -5,14 +5,15 @@ let
 in {
   imports = [
     ./hardware-configuration.nix
-    ../../nix/scripts.nix
     ../../nix/user.nix
     ../../nix/system.nix
     ../../nix/audio.nix
     ../../nix/bluetooth.nix
     ../../nix/email.nix
     ../../nix/intel.nix
-    ../../nix/programs/zsh.nix
+    ../../nix/virtualisation.nix
+    ../../nix/scripts.nix
+    ../../nix/programs/bash.nix
     ../../nix/programs/nvim.nix
     ../../nix/programs/sway.nix
     ../../nix/programs/kitty.nix
@@ -56,11 +57,12 @@ in {
   };
 
   nix.settings.system-features = [ "gccarch-skylake" ];
-#  nixpkgs.hostPlatform = {
-#    gcc.arch = "skylake";
-#    gcc.tune = "skylake";
-#    system = "x86_64-linux";
-#  };
+  nixpkgs.hostPlatform = {
+    #gcc.arch = "skylake";
+    #gcc.tune = "skylake";
+    system = "x86_64-linux";
+  };
+  boot.binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.supportedFilesystems = [ ];
@@ -96,17 +98,19 @@ in {
 
   networking = {
     hostName = "yashinoki";
-    useNetworkd = true;
-    wireless = {
+    nameservers = [
+      "9.9.9.9"
+      "149.112.112.112"
+      "1.1.1.1"
+      "1.0.0.1"
+    ];
+    useDHCP = false;
+    dhcpcd.enable = false;
+    networkmanager = {
       enable = true;
-      userControlled.enable = true;
-      fallbackToWPA2 = false;
-      networks."Verizon_TMKS9N" = {
-        pskRaw = "794b2c76b39a7f83d08e028e20fb980cef890424ae0b69acdf2e37c590a9fb6a";
-        authProtocols = [ "WPA-PSK" "WPA-EAP" "FT-PSK" "FT-EAP" ];
-      };
+      dns = "none";
+      wifi.powersave = true;
     };
-    nameservers = [ "9.9.9.9" "149.112.112.112" ];
     firewall = {
       enable = true;
       allowedTCPPorts = [];
@@ -119,24 +123,7 @@ in {
       173.62.191.72 boomerang
     '';
   };
-  systemd.network = {
-    enable = true;
-    networks."wlp3s0" = {
-      enable = true;
-      name = "wlp3s0";
-      dhcpV6Config.UseDNS = false;
-      dhcpV4Config.UseDNS = false;
-    };
-  };
-  services.resolved = {
-    enable = true;
-    dnssec = "true";
-    domains = [ "~." ];
-    fallbackDns = [ "1.1.1.1" "1.0.0.1" ];
-    extraConfig = ''
-      DNSOverTLS=yes
-    '';
-  };
+  users.users.andrew.extraGroups = [ "networkmanager" ];
 
   fileSystems."/home/andrew/c" = {
     device = "192.168.1.206:/home/andrew/c";
diff --git a/hosts/yashinoki/hardware-configuration.nix b/hosts/yashinoki/hardware-configuration.nix
index 678dcb5..fe5e08d 100644
--- a/hosts/yashinoki/hardware-configuration.nix
+++ b/hosts/yashinoki/hardware-configuration.nix
@@ -33,8 +33,5 @@
     [ { device = "/dev/yashinoki-vg0/swap"; }
     ];
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }