From 288c6156aca3f50f4d8abfd21cc9bdd76eb4aa6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Gro=C3=9Fmann?= Date: Wed, 11 Oct 2023 21:48:28 +0200 Subject: [PATCH] feat: ssh config reworked fix: testienix --- hosts/testienix/fs.nix | 8 +++++++- users/patrick/ssh.nix | 21 ++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/hosts/testienix/fs.nix b/hosts/testienix/fs.nix index 360f19b..81faed8 100644 --- a/hosts/testienix/fs.nix +++ b/hosts/testienix/fs.nix @@ -48,12 +48,18 @@ defaultZpoolOptions // { datasets = { + "local" = unmountable; + "local/state" = filesystem "/panzer/state"; "safe" = unmountable; - "safe/data" = filesystem "/data"; + "safe/persist" = filesystem "/panzer/persist"; }; }; }; }; + fileSystems."/state".neededForBoot = true; + fileSystems."/panzer/state".neededForBoot = true; boot.initrd.luks.devices.enc-rpool.allowDiscards = true; + boot.initrd.luks.devices.enc-panzer-1.allowDiscards = true; + boot.initrd.luks.devices.enc-panzer-2.allowDiscards = true; } diff --git a/users/patrick/ssh.nix b/users/patrick/ssh.nix index da83fd8..990564b 100644 --- a/users/patrick/ssh.nix +++ b/users/patrick/ssh.nix @@ -16,56 +16,39 @@ "elisabeth" = { hostname = "lel.lol"; user = "root"; - inherit identityFile; }; "gojo" = { hostname = "10.181.97.217"; user = "root"; - inherit identityFile; }; + "patricknix" = { hostname = "patricknix.local"; user = "root"; - inherit identityFile; }; "testienix" = { hostname = "testienix.local"; user = "root"; - inherit identityFile; }; "desktopnix" = { hostname = "desktopnix.local"; user = "root"; - inherit identityFile; }; "valhalla" = { hostname = "valhalla.fs.tum.de"; user = "grossmann"; - inherit identityFile; }; "elisabethprivate" = { hostname = "lel.lol"; user = "patrick"; - inherit identityFile; - }; - "*.lel.lol" = { - inherit identityFile; - }; - "localhost" = { - inherit identityFile; - }; - "gitlab.lrz.de" = { - inherit identityFile; - }; - "github.com" = { - inherit identityFile; }; "*" = { identitiesOnly = true; + inherit identityFile; }; }; };