feat: move nvidia to module option; re-org driver modules

hosts/nyx/default.nix

@@ -15,8 +15,11 @@ in {
 
   marleyos = {
     profiles = {
-      desktop = enabled;
-      hardware.nvidia = enabled;
+      desktop = true;
+    };
+
+    hardware = {
+      nvidia = enabled;
     };
 
     mounts.babeshare = enabled;

modules/home/option-inheritance.nix

@@ -4,10 +4,6 @@ in {
   marleyos = {
     profiles = {
       inherit (cfg.profiles) desktop server;
-
-      hardware = {
-        inherit (cfg.profiles.hardware) nvidia;
-      };
     };
 
     my = {

modules/nixos/default.nix

@@ -5,5 +5,6 @@
     ../base
 
     ./base
+    ./hardware
   ];
 }

modules/nixos/hardware/audio.nix

@@ -1,11 +1,11 @@
 {
-  pkgs,
-  config,
   lib,
+  config,
+  pkgs,
   ...
 }: {
   config = lib.mkIf (!config.marleyos.profiles.server) {
-    security.rtkit.enable = true; # Used for pulseaudio.
+    security.rtkit.enable = true; # for pulseaudio
 
     hardware.pulseaudio.enable = false;
 
@@ -15,8 +15,6 @@
         alsa.enable = true;
         pulse.enable = true;
       };
-
-      printing.enable = true;
     };
 
     environment.systemPackages = [pkgs.pwvucontrol];

modules/nixos/hardware/default.nix

@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./audio.nix
+    ./nvidia.nix
+
+    ./misc.nix # try to use this as little as possible
+  ];
+}

modules/nixos/hardware/misc.nix

@@ -0,0 +1,3 @@
+{
+  services.printing.enable = true;
+}

modules/nixos/hardware/nvidia.nix

@@ -3,9 +3,9 @@
   config,
   ...
 }: let
-  cfg = config.marleyos.nvidia;
+  cfg = config.marleyos.hardware.nvidia;
 in {
-  options.marleyos.nvidia.enable = lib.mkEnableOption "nvidia";
+  options.marleyos.hardware.nvidia.enable = lib.mkEnableOption "nvidia";
 
   config = lib.mkIf cfg.enable {
     # NVIDIA drivers are unfree.

modules/options/profiles.nix

@@ -2,9 +2,5 @@
   options.marleyos.profiles = {
     desktop = lib.mkEnableOption "graphical desktop profile";
     server = lib.mkEnableOption "server profile";
-
-    hardware = {
-      nvidia = lib.mkEnableOption "Nvidia profile";
-    };
   };
 }