summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kartei/lass/default.nix29
-rw-r--r--krebs/2configs/default.nix2
-rw-r--r--krebs/2configs/tor/initrd.nix2
3 files changed, 2 insertions, 31 deletions
diff --git a/kartei/lass/default.nix b/kartei/lass/default.nix
index fac48a8ba..fe3725809 100644
--- a/kartei/lass/default.nix
+++ b/kartei/lass/default.nix
@@ -25,36 +25,11 @@ in {
inherit (slib) krebs;
})
);
- users = rec {
- lass = lass-yubikey;
- lass-yubikey = {
+ users = {
+ lass = {
mail = "lass@green.r";
pubkey = builtins.readFile ./ssh/yubikey.rsa;
pgp.pubkeys.default = builtins.readFile ./pgp/yubikey.pgp;
};
- lass-blue = {
- mail = "lass@blue.r";
- pubkey = builtins.readFile ./ssh/blue.rsa;
- };
- lass-green = {
- mail = "lass@green.r";
- pubkey = builtins.readFile ./ssh/green.ed25519;
- };
- lass-red = {
- mail = "lass@red.r";
- pubkey = builtins.readFile ./ssh/red.ed25519;
- };
- lass-mors = {
- mail = "lass@mors.r";
- pubkey = builtins.readFile ./ssh/mors.rsa;
- pgp.pubkeys.default = builtins.readFile ./pgp/mors.pgp;
- };
- lass-android = {
- mail = "lassulus@gmail.com";
- pubkey = builtins.readFile ./ssh/android.ed25519;
- };
- lass-tablet = {
- pubkey = builtins.readFile ./ssh/tablet.ed25519;
- };
};
}
diff --git a/krebs/2configs/default.nix b/krebs/2configs/default.nix
index bd4f36cbe..905eaaef7 100644
--- a/krebs/2configs/default.nix
+++ b/krebs/2configs/default.nix
@@ -48,9 +48,7 @@ with import ../../lib/pure.nix { inherit lib; };
users.mutableUsers = false;
users.extraUsers.root.openssh.authorizedKeys.keys = [
- config.krebs.users.jeschli-brauerei.pubkey
config.krebs.users.lass.pubkey
- config.krebs.users.lass-mors.pubkey
config.krebs.users.makefu.pubkey
config.krebs.users.tv.pubkey
config.krebs.users.kmein.pubkey
diff --git a/krebs/2configs/tor/initrd.nix b/krebs/2configs/tor/initrd.nix
index 21c46a0a7..768439734 100644
--- a/krebs/2configs/tor/initrd.nix
+++ b/krebs/2configs/tor/initrd.nix
@@ -7,9 +7,7 @@
enable = true;
port = 22;
authorizedKeys = [
- config.krebs.users.jeschli-brauerei.pubkey
config.krebs.users.lass.pubkey
- config.krebs.users.lass-mors.pubkey
config.krebs.users.makefu.pubkey
config.krebs.users.tv.pubkey
];