update nas

hosts/default.nix

@@ -27,7 +27,7 @@ in
 
   # Configure nixpkgs
   # Enable non free
-  nixpkgs.config.allowUnfree = lib.mkDefault true;
+  nixpkgs.config.allowUnfree = lib.mkForce true;
 
   # Hardware configs
   hardware = {
@@ -35,7 +35,7 @@ in
     bluetooth.enable = lib.mkDefault true;
 
     # Enable all firmware
-    enableAllFirmware = lib.mkDefault true;
+    enableAllFirmware = lib.mkForce true;
 
     # Disable pulse audio in favor of pipewire
     pulseaudio.enable = false;
@@ -46,7 +46,7 @@ in
     openssh.enable = lib.mkDefault true;
 
     # Enable firmware updates
-    fwupd.enable = lib.mkDefault true;
+    fwupd.enable = lib.mkForce true;
 
     fstrim.enable = lib.mkDefault true;
 

hosts/nas/networking.nix

@@ -26,7 +26,7 @@ in
 
     interfaces = {
       wlp6s0 = {
-        useDHCP = false;
+        useDHCP = true;
         ipv4.addresses = [
           {
             address = ipAddress;
@@ -35,16 +35,6 @@ in
         ];
       };
 
-      wlp7s0 = {
-        useDHCP = false;
-        ipv4.addresses = [
-          {
-            address = ipAddress2;
-            prefixLength = 24;
-          }
-        ];
-      };
-
       # br0 = {
       #   useDHCP = false;
       #   ipv4.addresses = [
@@ -67,15 +57,26 @@ in
 
     wireless = {
       enable = true;
+      userControlled.enable = true;
       secretsFile = config.sops.secrets."wifi".path;
+      allowAuxiliaryImperativeNetworks = true;
+      interfaces = [
+        "wlp6s0"
+      ];
       networks = {
-        "Joey's Jungle 5G" = {
-          pskRaw = "ext:PSK";
-        };
         "Joey's Jungle 6G" = {
-          pskRaw = "ext:PSK";
-          priority = 1000;
+#          pskRaw = "ext:PSK";
+#          priority = 1000;
+          psk = "kR8v&3Qd";
+          extraConfig = ''
+            key_mgmt=SAE
+            ieee80211w=2
+          '';
         };
+#        "Joey's Jungle 5G" = {
+#          pskRaw = "ext:PSK";
+#          priority = 1;
+#        };
       };
     };
 

hosts/nas/services.nix

@@ -28,7 +28,7 @@ in
     };
 
     adguardhome = {
-      enable = true;
+      enable = false;
       allowDHCP = true;
       port = 1880;
       openFirewall = true;
@@ -65,7 +65,7 @@ in
         };
         dhcp = {
           enabled = true;
-          interface_name = "wlp7s0";
+          interface_name = "wlp6s0";
           dhcpv4 = {
             gateway_ip = "10.0.1.1";
             subnet_mask = "255.255.255.0";
@@ -133,7 +133,7 @@ in
     };
 
     tailscale = {
-      enable = true;
+      enable = false;
       openFirewall = true;
       useRoutingFeatures = "client";
       extraUpFlags = [ "--advertise-exit-node" ];