upd

hosts/desktop/configuration.nix

@@ -26,6 +26,9 @@ let
       modprobe iwlwifi
     fi
   '';
+    fixWifiScript = pkgs.writeScriptBin "fix-wifi" ''
+    /home/matt/nix-config/scripts/fix-wifi.py
+  '';
 in
 {
   imports = [
@@ -35,6 +38,7 @@ in
     ./filesystems.nix
     ./sops.nix
     ../default.nix
+    ../../share/amd
     # specialisations
     # ./cosmic
     ./hyprland
@@ -120,14 +124,16 @@ in
         enable = lib.mkDefault true;
         path = [
           pkgs.bash
+          pkgs.python3
           pkgs.networkmanager
           pkgs.kmod
+          fixWifiScript
         ];
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
         serviceConfig = {
           Type = "oneshot";
-          ExecStart = [ "${resetNetworkScript}/bin/reset-network" ];
+          ExecStart = [ "${fixWifiScript}/bin/fix-wifi" ];
         };
       };
     };
@@ -174,6 +180,7 @@ in
   };
 
   virtualisation.libvirtd.enable = lib.mkDefault true;
+  virtualisation.waydroid.enable = lib.mkDefault true;
 
   programs.gamemode.enable = lib.mkDefault true;
 
@@ -196,6 +203,7 @@ in
       clinfo
       direnv
       efibootmgr
+      fixWifiScript
       gparted
       grsync
       kmod

hosts/desktop/hardware-configuration.nix

@@ -92,7 +92,12 @@
     fsType = "vfat";
   };
 
-  swapDevices = [ { device = "/dev/disk/by-uuid/c0b407c5-aaa6-4ff2-89e2-39ebee6bf235"; } ];
+  swapDevices = [
+    {
+      device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5P2NS0T307907H-part2";
+      randomEncryption.enable = true;
+    }
+  ];
 
   fileSystems."/home/matt/Games" = {
     device = "/dev/disk/by-uuid/1adb3161-ef9e-45d9-be5f-dd718186f1b3";

hosts/desktop/home.nix

@@ -61,8 +61,11 @@ in
     # gamescope # using chaotic git version
     # gamescope-wsi # using chaotic git version
     age
+    apple-cursor
     bottles
     chromium
+    colloid-icon-theme
+    colloid-kde
     compose2nix
     coolercontrol.coolercontrol-gui
     deadnix

hosts/nas/configuration.nix

@@ -84,6 +84,7 @@ in
       clinfo
       cmake
       coolercontrol.coolercontrol-gui
+      deconz
       duperemove
       efibootmgr
       ffmpeg
@@ -114,6 +115,7 @@ in
       tailscale
       tpm2-tools
       tpm2-tss
+      usbutils
       vim
       vulkan-tools
       wget

hosts/nas/impermanence.nix

@@ -29,6 +29,12 @@
         group = "root";
         mode = "u=rwx,g=rx,o=rx";
       }
+      {
+        directory = "/media/nas";
+        user = "nas-apps";
+        group = "jallen-nas";
+        mode = "u=rwx,g=rx,o=rx";
+      }
     ];
     files = [
       "/etc/machine-id"