refactor(nixos): centralize universal defaults

This commit was merged in pull request #28.
This commit is contained in:
2026-09-08 16:35:35 -04:00
parent 9cac3efe21
commit a7bc7c7667
5 changed files with 4 additions and 13 deletions

View File

@@ -13,8 +13,6 @@
./disk.nix ./disk.nix
]; ];
system.stateVersion = "26.05";
# systemd-boot on the EFI system partition. # systemd-boot on the EFI system partition.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
@@ -67,6 +65,4 @@
modules.desktop.apps.obsidian.enable = true; modules.desktop.apps.obsidian.enable = true;
modules.desktop.apps.steam.enable = true; modules.desktop.apps.steam.enable = true;
time.timeZone = "America/New_York";
i18n.defaultLocale = "en_GB.UTF-8";
} }

View File

@@ -13,8 +13,6 @@
./disk.nix ./disk.nix
]; ];
system.stateVersion = "26.05";
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
@@ -144,6 +142,4 @@
usbutils usbutils
]; ];
time.timeZone = "America/New_York";
i18n.defaultLocale = "en_GB.UTF-8";
} }

View File

@@ -10,7 +10,6 @@
{ {
imports = [ ./disk.nix ] ++ lib.optional (builtins.pathExists ./hardware-configuration.nix) ./hardware-configuration.nix; imports = [ ./disk.nix ] ++ lib.optional (builtins.pathExists ./hardware-configuration.nix) ./hardware-configuration.nix;
system.stateVersion = "26.05";
nixpkgs.hostPlatform = "x86_64-linux"; nixpkgs.hostPlatform = "x86_64-linux";
# systemd-boot on the EFI system partition. # systemd-boot on the EFI system partition.
@@ -57,6 +56,4 @@
"DP-3,2560x1440@239.96,1080x0,1" "DP-3,2560x1440@239.96,1080x0,1"
]; ];
time.timeZone = "America/New_York";
i18n.defaultLocale = "en_GB.UTF-8";
} }

View File

@@ -48,6 +48,10 @@ in
"flakes" "flakes"
]; ];
system.stateVersion = "26.05";
time.timeZone = "America/New_York";
i18n.defaultLocale = "en_GB.UTF-8";
users.users.${user.name} = { users.users.${user.name} = {
isNormalUser = true; isNormalUser = true;
description = user.description; description = user.description;

View File

@@ -6,8 +6,6 @@ in
options.modules.guest.enable = lib.mkEnableOption "nested-guest base configuration"; options.modules.guest.enable = lib.mkEnableOption "nested-guest base configuration";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
system.stateVersion = "26.05";
modules.network.ssh.enable = lib.mkDefault true; modules.network.ssh.enable = lib.mkDefault true;
modules.network.ssh.hostKeys.restore = lib.mkDefault false; modules.network.ssh.hostKeys.restore = lib.mkDefault false;
}; };