updated options structure

devices/desktop/default.nix

@@ -1,6 +1,7 @@
-{ config, pkgs, ... }: {
+{ pkgs, ... }: {
   imports = [
     ./hardware-config.nix
+    ./nvidia.nix
     ./options.nix
   ];
 
@@ -28,18 +29,6 @@
     driSupport32Bit = true;
   };
 
-  # Load nvidia driver
-  services.xserver.videoDrivers = ["nvidia"];
-
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = false;
-    powerManagement.finegrained = false;
-    open = false;
-    nvidiaSettings = false;
-    package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta;
-  };
-
   hardware.bluetooth = {
     enable = true;
     powerOnBoot = true;

devices/desktop/nvidia.nix

@@ -0,0 +1,14 @@
+{ config, ... }: {
+  # Load nvidia driver
+  services.xserver.videoDrivers = ["nvidia"];
+
+  hardware.nvidia = {
+    modesetting.enable = true;
+    powerManagement.enable = false;
+    powerManagement.finegrained = false;
+    open = false;
+    nvidiaSettings = false;
+    package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta;
+  };
+
+}

devices/desktop/options.nix

@@ -1,7 +1,8 @@
 { ... }: {
   withNiri = false;
   withGnome = true;
+  withNvidia = true;
   withVM = false;
-  withDistrobox = false;
+  withDistrobox = true;
   withGames = false;
 }

modules/system/default.nix

@@ -2,15 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
-  options = {
-    withNiri = with lib; mkEnableOption "Enable Niri";
-    withGnome = with lib; mkEnableOption "Enable Gnome";
-    withVM = with lib; mkEnableOption "Enable VM related configuration";
-    withDistrobox = with lib; mkEnableOption "Enable Distrobox";
-    withGames = with lib; mkEnableOption "Enable games";
-  };
-
   imports = [
     ./audio.nix
     ./containers.nix
@@ -22,8 +14,6 @@
     ./virt.nix
   ];
 
-  config = {
-
   networking.extraHosts = 
   ''
     10.10.11.245 surveillance.htb
@@ -100,5 +90,4 @@
   # Use zsh
   programs.zsh.enable = true;
   users.defaultUserShell = pkgs.zsh;
-  };
 }

options.nix

@@ -0,0 +1,10 @@
+{ lib, ... }: {
+  options = {
+    withNiri = with lib; mkEnableOption "Enable niri compositor";
+    withGnome = with lib; mkEnableOption "Enable gnome DE";
+    withNvidia = with lib; mkEnableOption "Enable proprietary nvidia drivers";
+    withVM = with lib; mkEnableOption "Enable VM related configuration";
+    withDistrobox = with lib; mkEnableOption "Enable Distrobox";
+    withGames = with lib; mkEnableOption "Enable games";
+  };
+}

outputs.nix

@@ -1,7 +1,9 @@
-{ nixpkgs, home-manager, nixos-hardware, nur, niri, ... }@inputs: {
+{ nixpkgs, home-manager, nixos-hardware, nur, niri, ... }: {
   nixosConfigurations = let
+
     clientModules = [
         ./modules/system
+        ./options.nix
         niri.nixosModules.niri
         home-manager.nixosModules.home-manager {
           nixpkgs.overlays = [
@@ -14,8 +16,10 @@
           };
         }
     ];
+
     serverModules = [
       ./modules/server
+      ./options.nix
       home-manager.nixosModules.home-manager {
         home-manager = {
           useGlobalPkgs = true;
@@ -24,6 +28,7 @@
         };
       }
     ];
+
   in {
     desktop = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";