From 0e1ec7f6b584310a4b6054e349002b6db3b64412 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 13 May 2024 22:49:18 +0200 Subject: [PATCH 1/3] feat: add pennae as permanent account Signed-off-by: Raito Bezarius --- modules/users/friends.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/users/friends.nix b/modules/users/friends.nix index 89f696e..5a2a1cd 100644 --- a/modules/users/friends.nix +++ b/modules/users/friends.nix @@ -53,5 +53,17 @@ in "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIH/LDRUG+U+++UmlxvA2kspioTjktQZ8taDcHq8gVlkfAAAABHNzaDo=" ]; }; + # Raito: Permanent account for pennae, they are doing a bunch of excellent Nix work (including performance). + pennae = { + isNormalUser = true; + home = "/home/pennae"; + shell = "/run/current-system/sw/bin/zsh"; + uid = 2006; + extraGroups = trustedFriendGroups; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC5Wf5/IbyFpdziWfwxkQqxOf3r1L9pYn6xQBEKFwmMY" + "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIK8icXjHkb4XzbIVN3djH4CE7RvgGd+3xbG4cgh0Yls5AAAABHNzaDo=" + ]; + }; }; } From 785fe6d92fc5171d971499adeec36e39b6e1e1c1 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 13 May 2024 22:50:31 +0200 Subject: [PATCH 2/3] fix: make jade permanent as discussed Signed-off-by: Raito Bezarius --- modules/users/friends.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/users/friends.nix b/modules/users/friends.nix index 5a2a1cd..50df922 100644 --- a/modules/users/friends.nix +++ b/modules/users/friends.nix @@ -25,7 +25,8 @@ in extraGroups = trustedFriendGroups; openssh.authorizedKeys.keyFiles = [ ./keys/niklas.keys ]; }; - # Raito: Temporary account for jade, for benchmarking stuff. + # Raito: Permanent account for Jade who has been driving a lot of good work. + # expires = 2060 because of a convergence bug, I cannot remove the expiration date anymore. jade = { isNormalUser = true; home = "/home/jade"; From 7d3f9a05331767b11920315be95bcd678658d7eb Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 13 May 2024 22:50:20 +0200 Subject: [PATCH 3/3] fix: make winter permanent as discussed Signed-off-by: Raito Bezarius --- modules/users/friends.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/users/friends.nix b/modules/users/friends.nix index 50df922..62fcbe7 100644 --- a/modules/users/friends.nix +++ b/modules/users/friends.nix @@ -41,14 +41,15 @@ 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, + # Raito: Permanent 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 :-). + # expires = 2060 because of a convergence bug, I cannot remove the expiration date anymore. winter = { isNormalUser = true; home = "/home/winter"; shell = "/run/current-system/sw/bin/zsh"; uid = 2005; - expires = "2024-05-01"; + expires = "2060-05-01"; extraGroups = trustedFriendGroups; openssh.authorizedKeys.keys = [ "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIH/LDRUG+U+++UmlxvA2kspioTjktQZ8taDcHq8gVlkfAAAABHNzaDo="