Merge b19a2d52a5 into 52113c4f5c

Rename some modules to their correct names

dell/precision/5520/default.nix

@@ -0,0 +1,47 @@
+{ lib, config, ... }:
+
+{
+  imports = [
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+    ../../../common/gpu/nvidia/maxwell
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/cpu/intel/kaby-lake
+  ];
+
+  boot = {
+    kernelParams = [
+      # fix lspci hanging with nouveau
+      # source https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1803179/comments/149
+      "acpi_rev_override=1"
+      "acpi_osi=Linux"
+      "nouveau.modeset=0"
+      "pcie_aspm=force"
+      "drm.vblankoffdelay=1"
+      "nouveau.runpm=0"
+      "mem_sleep_default=deep"
+      # fix flicker
+      # source https://wiki.archlinux.org/index.php/Intel_graphics#Screen_flickering
+      "i915.enable_psr=0"
+      "nvidia_drm.modeset=1"
+    ];
+  };
+
+  hardware = {
+    nvidia = {
+      open = lib.mkDefault false;
+      nvidiaSettings = lib.mkDefault true;
+      modesetting.enable = lib.mkDefault true;
+      package = lib.mkDefault config.boot.kernelPackages.nvidiaPackages.stable;
+      prime = {
+        intelBusId = lib.mkDefault "PCI:0:2:0";
+        nvidiaBusId = lib.mkDefault "PCI:1:0:0";
+      };
+    };
+  };
+  # This will save you money and possibly your life!
+  services = {
+    fwupd.enable = lib.mkDefault true;
+    thermald.enable = lib.mkDefault true;
+  };
+}

dell/precision/7520/default.nix

@@ -15,7 +15,7 @@
   boot.initrd.availableKernelModules = [
     "xhci_pci"
     "ahci"
-    "usb_storage"
+    "usb-storage"
     "sd_mod"
     "rtsx_pci_sdmmc"
   ];

flake.nix

@@ -128,6 +128,7 @@
           dell-precision-3490-intel = import ./dell/precision/3490/intel;
           dell-precision-3541 = import ./dell/precision/3541;
           dell-precision-5490 = import ./dell/precision/5490;
+          dell-precision-5520 = import ./dell/precision/5520;
           dell-precision-5530 = import ./dell/precision/5530;
           dell-precision-5560 = import ./dell/precision/5560;
           dell-precision-5570 = import ./dell/precision/5570;

focus/m2/gen1/default.nix

@@ -13,7 +13,7 @@
     "xhci_pci"
     "ahci"
     "nvme"
-    "usb_storage"
+    "usb-storage"
     "sd_mod"
     "rtsx_pci_sdmmc"
   ];

purism/librem/5r4/initrd.nix

@@ -14,7 +14,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
       "tps6598x"
       "xhci_hcd"
       "usbcore"
-      "usb_storage"
+      "usb-storage"
       "uas"
       "xhci_plat_hcd"
     ];
@@ -56,7 +56,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
       "tps6598x"
       "xhci_hcd"
       "usbcore"
-      "usb_storage"
+      "usb-storage"
       "uas"
       "xhci_plat_hcd"
     ];

raspberry-pi/3/default.nix

@@ -9,7 +9,7 @@
     kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi3;
     initrd.availableKernelModules = [
       "usbhid"
-      "usb_storage"
+      "usb-storage"
     ];
   };
 

raspberry-pi/4/default.nix

@@ -31,9 +31,9 @@
     kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi4;
     initrd.availableKernelModules = [
       "usbhid"
-      "usb_storage"
+      "usb-storage"
       "vc4"
-      "pcie_brcmstb" # required for the pcie bus to work
+      "pcie-brcmstb" # required for the pcie bus to work
       "reset-raspberrypi" # required for vl805 firmware to load
     ]
     ++ lib.optional config.boot.initrd.network.enable "genet";

raspberry-pi/5/default.nix

@@ -16,7 +16,7 @@ in
     initrd.availableKernelModules = [
       "nvme"
       "usbhid"
-      "usb_storage"
+      "usb-storage"
     ];
   };