From d07f31bb669ec54f2c368fe429acbb9ffac93d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 31 Mar 2025 11:48:01 +0000 Subject: [PATCH 1/3] Update vars via generator machine-id for machine moritz-desktop --- modules/moritz/profiles/impermanence.nix | 1 - vars/per-machine/moritz-desktop/machine-id/machineId/value | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 vars/per-machine/moritz-desktop/machine-id/machineId/value diff --git a/modules/moritz/profiles/impermanence.nix b/modules/moritz/profiles/impermanence.nix index 01e343a..a229a5c 100644 --- a/modules/moritz/profiles/impermanence.nix +++ b/modules/moritz/profiles/impermanence.nix @@ -25,7 +25,6 @@ in "/var/log" ]; files = [ - "/etc/machine-id" "/etc/nix/id_rsa" "/etc/ssh/ssh_host_ed25519_key" "/etc/ssh/ssh_host_ed25519_key.pub" diff --git a/vars/per-machine/moritz-desktop/machine-id/machineId/value b/vars/per-machine/moritz-desktop/machine-id/machineId/value new file mode 100644 index 0000000..18306cf --- /dev/null +++ b/vars/per-machine/moritz-desktop/machine-id/machineId/value @@ -0,0 +1 @@ +3de2d4e3a1c44a2a96fb1219e8d1cad4 \ No newline at end of file From 99a5e8d8861666a994fc388887a5ad4a97f8dbf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 31 Mar 2025 15:07:23 +0200 Subject: [PATCH 2/3] fix: add timezones back --- machines/moritz-desktop/configuration.nix | 2 ++ machines/moritz-server/configuration.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/machines/moritz-desktop/configuration.nix b/machines/moritz-desktop/configuration.nix index 2c98cbd..b3f5dc7 100644 --- a/machines/moritz-desktop/configuration.nix +++ b/machines/moritz-desktop/configuration.nix @@ -16,6 +16,8 @@ ../../modules/shared.nix ]; + time.timeZone = "Europe/Berlin"; + users.users.root.openssh.authorizedKeys.keys = [ '' ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHlemuKagHwz2T5rEwgJNlVUdUdOXyPtCEzD73CrwY2zmpR4AMj7y9u3Rm7HwHUDjLap1ZFwg+53bAsVP6HFZccCXoIfO/8BL0WDGQJrfgb+A+UiRhSqSvyZ77bGJkadbBkadguz3qR3PHcb41DOlhuqVcHxsY8ceHMxAuyb0pLJVJLeytMD+CHS/r7hoj2hckTNAZ+VhCXBtdZfZ7uPUBxLfluYRNNMmdwCglsg3RUS242nJUzy3A84+CXIGeWmNG9Fu45IDkwMthxSW9klyU9R38R9DBDcugkyb6vz+JKSuRVAa47qh/kmtsYekfL3ul9D2JN32P8S+6ZoXx+gXupGJ0ltwJWAFkhLJ+yeXj9kCOv/mIUmCB14jMGsvKiSwV25O/twyjqe2LEkMVgimgrjEYoHu+ZTyp0iFtUvSrFo4tsAhfWPV9yj4F/hUksW7xKIwq5Niyx7he5M/XddudtnAximyiBDGCdJm1Ejl0UaGa6ZQv7y6VZdx0PyZuraT7l9ub8so6JlE4cVgSSU9vE0IS2QqBuHhsIjh8RVksoTR2NQbeDdGaGpGnq2C8y0rDXwE/EJA4LK45khX/GPn73n8F0kBG8dBrWgRDAEODpmebScO7d5mCeM0z3lPcRmh+3e3DPnVVOl+uR7udlc7NauLzl7q913UtxZaF1PlD7Q== cardno:15_584_308 diff --git a/machines/moritz-server/configuration.nix b/machines/moritz-server/configuration.nix index a10240b..92f80c8 100644 --- a/machines/moritz-server/configuration.nix +++ b/machines/moritz-server/configuration.nix @@ -4,6 +4,8 @@ ../../modules/shared.nix ]; + time.timeZone = "Europe/Berlin"; + # Set this for clan commands use ssh i.e. `clan machines update` # If you change the hostname, you need to update this line to root@ # This only works however if you have avahi running on your admin machine else use IP From 9ad2ccd00b15536dc087ef657949d69eec7303c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Tue, 1 Apr 2025 14:23:59 +0200 Subject: [PATCH 3/3] fix: sops + impermanece --- modules/moritz/profiles/impermanence.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/moritz/profiles/impermanence.nix b/modules/moritz/profiles/impermanence.nix index a229a5c..7267fd6 100644 --- a/modules/moritz/profiles/impermanence.nix +++ b/modules/moritz/profiles/impermanence.nix @@ -82,5 +82,6 @@ in } ) ]; + sops.age.keyFile = "/persist/var/lib/sops-nix/key.txt"; }; }