From c109a9482390a7f5044a5a606201709d307f4633 Mon Sep 17 00:00:00 2001
From: Benjamin Palko <benjaminpalko@hotmail.com>
Date: Fri, 12 Jul 2024 09:28:37 -0400
Subject: [PATCH] separate nvidia

---
 configuration.nix | 25 +------------------------
 nix/nvidia.nix    | 17 +++++++++++++++++
 nix/services.nix  |  2 --
 3 files changed, 18 insertions(+), 26 deletions(-)
 create mode 100644 nix/nvidia.nix

diff --git a/configuration.nix b/configuration.nix
index dd12ea9..da7d628 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -8,13 +8,13 @@
   imports =
     [ # Include the results of the hardware scan.
       /etc/nixos/hardware-configuration.nix
+      ./nix/nvidia.nix
       ./nix/services.nix
     ];
   nixpkgs.config.allowUnfree = true;
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
 
   # networking.hostName = "nixos"; # Define your hostname.
   # Pick only one of the below networking options.
@@ -115,19 +115,6 @@
   ];
   fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "JetBrainsMono"]; }) ];
 
-  hardware.graphics = {
-    enable = true;
-    extraPackages = with pkgs; [
-      nvidia-vaapi-driver
-    ];
-  };
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = false;
-    powerManagement.finegrained = false;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
-  };
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -151,16 +138,6 @@
     };
     starship.enable = true;
   };
-  # List services that you want to enable:
-  services = {
-    pipewire = {
-      enable = true;
-      pulse.enable = true;
-    };
-    hypridle.enable = true;
-    openssh.enable = true;
-    xserver.videoDrivers = ["nvidia"];
-  };
 
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
diff --git a/nix/nvidia.nix b/nix/nvidia.nix
new file mode 100644
index 0000000..6761507
--- /dev/null
+++ b/nix/nvidia.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+{
+  boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      nvidia-vaapi-driver
+    ];
+  };
+  hardware.nvidia = {
+    modesetting.enable = true;
+    powerManagement.enable = false;
+    powerManagement.finegrained = false;
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+  };
+  services.xserver.videoDrivers = ["nvidia"];
+}
diff --git a/nix/services.nix b/nix/services.nix
index 0a42e9e..f911573 100644
--- a/nix/services.nix
+++ b/nix/services.nix
@@ -9,6 +9,4 @@
   services.hypridle.enable = true;
   # SSH
   services.openssh.enable = true;
-  # VideoDrivers
-  services.xserver.videoDrivers = ["nvidia"];
 }