From 16fd1b23a26b93e6c772653bc1245229c0c3969e Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 30 Sep 2024 20:59:46 +0800 Subject: [PATCH] modules.system.kernel: use xanmod-lts as default --- devices/srv1/default.nix | 1 - devices/surface/default.nix | 2 +- devices/vps4/default.nix | 1 - devices/vps7/default.nix | 1 - modules/system/kernel/default.nix | 2 +- 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/devices/srv1/default.nix b/devices/srv1/default.nix index bfdb6b56..81a27835 100644 --- a/devices/srv1/default.nix +++ b/devices/srv1/default.nix @@ -17,7 +17,6 @@ inputs: swap = [ "/nix/swap/swap" ]; rollingRootfs = {}; }; - kernel.variant = "xanmod-lts"; gui.enable = true; }; hardware.cpus = [ "intel" ]; diff --git a/devices/surface/default.nix b/devices/surface/default.nix index 23e1988d..8d415928 100644 --- a/devices/surface/default.nix +++ b/devices/surface/default.nix @@ -25,7 +25,7 @@ inputs: }; nixpkgs.march = "skylake"; nix = { substituters = [ "https://nix-store.chn.moe?priority=100" ]; githubToken.enable = true; }; - kernel = { variant = "xanmod-lts"; patches = [ "surface" "hibernate-progress" ]; }; + kernel.patches = [ "surface" "hibernate-progress" ]; gui.enable = true; }; hardware = { cpus = [ "intel" ]; gpu.type = "intel"; }; diff --git a/devices/vps4/default.nix b/devices/vps4/default.nix index b528b0ef..61ae6f7b 100644 --- a/devices/vps4/default.nix +++ b/devices/vps4/default.nix @@ -30,7 +30,6 @@ inputs: nix.substituters = [ "https://nix-store.chn.moe?priority=100" ]; initrd.sshd.enable = true; networking.networkd = {}; - kernel.variant = "xanmod-latest"; nix-ld = null; binfmt = null; }; diff --git a/devices/vps7/default.nix b/devices/vps7/default.nix index 97ed5ece..7c119fad 100644 --- a/devices/vps7/default.nix +++ b/devices/vps7/default.nix @@ -30,7 +30,6 @@ inputs: nix.substituters = [ "https://nix-store.chn.moe?priority=100" ]; initrd.sshd.enable = true; networking.networkd = {}; - kernel.variant = "xanmod-lts"; }; services = { diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix index 6457fb3f..c4f7c579 100644 --- a/modules/system/kernel/default.nix +++ b/modules/system/kernel/default.nix @@ -5,7 +5,7 @@ inputs: variant = mkOption { type = types.enum [ "nixos" "xanmod-lts" "xanmod-latest" "cachyos" "cachyos-lto" "cachyos-server" "zen" ]; - default = "xanmod-latest"; + default = "xanmod-lts"; }; patches = mkOption { type = types.listOf types.nonEmptyStr; default = []; }; modules =