From c82cc289b01f3c039188d879e8115cd8c30679fa Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 20 May 2024 15:59:12 +0800 Subject: [PATCH] Revert "system.kernel: default to xanmod-latest" This reverts commit 994144635148e0867a813c4bb7c169f83b80d6ae. --- devices/pc/default.nix | 6 +++++- devices/vps4/default.nix | 1 - devices/vps6/default.nix | 1 - devices/vps7/default.nix | 1 - modules/system/kernel/default.nix | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/devices/pc/default.nix b/devices/pc/default.nix index 687adf9c..a40cdfc9 100644 --- a/devices/pc/default.nix +++ b/devices/pc/default.nix @@ -151,7 +151,11 @@ inputs: }; system.nixos.tags = [ "nvidia" ]; }; - cachyos.configuration = { nixos.system.kernel.variant = "cachyos"; system.nixos.tags = [ "cachyos" ]; }; + xanmod.configuration = + { + nixos.system.kernel.variant = "xanmod-latest"; + system.nixos.tags = [ "xanmod" ]; + }; }; }; } diff --git a/devices/vps4/default.nix b/devices/vps4/default.nix index 37f70dde..f2cad555 100644 --- a/devices/vps4/default.nix +++ b/devices/vps4/default.nix @@ -24,7 +24,6 @@ inputs: nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ]; initrd.sshd.enable = true; networking = { hostname = "vps4"; networkd = {}; }; - kernel.variant = "cachyos-server"; }; services = { diff --git a/devices/vps6/default.nix b/devices/vps6/default.nix index 076ef041..cbadb776 100644 --- a/devices/vps6/default.nix +++ b/devices/vps6/default.nix @@ -30,7 +30,6 @@ inputs: nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ]; initrd.sshd.enable = true; networking = { hostname = "vps6"; networkd = {}; }; - kernel.variant = "cachyos-server"; }; services = { diff --git a/devices/vps7/default.nix b/devices/vps7/default.nix index c3877b10..82b7e402 100644 --- a/devices/vps7/default.nix +++ b/devices/vps7/default.nix @@ -30,7 +30,6 @@ inputs: nix.substituters = [ "https://cache.nixos.org/" "https://nix-store.chn.moe" ]; initrd.sshd.enable = true; networking = { hostname = "vps7"; networkd = {}; }; - kernel.variant = "cachyos-server"; }; services = { diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix index 0ab59d30..09cb6b1e 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" ]; - default = "xanmod-latest"; + default = if inputs.config.nixos.system.gui.preferred then "cachyos" else "cachyos-server"; }; patches = mkOption { type = types.listOf types.nonEmptyStr; default = [ "cjktty" ]; }; modules =