AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use unstable zfs

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-09-16 00:49:54 +03:00
parent eca659f545
commit 9bdad8779d
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
machines/AMD-Workstation/boot.nix
View File

@ -3,6 +3,9 @@ let
zfs_arc_max = toString (6 * 1024 * 1024 * 1024); zfs_arc_max = toString (6 * 1024 * 1024 * 1024);
in { in {
boot = { boot = {
zfs.enableUnstable = true;
kernelPackages = pkgs.linuxPackages_lqx;
initrd = { initrd = {
supportedFilesystems = [ "zfs" ]; supportedFilesystems = [ "zfs" ];
luks.devices = { luks.devices = {
@ -39,7 +42,6 @@ in {
}; };
binfmt.emulatedSystems = [ "aarch64-linux" ]; binfmt.emulatedSystems = [ "aarch64-linux" ];
kernelPackages = pkgs.linuxPackages_lqx;
kernelParams = [ kernelParams = [
"zfs.metaslab_lba_weighting_enabled=0" "zfs.metaslab_lba_weighting_enabled=0"
"zfs.zfs_arc_max=${zfs_arc_max}" "zfs.zfs_arc_max=${zfs_arc_max}"

4
machines/Dell-Laptop/boot.nix
View File

@ -3,6 +3,9 @@ let
zfs_arc_max = toString (2 * 1024 * 1024 * 1024); zfs_arc_max = toString (2 * 1024 * 1024 * 1024);
in { in {
boot = { boot = {
zfs.enableUnstable = true;
kernelPackages = pkgs.linuxPackages_lqx;
initrd = { initrd = {
supportedFilesystems = [ "zfs" ]; supportedFilesystems = [ "zfs" ];
luks.devices = { luks.devices = {
@ -35,7 +38,6 @@ in {
generationsDir.copyKernels = true; generationsDir.copyKernels = true;
}; };
kernelPackages = pkgs.linuxPackages_lqx;
kernelParams = [ kernelParams = [
"zfs.metaslab_lba_weighting_enabled=0" "zfs.metaslab_lba_weighting_enabled=0"
"zfs.zfs_arc_max=${zfs_arc_max}" "zfs.zfs_arc_max=${zfs_arc_max}"

16
patches/zen-kernels.patch
View File

@ -1,16 +0,0 @@
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 7c32a5d..708d613 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -11,9 +11,9 @@ let
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.4.7"; #lqx
+ version = "6.3.13"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "055l8l83368858ap1pslxcs76hkms8ik627v7d7wczm9f1vldbln"; #lqx
+ sha256 = "1qxjbwmxlncfg6adrzrzjxnj8g4gcyq3k76i5fwlrfxx2s4hryl5"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

2
scripts/gen-patch-zen.sh
View File

@ -4,7 +4,7 @@ set -eu -o pipefail
kCONFIG="$(pwd)" kCONFIG="$(pwd)"
kNIXPKGS=$(nix flake metadata --json --inputs-from . nixpkgs | jq -r '.path') kNIXPKGS=$(nix flake metadata --json --inputs-from . nixpkgs | jq -r '.path')
kMAX_VER=`python $kCONFIG/scripts/find-latest-zfs-kernel.py $kNIXPKGS/pkgs/os-specific/linux/zfs/stable.nix` kMAX_VER=`python $kCONFIG/scripts/find-latest-zfs-kernel.py $kNIXPKGS/pkgs/os-specific/linux/zfs/unstable.nix`
echo "found version: $kMAX_VER" echo "found version: $kMAX_VER"