From aa98056f23f3475a6fee414288be4869179087fa Mon Sep 17 00:00:00 2001 From: Hektor Misplon Date: Wed, 11 Mar 2026 23:36:54 +0100 Subject: [PATCH] refactor: extract host config into 'host.nix' files --- hosts/andromache/default.nix | 6 +----- hosts/andromache/host.nix | 4 ++++ hosts/astyanax/default.nix | 6 +----- hosts/astyanax/host.nix | 4 ++++ hosts/eetion-02/default.nix | 6 +----- hosts/eetion-02/host.nix | 4 ++++ hosts/eetion/default.nix | 6 +----- hosts/eetion/host.nix | 4 ++++ hosts/hecuba/default.nix | 6 +----- hosts/hecuba/host.nix | 4 ++++ hosts/vm/default.nix | 6 +----- hosts/vm/host.nix | 4 ++++ 12 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 hosts/andromache/host.nix create mode 100644 hosts/astyanax/host.nix create mode 100644 hosts/eetion-02/host.nix create mode 100644 hosts/eetion/host.nix create mode 100644 hosts/hecuba/host.nix create mode 100644 hosts/vm/host.nix diff --git a/hosts/andromache/default.nix b/hosts/andromache/default.nix index 220f993d..b3be0747 100644 --- a/hosts/andromache/default.nix +++ b/hosts/andromache/default.nix @@ -14,6 +14,7 @@ in inputs.disko.nixosModules.disko ../../modules/common ./hard.nix + ./host.nix inputs.nixos-hardware.nixosModules.common-cpu-intel inputs.nixos-hardware.nixosModules.common-pc inputs.nixos-hardware.nixosModules.common-pc-ssd @@ -43,11 +44,6 @@ in ../../modules/yubikey ]; - host = { - username = "h"; - name = "andromache"; - }; - home-manager.users.${config.host.username} = import ../../home/hosts/andromache { inherit inputs diff --git a/hosts/andromache/host.nix b/hosts/andromache/host.nix new file mode 100644 index 00000000..4479c345 --- /dev/null +++ b/hosts/andromache/host.nix @@ -0,0 +1,4 @@ +{ + username = "h"; + name = "andromache"; +} diff --git a/hosts/astyanax/default.nix b/hosts/astyanax/default.nix index 9ad17677..386d9e1c 100644 --- a/hosts/astyanax/default.nix +++ b/hosts/astyanax/default.nix @@ -13,6 +13,7 @@ in inputs.disko.nixosModules.disko ../../modules/common ./hard.nix + ./host.nix inputs.nixos-hardware.nixosModules.common-pc inputs.nixos-hardware.nixosModules.common-pc-ssd # inputs.nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel-gen7 (not available yet?) @@ -40,11 +41,6 @@ in ../../modules/nfc ]; - host = { - username = "h"; - name = "astyanax"; - }; - home-manager.users.${config.host.username} = import ../../home/hosts/astyanax { inherit inputs diff --git a/hosts/astyanax/host.nix b/hosts/astyanax/host.nix new file mode 100644 index 00000000..eb16a6dd --- /dev/null +++ b/hosts/astyanax/host.nix @@ -0,0 +1,4 @@ +{ + username = "h"; + name = "astyanax"; +} diff --git a/hosts/eetion-02/default.nix b/hosts/eetion-02/default.nix index e4c2a7e9..f39f0f8d 100644 --- a/hosts/eetion-02/default.nix +++ b/hosts/eetion-02/default.nix @@ -8,13 +8,9 @@ ./hard.nix ../../modules/ssh ../../modules/common + ./host.nix ]; - host = { - username = "h"; - name = "eetion-02"; - }; - ssh = { inherit (config.host) username; publicHostname = config.host.name; diff --git a/hosts/eetion-02/host.nix b/hosts/eetion-02/host.nix new file mode 100644 index 00000000..f721a6ba --- /dev/null +++ b/hosts/eetion-02/host.nix @@ -0,0 +1,4 @@ +{ + username = "h"; + name = "eetion-02"; +} diff --git a/hosts/eetion/default.nix b/hosts/eetion/default.nix index 4b94d8f7..c9903d3f 100644 --- a/hosts/eetion/default.nix +++ b/hosts/eetion/default.nix @@ -8,14 +8,10 @@ ./hard.nix ../../modules/ssh ../../modules/common + ./host.nix # ../../modules/uptime-kuma ]; - host = { - username = "h"; - name = "eetion"; - }; - ssh = { inherit (config.host) username; publicHostname = config.host.name; diff --git a/hosts/eetion/host.nix b/hosts/eetion/host.nix new file mode 100644 index 00000000..c69fbcaf --- /dev/null +++ b/hosts/eetion/host.nix @@ -0,0 +1,4 @@ +{ + username = "h"; + name = "eetion"; +} diff --git a/hosts/hecuba/default.nix b/hosts/hecuba/default.nix index b0dd8308..c5d76265 100644 --- a/hosts/hecuba/default.nix +++ b/hosts/hecuba/default.nix @@ -12,15 +12,11 @@ inputs.disko.nixosModules.disko ../../modules/common ./hard.nix + ./host.nix ../../modules/ssh ../../modules/docker ]; - host = { - username = "username"; - name = "hecuba"; - }; - networking.hostName = config.host.name; ssh = { inherit (config.host) username; diff --git a/hosts/hecuba/host.nix b/hosts/hecuba/host.nix new file mode 100644 index 00000000..e7e10dd3 --- /dev/null +++ b/hosts/hecuba/host.nix @@ -0,0 +1,4 @@ +{ + username = "username"; + name = "hecuba"; +} diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix index 41449dfa..1ae32824 100644 --- a/hosts/vm/default.nix +++ b/hosts/vm/default.nix @@ -12,6 +12,7 @@ ./hard.nix inputs.sops-nix.nixosModules.sops ./disk.nix + ./host.nix ../../modules/boot/bootloader.nix ../../modules/keyboard (import ../../modules/networking { hostName = config.host.name; }) @@ -27,11 +28,6 @@ }) ]; - host = { - username = "h"; - name = "vm"; - }; - home-manager.users.${config.host.username} = import ../../home/hosts/vm { inherit inputs config pkgs; }; diff --git a/hosts/vm/host.nix b/hosts/vm/host.nix new file mode 100644 index 00000000..1500370f --- /dev/null +++ b/hosts/vm/host.nix @@ -0,0 +1,4 @@ +{ + username = "h"; + name = "vm"; +}