From 10f377c490544dc426e12cce55658fc0b551a9ca Mon Sep 17 00:00:00 2001
From: KaitoTLex <wlin@kaitotlex.systems>
Date: Tue, 27 May 2025 09:20:48 -0700
Subject: [PATCH] Possible fix for the Nvidia Driver

---
 flake.nix                               |  5 ++--
 hosts/kuroko/configuration.nix          | 32 ++++++++++++-------------
 hosts/kuroko/hardware-configuration.nix |  8 +++----
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9a18527..f37dc33 100644
--- a/flake.nix
+++ b/flake.nix
@@ -87,11 +87,12 @@
                   ./users/kaitotlex
                   {
                     wayland.windowManager.hyprland.settings.monitor = [
-                      "eDP-1,1920x1200@120,0x0,.90"
+                      "eDP-1,1920x1200@120,0x0,1"
+                      "HDMI-A-1,1920x1080@165,1920x0,1"
                     ];
                     programs.git.signing = {
                       signByDefault = true;
-                      key = "BC04C0C14AEDA705B8FBACE8C5F52A3C0F3B4A77";
+                      key = "42F52D76F1B15B8D997E2AEE8AB934746F475D0B";
                     };
                   }
                 ];
diff --git a/hosts/kuroko/configuration.nix b/hosts/kuroko/configuration.nix
index 7662236..442ad28 100644
--- a/hosts/kuroko/configuration.nix
+++ b/hosts/kuroko/configuration.nix
@@ -18,6 +18,7 @@
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
   virtualisation.waydroid.enable = true;
   #boot.kernelPackages = pkgs.linuxPackages_5_15;
   #systemdefaults
@@ -28,21 +29,23 @@
   boot.kernelParams = [
     "mem_sleep_default=deep"
   ];
-  systemd.sleep.extraConfig = ''
-    AllowSuspend=yes
-    AllowHibernation=yes
-    AllowHybridSleep=yes
-    AllowSuspendThenHibernate=yes
-  '';
+  # systemd.sleep.extraConfig = ''
+  #   AllowSuspend=yes
+  #   AllowHibernation=yes
+  #   AllowHybridSleep=yes
+  #   AllowSuspendThenHibernate=yes
+  # '';
 
   #Nvidia Hardware begins
   services.xserver.videoDrivers = [
-    "nvidia"
     "amdgpu"
+    "nvidia"
   ];
   hardware.graphics.enable = true;
   hardware.graphics.enable32Bit = true;
-
+  hardware.graphics.extraPackages = with pkgs; [
+    amdvlk
+  ];
   hardware.nvidia = {
     # custom option defined in graphics/default.nix
     #usePatchedAquamarine = true;
@@ -58,7 +61,7 @@
 
     # Fine-grained power management. Turns off GPU when not in use.
     # Experimental and only works on modern Nvidia GPUs (Turing or newer).
-    powerManagement.finegrained = lib.mkForce false;
+    powerManagement.finegrained = lib.mkForce true;
 
     # Use the NVidia open source kernel module (not to be confused with the
     # independent third-party "nouveau" open source driver).
@@ -67,7 +70,7 @@
     # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
     # Only available from driver 515.43.04+
     # Currently alpha-quality/buggy, so false is currently the recommended setting.
-    open = lib.mkForce true;
+    open = lib.mkForce false;
 
     # Enable the Nvidia settings menu,
     # accessible via `nvidia-settings`.
@@ -77,14 +80,11 @@
     package = config.boot.kernelPackages.nvidiaPackages.beta;
     #Power Saving Features
     prime = {
-      offload = {
-        enable = true;
-        enableOffloadCmd = true;
-      };
+      offload.enable = lib.mkForce true;
       # Make sure to use the correct Bus ID values for your system!
       #intelBusId = "PCI:";
-      nvidiaBusId = "PCI:01:00:0";
-      amdgpuBusId = "PCI:08:00:0";
+      nvidiaBusId = "PCI:1:0:0";
+      amdgpuBusId = "PCI:8:0:0";
     };
 
   };
diff --git a/hosts/kuroko/hardware-configuration.nix b/hosts/kuroko/hardware-configuration.nix
index 1120d78..c970984 100644
--- a/hosts/kuroko/hardware-configuration.nix
+++ b/hosts/kuroko/hardware-configuration.nix
@@ -8,20 +8,20 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/50c34d14-4b3a-483c-874e-b6412a474cfe";
+    { device = "/dev/disk/by-uuid/def95f35-9630-4015-9e21-97d9518a014d";
       fsType = "ext4";
     };
 
-  boot.initrd.luks.devices."luks-efb1b312-b89c-493e-952a-f70fc2ab0fbf".device = "/dev/disk/by-uuid/efb1b312-b89c-493e-952a-f70fc2ab0fbf";
+  boot.initrd.luks.devices."luks-c69579ed-9b9c-4435-b329-e5c95c945823".device = "/dev/disk/by-uuid/c69579ed-9b9c-4435-b329-e5c95c945823";
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1826-F6B8";
+    { device = "/dev/disk/by-uuid/02A5-BCDF";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };