Lots more moves, simplifiactions to options and removed code that peeved me off

hosts/envy/boot/default.nix

@@ -1,4 +1,8 @@
 { pkgs, ... }:
 {
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    lanzaboote.enable = true;
+    plymouth.enable = true;
+  };
 }

hosts/envy/default.nix

@@ -12,14 +12,12 @@
 
   networking = {
     hostName = "envy";
+    wireless.iwd.enable = true;
     wg-quick.interfaces.wgc.address = [ "10.100.0.25/24" ];
   };
 
   system = {
     desktop.enable = true;
-    lanzaboote.enable = true;
-    fancyboot.enable = true;
-    wireless.enable = true;
     stateVersion = "24.11";
   };
 }

hosts/intuos/boot/default.nix

@@ -1,4 +1,8 @@
 { pkgs, ... }:
 {
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    lanzaboote.enable = true;
+    plymouth.enable = true;
+  };
 }

hosts/intuos/default.nix

@@ -11,6 +11,7 @@
 
   networking = {
     hostName = "intuos";
+    wireless.iwd.enable = true;
     interfaces."wlan0".ipv4.addresses = [{
       address = "10.2.0.102";
       prefixLength = 8;
@@ -24,8 +25,6 @@
   system = {
     desktop.enable = true;
     lanzaboote.enable = true;
-    fancyboot.enable = true;
-    wireless.enable = true;
     stateVersion = "24.11";
   };
 }

hosts/kitty/boot/default.nix

@@ -1,4 +1,8 @@
 { pkgs, ... }:
 {
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    lanzaboote.enable = true;
+    plymouth.enable = true;
+  };
 }

hosts/kitty/default.nix

@@ -24,7 +24,6 @@
   system = {
     desktop.enable = true;
     lanzaboote.enable = true;
-    fancyboot.enable = true;
     stateVersion = "24.11";
   };
 }

hosts/midas/boot/default.nix

@@ -6,5 +6,6 @@
       enable = true;
       mdadmConf = "MAILADDR contact@nixfox.ca";
     };
+    lanzaboote.enable = true;
   };
 }

hosts/pear/boot/default.nix

@@ -1,4 +1,7 @@
 { pkgs, ... }:
 {
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    plymouth.enable = true;
+  };
 }

hosts/pear/default.nix

@@ -12,13 +12,12 @@
 
   networking = {
     hostName = "pear";
+    wireless.iwd.enable = true;
     wg-quick.interfaces.wgc.address = [ "10.100.0.18/24" ];
   };
 
   system = {
     desktop.enable = true;
-    fancyboot.enable = true;
-    wireless.enable = true;
     stateVersion = "24.11";
   };
 }

hosts/prophet/default.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 {
   imports = [
     ./boot

hosts/redmond/boot/default.nix

@@ -6,5 +6,7 @@
       "radeon.cik_support=0"
       "amdgpu.cik_support=1"
     ];
+    lanzaboote.enable = true;
+    plymouth.enable = true;
   };
 }

hosts/redmond/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 {
   imports = [
     ./boot
@@ -11,14 +11,12 @@
 
   networking = {
     hostName = "redmond";
+    wireless.iwd.enable = true;
     wg-quick.interfaces.wgc.address = [ "10.100.0.23/24" ];
   };
 
   system = {
     desktop.enable = true;
-    lanzaboote.enable = true;
-    fancyboot.enable = true;
-    wireless.enable = true;
     stateVersion = "24.05";
   };
 

hosts/tower/boot/default.nix

@@ -19,12 +19,14 @@ in {
     kernelPackages = pkgsUnstable.linuxPackages_xanmod_stable;
     kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:1f82,10de:10fa" ];
 
-    # Needed for GPU passthrough
+    # Load into GPU before NVIDIA driver
     initrd.kernelModules = [
       "vfio"
       "vfio_pci"
       "vfio_iommu_type1"
     ];
+
+    lanzaboote.enable = true;
   };
 
   # Use second GPU on boot
@@ -35,8 +37,7 @@ in {
 
   # Use Nouveau
   specialisation.nouveau.configuration.config = {
-    system.video.nvidia.enable = lib.mkForce false;
+    system.nvidia.enable = lib.mkForce false;
-    system.video.nouveau.enable = lib.mkForce true;
     environment.sessionVariables.NIXOS_OZONE_WL = lib.mkForce "";
   };
 }

hosts/tower/default.nix

@@ -24,8 +24,7 @@
 
   system = {
     desktop.enable = true;
-    lanzaboote.enable = true;
+    nvidia.enable = true;
-    video.nvidia.enable = true;
     stateVersion = "24.05";
   };
 

modules/system/devices/boot/default.nix

@@ -9,6 +9,7 @@
   ];
 
   boot = {
+    kernelParams = [ "nouveau.config=NvGspRm=1" ];
     blacklistedKernelModules = [ "pcspkr" ];
     kernel.sysctl = {
       "vm.max_map_count" = 2147483642;

modules/system/devices/boot/lanzaboote/default.nix

@@ -2,16 +2,10 @@
 {
   imports = [ lanzaboote.nixosModules.lanzaboote ];
 
-  options.system.lanzaboote.enable = lib.mkEnableOption "Enable lanzaboote";
+  boot = lib.mkIf config.boot.lanzaboote.enable {
-
-  config = lib.mkIf config.system.lanzaboote.enable {
-    boot = {
     loader.systemd-boot.enable = lib.mkForce false;
-      lanzaboote = {
+    lanzaboote.pkiBundle = "/etc/secureboot";
-        enable = true;
-        pkiBundle = "/etc/secureboot";
-      };
   };
+
   environment.systemPackages = with pkgs; [ sbctl ];
-  };
 }

modules/system/devices/boot/plymouth/default.nix

@@ -1,9 +1,6 @@
 { config, lib, ... }:
 {
-  options.system.fancyboot.enable = lib.mkEnableOption "Enable Plymouth";
+  config.boot = lib.mkIf config.boot.plymouth.enable {
-
-  config.boot = lib.mkIf config.system.fancyboot.enable {
-    plymouth.enable = true;
     loader.timeout = lib.mkForce 0;
     consoleLogLevel = lib.mkForce 0;
     initrd.verbose = false;

modules/system/devices/boot/systemd/default.nix

@@ -3,5 +3,6 @@
   boot.loader.systemd-boot = {
     enable = true;
     editor = false;
+    graceful = true;
   };
 }

modules/system/devices/networking/default.nix

@@ -1,7 +1,5 @@
 { config, ... }:
 {
-  imports = [ ./wireless ];
-
   networking = {
     wireless.enable = false;
     dhcpcd.enable = true;

modules/system/devices/networking/wireless/default.nix

@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  options.system.wireless.enable = lib.mkEnableOption "Enable wireless stack";
-
-  config = lib.mkIf config.system.wireless.enable {
-    networking.wireless.iwd.enable = true;
-
-    environment = {
-      systemPackages = with pkgs; [ impala ];
-      persistence."/persist".directories = [ "/var/lib/iwd/" ];
-    };
-  };
-}

modules/system/devices/video/default.nix

@@ -1,9 +1,6 @@
 { config, pkgs, ... }:
 {
-  imports = [
+  imports = [ ./nvidia ];
-    ./nvidia
-    ./nouveau
-  ];
 
   hardware.graphics = {
     enable = config.system.desktop.enable;

modules/system/devices/video/nouveau/default.nix

@@ -1,9 +0,0 @@
-{ config, lib, ... }:
-{
-  options.system.video.nouveau.enable = lib.mkEnableOption "Enable the Nouveau graphics stack";
-
-  config = lib.mkIf config.system.video.nouveau.enable {
-    services.xserver.videoDrivers = [ "nouveau" ];
-    boot.kernelParams = [ "nouveau.config=NvGspRm=1" ];
-  };
-}

modules/system/devices/video/nvidia/default.nix

@@ -1,19 +1,17 @@
 { config, lib, pkgs, ... }:
 {
-  options.system.video.nvidia.enable = lib.mkEnableOption "Enable the Nvidia graphics stack";
+  options.system.nvidia.enable = lib.mkEnableOption "Enable the Nvidia graphics stack";
 
-  config = lib.mkIf config.system.video.nvidia.enable {
+  config = lib.mkIf config.system.nvidia.enable {
-    hardware = {
+    hardware.nvidia = {
-      nvidia = lib.mkIf config.system.video.nvidia.enable {
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
       modesetting.enable = true;
       nvidiaSettings = false;
-        package = config.boot.kernelPackages.nvidiaPackages.beta;
       open = false;
     };
-      graphics.extraPackages = with pkgs; [ nvidia-vaapi-driver ];
-    };
 
     services.xserver.videoDrivers = [ "nvidia" ];
+
     boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
 
     nixpkgs.allowUnfreePackages = [ "nvidia-x11" ];

modules/system/services/general/default.nix

@@ -5,6 +5,7 @@
     ./earlyoom
     ./gnome-keyring
     ./gvfs
+    ./iwd
     ./keyd
     ./libvirtd
     ./portals

modules/system/services/general/iwd/default.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+{
+  environment = lib.mkIf config.networking.wireless.iwd.enable {
+    systemPackages = with pkgs; [ impala ];
+    persistence."/persist".directories = [ "/var/lib/iwd/" ];
+  };
+}