Merge 821388910a into 52113c4f5c

Rename some modules to their correct names

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

@@ -396,6 +396,7 @@
           rock-pi-e = import ./radxa/rock-pi-e;
           kobol-helios4 = import ./kobol/helios4;
           samsung-np900x3c = import ./samsung/np900x3c;
+          samsung-galaxybook-2-pro= import ./samsung/galaxybook-2-pro;
           slimbook-hero-rpl-rtx = import ./slimbook/hero/rpl-rtx;
           starfive-visionfive-v1 = import ./starfive/visionfive/v1;
           starfive-visionfive-2 = import ./starfive/visionfive/v2;

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"
     ];
   };
 

samsung/galaxybook-2-pro/default.nix

@@ -0,0 +1,48 @@
+###
+# Kernel module by Joshua Grisham, added features in readme
+# https://github.com/joshuagrisham/samsung-galaxybook-extras
+# only use it for kernel versions <6.14 default is disabled but you can deactivate with:
+# hardware.samsung-galaxybook.enableKmod =  false;
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: let
+  kernel_version_compatible = lib.versionOlder config.boot.kernelPackages.kernel.version "6.14";
+in {
+  imports = [
+    ../../common/cpu/intel/alder-lake
+    ../../common/gpu/intel/alder-lake
+    ../../common/pc/ssd
+    ../../common/pc/laptop
+  ];
+
+  options.hardware.samsung-galaxybook.enableKmod =
+    (
+      lib.mkEnableOption
+      "Enable the community created Samsung Galaxy Book kernel module that allows for additional features and functionality"
+    )
+    // {
+      default = kernel_version_compatible;
+      defaultText = "enabled by default on kernel < 6.14";
+    };
+
+  config = lib.mkMerge [
+    (
+      lib.mkIf config.hardware.samsung-galaxybook.enableKmod {
+        boot.extraModulePackages = [
+          (pkgs.callPackage ./kernel-module.nix {
+            kernel = config.boot.kernelPackages.kernel;
+          })
+        ];
+      }
+    )
+    {
+      boot.kernelModules = ["kvm-intel"];
+      boot.kernelParams = ["i915.enable_dpcd_backlight=3"];
+      boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"];
+      services.fprintd.enable = lib.mkDefault true;
+    }
+  ];
+}

samsung/galaxybook-2-pro/kernel-module.nix

@@ -0,0 +1,39 @@
+{ stdenv, kernel, fetchFromGitHub, lib }:
+
+stdenv.mkDerivation rec {
+  pname = "samsung-galaxybook-module";
+  version = "unstable-2025-01-29";
+
+  src = fetchFromGitHub {
+    owner = "joshuagrisham";
+    repo = "samsung-galaxybook-extras";
+    rev = "pre-6.14"; # or specific commit hash
+    hash = "sha256-srCGcmUI5ZKjndIWhSptG3hVkAo0dvDjJ4NoUkutaIA=";
+  };
+
+  nativeBuildInputs = [ kernel.dev ];
+  buildInputs = [ kernel ];
+
+  KERNEL_VERSION = kernel.modDirVersion;
+  KERNEL_SRC = "${kernel.dev}/lib/modules/${KERNEL_VERSION}/build";
+  INSTALL_MOD_PATH = placeholder "out";
+
+  buildPhase = ''
+    runHook preBuild
+    make -C $KERNEL_SRC M=$PWD modules
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    make -C $KERNEL_SRC M=$PWD modules_install
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Kernel module for Samsung Galaxybook devices";
+    homepage = "https://github.com/joshuagrisham/samsung-galaxybook-extras";
+    platforms = platforms.linux;
+    broken = lib.versionAtLeast kernel.version "6.14";
+  };
+}