more sensible config and nvidia option didn't really work like that

devices/ellaca/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ config, pkgs, ... }: {
   imports = [
     ./options.nix
   ];
@@ -50,11 +50,22 @@
     };
   };
 
+  services = {
+    xserver.videoDrivers = ["nvidia"];
+  };
+
   hardware = {
     enableRedistributableFirmware = true;
     enableAllFirmware = true;
     cpu.amd.updateMicrocode = true;
 
+
+    nvidia = {
+      modesetting.enable = true;
+      nvidiaSettings = false;
+      package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta;
+    };
+
     opengl = {
       enable = true;
       driSupport = true;

devices/ellaca/options.nix

@@ -3,7 +3,6 @@
 
   withAudio = true;
   withBluetooth = true;
-  withNvidia = true;
 
   withNiri = true;
   withGnome = false;

devices/inkvine/default.nix

@@ -49,7 +49,10 @@
   };
   swapDevices = [ { device = "/swap/swapfile"; } ];
 
-  services.thermald.enable = true;
+  services = {
+    thermald.enable = true;
+    upower.enable = true;
+  };
 
   hardware = {
     enableRedistributableFirmware = true;

devices/inkvine/options.nix

@@ -3,7 +3,6 @@
 
   withAudio = true;
   withBluetooth = true;
-  withNvidia = false;
 
   withNiri = true;
   withGnome = false;

devices/pleniscenta/options.nix

@@ -3,7 +3,6 @@
 
   withAudio = true;
   withBluetooth = true;
-  withNvidia = false;
 
   withNiri = true;
   withGnome = false;

modules/audio/default.nix

@@ -1,4 +1,6 @@
 { lib, config, ... }: lib.mkIf(config.withAudio) {
+  security.rtkit.enable = true;
+
   services.pipewire = {
     enable = true;
     alsa.enable = true;

modules/default.nix

@@ -7,7 +7,6 @@
     ./gnome
     ./home
     ./niri
-    ./nvidia
     ./virt
   ];
 
@@ -20,6 +19,9 @@
     };
   };
 
+  environment.sessionVariables = {
+    NIXOS_OZONE_WL = "1";
+  };
 
   nix = {
     nixPath = ["nixpkgs=${inputs.nixpkgs}"];
@@ -74,15 +76,6 @@
   # Needed for some features in nautilus such as auto-mounting and trash
   services.gvfs.enable = true;
 
-  security.rtkit.enable = true;
-
-  services.upower = {
-    enable = true;
-  };
-
-
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
   users.users.twoneis = {
     isNormalUser = true;
     description = "twoneis";

modules/nvidia/default.nix

@@ -1,9 +0,0 @@
-{ lib, config, ... }: lib.mkIf (config.withNvidia) {
-  services.xserver.videoDrivers = ["nvidia"];
-
-  hardware.nvidia = {
-    modesetting.enable = true;
-    nvidiaSettings = false;
-    package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta;
-  };
-}

options.nix

@@ -4,7 +4,6 @@
 
     withAudio = mkEnableOption "Enable support for audio";
     withBluetooth = mkEnableOption "Enable bluetooth";
-    withNvidia = mkEnableOption "Enable proprietary nvidia drivers";
 
     withNiri = mkEnableOption "Enable niri compositor";
     withGnome =mkEnableOption "Enable gnome DE";