pc: switch back to nvidia

flake.nix

@@ -121,7 +121,7 @@
                 };
                 nixpkgs =
                   { march = "znver4"; cuda = { enable = true; capabilities = [ "8.9" ]; forwardCompat = false; }; };
-                kernel.patches = [ "lantian" ];
+                kernel.patches = [ "cjktty" "lantian" ];
                 impermanence.enable = true;
                 networking.hostname = "pc";
                 sysctl.laptop-mode = 5;
@@ -129,18 +129,12 @@
               hardware =
               {
                 cpus = [ "amd" ];
-                gpus = [ "amd" "nvidia" ];
+                gpus = [ "nvidia" ];
                 bluetooth.enable = true;
                 joystick.enable = true;
                 printer.enable = true;
                 sound.enable = true;
                 legion.enable = true;
-                prime =
-                {
-                  enable = true;
-                  mode = "offload";
-                  busId = { amdgpu = "PCI:8:0:0"; nvidia = "PCI:1:0:0"; };
-                };
               };
               packages.packageSet = "workstation";
               virtualization =

modules/hardware/default.nix

@@ -117,7 +117,7 @@ inputs:
             };
             nvidia = mkIf (builtins.elem "nvidia" hardware.gpus)
             {
-              # modesetting.enable = true;
+              modesetting.enable = true;
               powerManagement.enable = true;
               dynamicBoost.enable = true;
               nvidiaSettings = true;

modules/system/kernel.nix

@@ -32,7 +32,7 @@ inputs:
       ];
       extraModulePackages = (with inputs.config.boot.kernelPackages; [ v4l2loopback ]) ++ kernel.modules.install;
       extraModprobeConfig = builtins.concatStringsSep "\n" kernel.modules.modprobeConfig;
-      kernelParams = [ "delayacct" "acpi_osi=Linux" "acpi.ec_no_wakeup=1" "amdgpu.sg_display=0" ];
+      kernelParams = [ "delayacct" "acpi_osi=Linux" "acpi.ec_no_wakeup=1" ];
       blacklistedKernelModules = [ "ideapad_laptop" ];
       kernelPackages = inputs.pkgs.linuxPackages_xanmod_latest;
       kernelPatches =