isla: upstream

Signed-off-by: s0me1newithhand7s <git+me@hand7s.org>

isla/boot/initrd.nix

@@ -1,4 +1,4 @@
-{lib, ...}: {
+_: {
   boot = {
     initrd = {
       availableKernelModules = [
@@ -17,13 +17,8 @@
       supportedFilesystems = {
         vfat = true;
         btrfs = true;
-        zfs = lib.mkForce false;
       };
 
-      kernelModules = [
-        "i915"
-      ];
-
       luks = {
         devices = {
           cryptroot = {

isla/boot/kernel.nix

@@ -1,8 +1,4 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
+{pkgs, ...}: {
   boot = {
     kernel = {
       sysctl = {
@@ -16,13 +12,9 @@
       };
     };
 
-    kernelPackages = pkgs.linuxPackages_zen;
-    extraModprobeConfig = ''
-      options thinkpad_acpi  fan_control=1
-    '';
+    kernelPackages = pkgs.linuxPackages_latest;
 
     kernelParams = [
-      "i915.enable_rc6=7"
       "udev.log_priority=3"
       "quiet"
       "splash"
@@ -35,15 +27,12 @@
       "page_alloc.shuffle=1"
       "page_poison=1"
       "slab_nomerge"
+      "zswap.enabled=0"
 
       "kernel.watchdog=0"
       "oops=panic"
     ];
 
-    kernelModules = [
-      "tp_smapi"
-    ];
-
     blacklistedKernelModules = [
       "k10temp"
       "ax25"
@@ -77,9 +66,6 @@
     supportedFilesystems = {
       vfat = true;
       btrfs = true;
-      zfs = lib.mkForce false;
     };
-
-    # consoleLogLevel = 0;
   };
 }