diff --git a/modules/builder.nix b/modules/builder.nix index 7c3ff3e..7c691c8 100644 --- a/modules/builder.nix +++ b/modules/builder.nix @@ -6,6 +6,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA3hCOyFwuoCLt5W9e9yQSwj9I+VspB0kNNHsoFngbgZ raito@thors" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF07Sy0O+oletFYlrfS0+XtBWJO2F+Rc9J/ocNLBa/OE raito@thorkell" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu4cEqZzAI/1vZjSQkTJ4ijIg9nuloOuSKUrnkJIOFn buildbot@top-secret" # Top secret's project buildbot key + "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIH/LDRUG+U+++UmlxvA2kspioTjktQZ8taDcHq8gVlkfAAAABHNzaDo=" # winterqt ]; uid = 5001; }; diff --git a/modules/users/admins.nix b/modules/users/admins.nix index 3fe7c52..e3ae6ea 100644 --- a/modules/users/admins.nix +++ b/modules/users/admins.nix @@ -66,6 +66,6 @@ in }; }; - nix.settings.trusted-users = [ "raito" "luj" "gdd" "akechi" "tomate" "niklas" "jade" ]; + nix.settings.trusted-users = [ "raito" "luj" "gdd" "akechi" "tomate" "niklas" "jade" "winter" ]; }; } diff --git a/modules/users/friends.nix b/modules/users/friends.nix index 13cb774..910cc6f 100644 --- a/modules/users/friends.nix +++ b/modules/users/friends.nix @@ -5,17 +5,8 @@ let ]; in { + # deleted users: ninjatrappeur, flokli users.users = { - # Raito: unused since a while, it was made for working on the production database of Hydra. - ninjatrappeur = { - isNormalUser = true; - home = "/home/ninjatrappeur"; - shell = "/run/current-system/sw/bin/zsh"; - uid = 2000; - extraGroups = trustedFriendGroups; - expires = "2024-01-01"; - openssh.authorizedKeys.keyFiles = [ ./keys/ninjatrappeur.keys ]; - }; linus = { isNormalUser = true; home = "/home/linus"; @@ -34,18 +25,6 @@ in extraGroups = trustedFriendGroups; openssh.authorizedKeys.keyFiles = [ ./keys/niklas.keys ]; }; - # Raito: Temporary account for flokli, disable when he's done with it. - flokli = { - isNormalUser = true; - home = "/home/flokli"; - shell = "/run/current-system/sw/bin/zsh"; - uid = 2003; - expires = "2024-02-01"; - extraGroups = trustedFriendGroups; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTVTXOutUZZjXLB0lUSgeKcSY/8mxKkC0ingGK1whD2 flokli" - ]; - }; # Raito: Temporary account for jade, for benchmarking stuff. jade = { isNormalUser = true; @@ -61,5 +40,18 @@ in "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHGIBMfUypLctmorlRz9xIzXRgmtqDMxF5T5Fxy4JxNb root@tail-bot" ]; }; + # Raito: Account for winter, she was the one in charge of the Darwin build box for a while, + # helped a bunch of people and deserve it :-). + winter = { + isNormalUser = true; + home = "/home/winter"; + shell = "/run/current-system/sw/bin/zsh"; + uid = 2005; + expires = "2024-05-01"; + extraGroups = trustedFriendGroups; + openssh.authorizedKeys.keys = [ + "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIH/LDRUG+U+++UmlxvA2kspioTjktQZ8taDcHq8gVlkfAAAABHNzaDo=" + ]; + }; }; }