[chore]: cleanup

raexera · Jan 7, 2024 · f3dead5 · f3dead5
1 parent 15f9e94
commit f3dead5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 35 deletions.
diff --git a/hosts/yuki/default.nix b/hosts/yuki/default.nix
@@ -1,11 +1,8 @@
 {
   config,
-  lib,
   pkgs,
   ...
-}: let
-  inherit (lib) mkDefault;
-in {
+}: {
   imports = [
     ./hardware-configuration.nix
 
@@ -26,25 +23,10 @@ in {
 
   boot = {
     kernelModules = ["acpi_call"];
-    blacklistedKernelModules = ["nouveau"];
     extraModulePackages = with config.boot.kernelPackages; [acpi_call];
-    initrd.kernelModules = [
-      "i915"
-      "nvidia"
-      "nvidia_modeset"
-      "nvidia_uvm"
-      "nvidia_drm"
-      "ideapad_laptop"
-    ];
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = [
-      "quiet"
-      "splash"
-      "iommu=pt"
-      "i8042.direct"
-      "i8042.dumbkbd"
-      "i915.enable_psr=0"
-    ];
+    kernelParams = ["quiet" "splash"];
+
     loader = {
       efi.canTouchEfiVariables = true;
       grub = {
@@ -66,8 +48,6 @@ in {
 
     variables = {
       GDK_SCALE = "2";
-      NVD_BACKEND = "direct";
-      MOZ_DISABLE_RDD_SANDBOX = "1";
     };
   };
 
@@ -77,32 +57,30 @@ in {
       package = pkgs.bluez5-experimental;
     };
 
-    enableAllFirmware = mkDefault true;
+    enableAllFirmware = true;
 
     nvidia = {
-      package = mkDefault config.boot.kernelPackages.nvidiaPackages.beta;
-      modesetting.enable = mkDefault true;
-      powerManagement.enable = mkDefault true;
+      modesetting.enable = true;
+      powerManagement.enable = true;
       prime = {
         offload = {
           enable = true;
           enableOffloadCmd = true;
         };
-        intelBusId = mkDefault "PCI:0:2:0";
-        nvidiaBusId = mkDefault "PCI:1:0:0";
+        intelBusId = "PCI:0:2:0";
+        nvidiaBusId = "PCI:1:0:0";
       };
     };
 
     opengl = {
-      enable = mkDefault true;
-      driSupport = mkDefault true;
-      driSupport32Bit = mkDefault true;
+      enable = true;
+      driSupport = true;
+      driSupport32Bit = true;
       extraPackages = with pkgs; [
         intel-media-driver
         intel-ocl
         libvdpau-va-gl
         vaapiVdpau
-        nvidia-vaapi-driver
       ];
       extraPackages32 = with pkgs.pkgsi686Linux; [
         intel-media-driver
@@ -128,7 +106,7 @@ in {
       criticalPowerAction = "Hibernate";
     };
 
-    xserver.videoDrivers = mkDefault ["nvidia"];
+    xserver.videoDrivers = ["nvidia"];
   };
 
   zramSwap.enable = true;

diff --git a/hosts/yuki/hardware-configuration.nix b/hosts/yuki/hardware-configuration.nix
@@ -7,9 +7,10 @@
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
-  boot.initrd.kernelModules = [];
+  boot.initrd.kernelModules = ["i915" "nvidia" "nvidia_drm" "nvidia_modeset"];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
+  boot.kernelParams = ["module_blacklist=nouveau" "iommu=pt" "i915.enable_psr=0" "i8042.direct" "i8042.dumbkbd"];
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/NixOS-ROOT";