From 836bea29b2db950903b88120cec30850a6327b08 Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Wed, 23 Oct 2024 00:40:11 +0200
Subject: [PATCH] fix(marr): permission issues
---
hosts/marr/default.nix | 7 +++----
options/keys.nix | 10 ++++++----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix
index 6bc800d..31c1de2 100644
--- a/hosts/marr/default.nix
+++ b/hosts/marr/default.nix
@@ -53,11 +53,11 @@
};
age = {
- identityPaths = [
- "/etc/ssh/ssh_host_ed25519_key"
- ];
+ identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
secrets.rustypaste = {
file = ../../secrets/rustypaste.age;
+ mode = "440";
+ group = "wheel";
};
};
@@ -144,7 +144,6 @@
"libvirtd"
"dialout" # Necessary for serial port interactions
];
- openssh.authorizedKeys.keys = [ pubkeys.ny ];
};
};
diff --git a/options/keys.nix b/options/keys.nix
index f2ec915..9d94f04 100644
--- a/options/keys.nix
+++ b/options/keys.nix
@@ -8,23 +8,25 @@ let
};
systems = {
brontes = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICgknH3OPazZNhH5xkYfXBcYpI3TXj/eRp0/zzjtVJBf";
- marr = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILMh2nUUKt3xsKiwZUuo6HgvR3lr7rRAl0SOH/502sFP";
+ marr = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAr1vzx7AAfyOrdIHUvYIN9LRL0x1M6pGkDXszy67l6n";
raptus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKdpjGR/pV1roktZdKIVVWqds0JB+x1ksfyQmYPMLK7o";
- shan = "";
+ shan = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPnASO1+h9tUYsNrsePcmxFLpKBkyCXbcZB9W7f5Yt5U";
+ nihilus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7BfsJK6fmtoigWlfCliSWwonePOtfTVNTUJuyMiNi4";
};
workstations = take "brontes" "marr";
- server = take "raptus" "shane";
+ server = take "raptus" "shan" "nihilus";
all = foldl' (a: b: a ++ [ b ]) [ users.ny ] (attrValues systems);
in
{
inherit all workstations server;
inherit (users) ny;
- inherit (users)
+ inherit (systems)
raptus
brontes
marr
shan
+ nihilus
;
}