From a7bc7c7667d8c76fe77d5ca9f72a78158fec272f Mon Sep 17 00:00:00 2001 From: alexion Date: Tue, 8 Sep 2026 16:35:35 -0400 Subject: [PATCH] refactor(nixos): centralize universal defaults --- configs/nixos/hosts/neogaia/default.nix | 4 ---- configs/nixos/hosts/pikachu/default.nix | 4 ---- configs/nixos/hosts/zeus/default.nix | 3 --- configs/nixos/modules/default.nix | 4 ++++ configs/nixos/modules/guest.nix | 2 -- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/configs/nixos/hosts/neogaia/default.nix b/configs/nixos/hosts/neogaia/default.nix index 970d03c..48a2411 100644 --- a/configs/nixos/hosts/neogaia/default.nix +++ b/configs/nixos/hosts/neogaia/default.nix @@ -13,8 +13,6 @@ ./disk.nix ]; - system.stateVersion = "26.05"; - # systemd-boot on the EFI system partition. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -67,6 +65,4 @@ modules.desktop.apps.obsidian.enable = true; modules.desktop.apps.steam.enable = true; - time.timeZone = "America/New_York"; - i18n.defaultLocale = "en_GB.UTF-8"; } diff --git a/configs/nixos/hosts/pikachu/default.nix b/configs/nixos/hosts/pikachu/default.nix index 21908b5..55a629a 100644 --- a/configs/nixos/hosts/pikachu/default.nix +++ b/configs/nixos/hosts/pikachu/default.nix @@ -13,8 +13,6 @@ ./disk.nix ]; - system.stateVersion = "26.05"; - boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -144,6 +142,4 @@ usbutils ]; - time.timeZone = "America/New_York"; - i18n.defaultLocale = "en_GB.UTF-8"; } diff --git a/configs/nixos/hosts/zeus/default.nix b/configs/nixos/hosts/zeus/default.nix index 7f11ef4..dea8b88 100644 --- a/configs/nixos/hosts/zeus/default.nix +++ b/configs/nixos/hosts/zeus/default.nix @@ -10,7 +10,6 @@ { imports = [ ./disk.nix ] ++ lib.optional (builtins.pathExists ./hardware-configuration.nix) ./hardware-configuration.nix; - system.stateVersion = "26.05"; nixpkgs.hostPlatform = "x86_64-linux"; # systemd-boot on the EFI system partition. @@ -57,6 +56,4 @@ "DP-3,2560x1440@239.96,1080x0,1" ]; - time.timeZone = "America/New_York"; - i18n.defaultLocale = "en_GB.UTF-8"; } diff --git a/configs/nixos/modules/default.nix b/configs/nixos/modules/default.nix index c036697..50ad91a 100644 --- a/configs/nixos/modules/default.nix +++ b/configs/nixos/modules/default.nix @@ -48,6 +48,10 @@ in "flakes" ]; + system.stateVersion = "26.05"; + time.timeZone = "America/New_York"; + i18n.defaultLocale = "en_GB.UTF-8"; + users.users.${user.name} = { isNormalUser = true; description = user.description; diff --git a/configs/nixos/modules/guest.nix b/configs/nixos/modules/guest.nix index b778b80..b786050 100644 --- a/configs/nixos/modules/guest.nix +++ b/configs/nixos/modules/guest.nix @@ -6,8 +6,6 @@ in options.modules.guest.enable = lib.mkEnableOption "nested-guest base configuration"; config = lib.mkIf cfg.enable { - system.stateVersion = "26.05"; - modules.network.ssh.enable = lib.mkDefault true; modules.network.ssh.hostKeys.restore = lib.mkDefault false; }; -- 2.47.3