refactor: switch default from latest to default nixpkgs kernel

rafaelsgirao · Sep 19, 2024 · dbfa08a · dbfa08a
1 parent 63f23e4
commit dbfa08a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/modules/core/default.nix b/modules/core/default.nix
@@ -28,6 +28,12 @@ in
   };
   zramSwap.memoryPercent = 25;
 
+  # Note to future self:
+  # This used to be the latest kernel ZFS supported (there's a nix option for that),
+  # but on `vin` this broke Intel WiFi/bluetooth drivers when switched to kernel 6.10-gnu something (was 6.6.48)
+  # Now using default for current nixpkgs.
+  boot.kernelPackages = pkgs.linuxPackages;
+
   # Nixinate options
   deploy = {
     enable = true;

diff --git a/modules/hardware/zfs.nix b/modules/hardware/zfs.nix
@@ -4,8 +4,6 @@
   boot.supportedFilesystems = [ "zfs" ];
   boot.zfs.devNodes = "/dev/disk/by-path";
   boot.initrd.supportedFilesystems = [ "zfs" ];
-  #Use latest kernel + ZFS
-  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
   virtualisation.docker.storageDriver = "zfs";
 
   services.zfs.zed.settings = {