add .enable to modules, add nvidia module, add obs app

2 files changed, 12 insertions, 43 deletions

diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index 750b22a..828fd02 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -67,6 +67,7 @@
     rofi.enable = true;
     kanshi.enable = true;
     kitty.enable = true;
+    obs.enable = true;
   };
   browsers = {
     firefox.enable = true;
@@ -95,8 +96,15 @@
   };
 
   # modules
-  battery = true;
-  bluetooth = true;
-  network = true;
-  tpm = true;
+  battery.enable = true;
+  bluetooth.enable = true;
+  network.enable = true;
+  tpm.enable = true;
+  nvidia = {
+    enable = true;
+    primeBusIds = {
+      amdgpuBusId = "PCI:115:0:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
+  };
 }
diff --git a/hosts/shinji/hardware.nix b/hosts/shinji/hardware.nix
index ba4192c..b35c2a2 100644
--- a/hosts/shinji/hardware.nix
+++ b/hosts/shinji/hardware.nix
@@ -1,8 +1,6 @@
 {
   config,
   inputs,
-  pkgs,
-  lib,
   ...
 }: {
   # external defaults
@@ -46,43 +44,6 @@
   hardware.enableRedistributableFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
 
-  # nvidia
-  services.xserver.videoDrivers = ["modesetting" "nvidia"];
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement = {
-      enable = false;
-      finegrained = false;
-    };
-    prime = {
-      offload = {
-        enable = true;
-        enableOffloadCmd = true;
-      };
-      amdgpuBusId = "PCI:115:0:0";
-      nvidiaBusId = "PCI:1:0:0";
-    };
-    open = true;
-    nvidiaSettings = true;
-    package = let
-      pkg = config.boot.kernelPackages.nvidiaPackages.latest;
-    in pkg // {
-      open = pkg.open.overrideAttrs (finalAttrs: {
-        patches = (finalAttrs.patches or []) ++ [
-          (pkgs.fetchpatch {
-            name = "linux-6.19";
-            url = "https://raw.githubusercontent.com/CachyOS/CachyOS-PKGBUILDS/refs/heads/master/nvidia/nvidia-utils/kernel-6.19.patch";
-            hash = "sha256-YuJjSUXE6jYSuZySYGnWSNG5sfVei7vvxDcHx3K+IN4=";
-          })
-        ];
-      });
-    };
-  };
-  unfreePackages = [
-    "nvidia-x11"
-    "nvidia-settings"
-  ];
-
   # luks device
   boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/ad489bfa-4280-44ea-8ad2-60347b516d60";
   boot.initrd.luks.devices."swap".device = "/dev/disk/by-uuid/550e638d-eade-4d2f-aa39-c38774c91af3";