From 7b943a438df14bc2da49d5ec7cff64927356177c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= Date: Tue, 3 Jun 2025 00:03:04 +0300 Subject: [PATCH] Adjust how the config is split across files --- flake.nix | 3 ++- hosts/lithium/configuration.nix | 6 ------ hosts/lithium/{hardware-configuration.nix => state.nix} | 4 +++- 3 files changed, 5 insertions(+), 8 deletions(-) rename hosts/lithium/{hardware-configuration.nix => state.nix} (91%) diff --git a/flake.nix b/flake.nix index f88e84e..0b257e3 100644 --- a/flake.nix +++ b/flake.nix @@ -27,8 +27,9 @@ }; system = "x86_64-linux"; modules = [ + { networking.hostName = host; } ./hosts/${host}/configuration.nix - ./hosts/${host}/hardware-configuration.nix + ./hosts/${host}/state.nix ]; } ) diff --git a/hosts/lithium/configuration.nix b/hosts/lithium/configuration.nix index a5c7ccd..6027f17 100644 --- a/hosts/lithium/configuration.nix +++ b/hosts/lithium/configuration.nix @@ -1,11 +1,5 @@ { lib, ... }: { - # MANUAL STATE - system.stateVersion = "24.05"; - boot.kernelParams = [ "resume_offset=39292928" ]; - # MANUAL STATE - - networking.hostName = "lithium"; custom.home_wg_suffix = "3"; system.autoUpgrade.allowReboot = lib.mkForce false; diff --git a/hosts/lithium/hardware-configuration.nix b/hosts/lithium/state.nix similarity index 91% rename from hosts/lithium/hardware-configuration.nix rename to hosts/lithium/state.nix index 0eac55a..5a1d266 100644 --- a/hosts/lithium/hardware-configuration.nix +++ b/hosts/lithium/state.nix @@ -4,8 +4,10 @@ modulesPath, ... }: - { + system.stateVersion = "24.05"; + boot.kernelParams = [ "resume_offset=39292928" ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [