moar options

modules/collections/desktop.nix

@@ -15,9 +15,6 @@
     ../graphical/openrgb.nix
     ../graphical/plasma.nix
     ../graphical/shared.nix
-    ../hardware/firmware.nix
-    ../hardware/nvidia.nix
-    ../hardware/ssd.nix
     ../kernel.nix # use latest kernel
     ../nix/index.nix
     ../nix/ld.nix
@@ -29,11 +26,16 @@
   ];
 
   kop = {
-    hardware.wooting.enable = true;
     tmpfs.enable = true;
     wireshark.enable = true;
     virt-manager.enable = true;
     nftables.enable = true;
     cli-tools.enable = true;
+    hardware = {
+      nvidia.enable = true;
+      firmware.enable = true;
+      ssd.enable = true;
+      wooting.enable = true;
+    };
   };
 }

modules/collections/laptop.nix

@@ -5,5 +5,9 @@
     tmpfs.enable = true;
     wireshark.enable = true;
     virt-manager.enable = true;
+    hardware = {
+      firmware.enable = true;
+      ssd.enable = true;
+    };
   };
 }

modules/collections/server.nix

@@ -30,12 +30,14 @@
     ../motd.nix
     ../nix/settings.nix
     ../static-ip.nix
-    ### Hardware ###
-    ../hardware/ssd.nix
   ];
 
   kop = {
     cli-tools.enable = true;
     tmpfs.enable = true;
+    hardware = {
+      firmware.enable = true;
+      ssd.enable = true;
+    };
   };
 }

modules/default.nix

@@ -4,13 +4,9 @@
     ./fh
     ./graphical
     ./hardware
+    ./misc
     ./nix
     ./services
     ./support
-        ./tmpfs.nix
-        ./wireshark.nix
-        ./virt-manager.nix
-        ./nftables.nix
-        ./cli-tools.nix
   ];
 }

modules/hardware/default.nix

@@ -1,6 +1,11 @@
 { pkgs, config, ...}:
 {
   imports = [
+    ./firmware.nix
+    ./nvidia.nix
+    ./scheduler.nix
+    ./ssd.nix
+    ./vfio.nix
     ./wooting.nix
   ];
 }

modules/hardware/firmware.nix

@@ -1,3 +1,15 @@
+{config, lib, ...}:
+with lib;
+let
+  cfg = config.kop.hardware.firmware;
+in
 {
+  options.kop.hardware.firmware = {
+    enable = mkEnableOption "Enables firmware";
+  };
+  
+  config = mkIf cfg.enable {
     services.fwupd.enable = true;
+  };
 }
+

modules/hardware/nvidia.nix

@@ -1,5 +1,14 @@
-{config, pkgs, ...}:
+{lib, config, pkgs, ...}:
+with lib;
+let
+  cfg = config.kop.hardware.nvidia;
+in
 {
+  options.kop.hardware.nvidia = {
+    enable = mkEnableOption "Enables nvidia gpus";
+  };
+  
+  config = mkIf cfg.enable {
     # Enable OpenGL
     hardware.opengl = {
       enable = true;
@@ -30,4 +39,5 @@
       # Optionally, you may need to select the appropriate driver version for your specific GPU.
       package = config.boot.kernelPackages.nvidiaPackages.beta;
     };
+  };
 }

modules/hardware/scheduler.nix

@@ -1,7 +1,19 @@
+{config, lib, ...}:
+with lib;
+let
+    cfg = config.kop.hardware.scheduler;
+in
 {
+    options.kop.hardware.scheduler = {
+        enable = mkEnableOption "Enables scheduler";
+    };
+    
+    config = mkIf cfg.enable {
         services.system76-scheduler = {
             enable = true;
         };
     
         hardware.system76.enableAll = true;
+    };
 }
+

modules/hardware/ssd.nix

@@ -1,3 +1,15 @@
+{config, lib, ...}:
+with lib;
+let
+    cfg = config.kop.hardware.ssd;
+in
 {
+    options.kop.hardware.ssd = {
+        enable = mkEnableOption "Enables fstrim";
+    };
+    
+    config = mkIf cfg.enable {
         services.fstrim.enable = true;
+    };
 }
+

modules/hardware/vfio.nix

@@ -1,6 +1,16 @@
 { pkgs, lib, config, ... }:
+with lib;
+let
+  cfg = config.kop.hardware.vfio;
+in
 {
+  options.kop.hardware.vfio = {
+    enable = mkEnableOption "Enables vfio";
+  };
+  
+  config = mkIf cfg.enable {
     config = lib.mkIf config.virtualisation.libvirtd.enable {
       boot.kernelParams = [ "amd_iommu=on" ];
     };
+  };
 }

modules/misc/default.nix

@@ -0,0 +1,10 @@
+{ pkgs, config, ...}:
+{
+  imports = [
+    ./wireshark.nix
+    ./virt-manager.nix
+    ./nftables.nix
+    ./cli-tools.nix
+    ./tmpfs.nix
+  ];
+}