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

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";
-
-  config = lib.mkIf config.system.lanzaboote.enable {
-    boot = {
-      loader.systemd-boot.enable = lib.mkForce false;
-      lanzaboote = {
-        enable = true;
-        pkiBundle = "/etc/secureboot";
-      };
-    };
-    environment.systemPackages = with pkgs; [ sbctl ];
+  boot = lib.mkIf config.boot.lanzaboote.enable {
+    loader.systemd-boot.enable = lib.mkForce false;
+    lanzaboote.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.system.fancyboot.enable {
-    plymouth.enable = true;
+  config.boot = lib.mkIf config.boot.plymouth.enable {
     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 = [
-    ./nvidia
-    ./nouveau
-  ];
+  imports = [ ./nvidia ];
 
   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 {
-    hardware = {
-      nvidia = lib.mkIf config.system.video.nvidia.enable {
-        modesetting.enable = true;
-        nvidiaSettings = false;
-        package = config.boot.kernelPackages.nvidiaPackages.beta;
-        open = false;
-      };
-      graphics.extraPackages = with pkgs; [ nvidia-vaapi-driver ];
+  config = lib.mkIf config.system.nvidia.enable {
+    hardware.nvidia = {
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
+      modesetting.enable = true;
+      nvidiaSettings = false;
+      open = false;
     };
-    
+
     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/" ];
+  };
+}