diff --git a/hosts/gerg-desktop/zfs.nix b/hosts/gerg-desktop/zfs.nix index d988e4b..0dc9285 100644 --- a/hosts/gerg-desktop/zfs.nix +++ b/hosts/gerg-desktop/zfs.nix @@ -32,15 +32,8 @@ _: }; kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; #disable hibernate and set cache max - kernelParams = [ - "nohibernate" - "zfs.zfs_arc_max=17179869184" - ]; + kernelParams = [ "zfs.zfs_arc_max=17179869184" ]; initrd = { - supportedFilesystems = [ - "zfs" - "vfat" - ]; #module for multiple swap devices kernelModules = [ "dm_mod" ]; #keyboard module for zfs password @@ -92,10 +85,5 @@ _: }; }; }; - systemd.services.zfs-mount.enable = false; - services.zfs = { - autoScrub.enable = true; - trim.enable = true; - }; _file = ./zfs.nix; } diff --git a/modules/boot.nix b/modules/boot.nix index 38098ea..2004a15 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -16,7 +16,7 @@ }; boot = { blacklistedKernelModules = [ "pcspkr" ]; - kernelParams = lib.mkAfter [ + kernelParams = lib.mkBefore [ "acpi_call" "pti=auto" "randomize_kstack_offset=on" @@ -36,10 +36,10 @@ "logo.nologo" "fbcon=nodefer" "bgrt_disable" - "systemd.show_status=false" - "rd.udev.log_level=3" "vt.global_cursor_default=0" "quiet" + "systemd.show_status=false" + "rd.udev.log_level=3" "splash" ]; consoleLogLevel = 3;