diff --git a/hosts/desktop/boot.nix b/hosts/desktop/boot.nix
index a68c138..51e5c49 100755
--- a/hosts/desktop/boot.nix
+++ b/hosts/desktop/boot.nix
@@ -8,7 +8,10 @@ in
 {
   # Configure bootloader with lanzaboot and secureboot
   boot = {
-    kernelModules = [ "nct6775" ];
+    kernelModules = [
+      "nct6775"
+      "kvm-amd"
+    ];
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -19,6 +22,15 @@ in
     initrd = {
       verbose = false;
       systemd.enable = true;
+      availableKernelModules = [
+        "xhci_pci"
+        "nvme"
+        "ahci"
+        "usbhid"
+        "uas"
+        "usb_storage"
+        "sd_mod"
+      ];
     };
 
     plymouth = {
@@ -29,7 +41,7 @@ in
       enable = true;
       pkiBundle = "/etc/secureboot";
       settings = {
-#        default = default;
+        #        default = default;
         console-mode = "max";
       };
       configurationLimit = configLimit;
@@ -48,7 +60,7 @@ in
     bootspec.enable = true;
   };
 
-  environment.systemPackages = with pkgsVersion; [ 
+  environment.systemPackages = with pkgsVersion; [
     edk2-uefi-shell
-   ];
+  ];
 }
diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
index aaa8bfa..8a6c927 100755
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -10,19 +10,6 @@
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "nvme"
-    "ahci"
-    "usbhid"
-    "uas"
-    "usb_storage"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
   fileSystems."/" = {
     device = "none";
     fsType = "tmpfs";
diff --git a/hosts/desktop/networking.nix b/hosts/desktop/networking.nix
index e77e01a..255fc5b 100755
--- a/hosts/desktop/networking.nix
+++ b/hosts/desktop/networking.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, config, ... }:
 let
   hostname = "matt-nixos";
 in
@@ -8,8 +8,39 @@ in
     hostName = hostname;
 
     # Enable Network Manager
-    networkmanager.enable = lib.mkDefault true;
-    networkmanager.wifi.powersave = lib.mkDefault false;
-    networkmanager.settings.connectivity.uri = lib.mkDefault "http://nmcheck.gnome.org/check_network_status.txt";
+    networkmanager = {
+      enable = lib.mkDefault true;
+      wifi.powersave = lib.mkDefault false;
+      settings.connectivity.uri = lib.mkDefault "http://nmcheck.gnome.org/check_network_status.txt";
+      ensureProfiles = {
+        environmentFiles = [
+          config.sops.secrets.wifi.path
+        ];
+
+        profiles = {
+          "Joey's Jungle 6G" = {
+            connection = {
+              id = "Joey's Jungle 6G";
+              type = "wifi";
+            };
+            ipv4 = {
+              method = "auto";
+            };
+            ipv6 = {
+              addr-gen-mode = "stable-privacy";
+              method = "auto";
+            };
+            wifi = {
+              mode = "infrastructure";
+              ssid = "Joey's Jungle 6G";
+            };
+            wifi-security = {
+              key-mgmt = "sae";
+              psk = "$PSK";
+            };
+          };
+        };
+      };
+    };
   };
 }
\ No newline at end of file
diff --git a/hosts/nas/networking.nix b/hosts/nas/networking.nix
index 6dc188e..a38c16f 100755
--- a/hosts/nas/networking.nix
+++ b/hosts/nas/networking.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ config, ... }:
 let
   hostname = "jallen-nas";
   ports = [
@@ -24,7 +24,41 @@ in
     hostId = "4b501480";
 
     # Disable Network Manager
-    networkmanager.enable = true;
+    networkmanager = {
+      enable = true;
+      ensureProfiles = {
+        environmentFiles = [
+          config.sops.secrets.wifi.path
+        ];
+
+        profiles = {
+          "Joey's Jungle 6G" = {
+            connection = {
+              id = "Joey's Jungle 6G";
+              type = "wifi";
+            };
+            ipv4 = {
+              address1 = "10.0.1.18/24";
+              dns = "10.0.1.1";
+              gateway = "10.0.1.1";
+              method = "manual";
+            };
+            ipv6 = {
+              addr-gen-mode = "stable-privacy";
+              method = "auto";
+            };
+            wifi = {
+              mode = "infrastructure";
+              ssid = "Joey's Jungle 6G";
+            };
+            wifi-security = {
+              key-mgmt = "sae";
+              psk = "$PSK";
+            };
+          };
+        };
+      };
+    };
 
     nat = {
       enable = true;