chore(users): grfn -> aspen

Change-Id: I6c6847fac56f0a9a1a2209792e00a3aec5e672b9
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10809
Autosubmit: aspen <root@gws.fyi>
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: lukegb <lukegb@tvl.fyi>

README.md

@@ -89,7 +89,7 @@ personal or experimental code that does not require review.
 
 Some examples:
 
-* `//users/grfn/xanthous`: A (WIP) TUI RPG, written in Haskell.
+* `//users/aspen/xanthous`: A (WIP) TUI RPG, written in Haskell.
 * `//users/tazjin/emacs`: tazjin's Emacs & EXWM configuration
 * `//users/tazjin/finito`: A persistent finite-state machine library for Rust.
 

default.nix

@@ -108,8 +108,8 @@ readTree.fix (self: (readDepot {
   # list below.
   ci.excluded = [
     # xanthous and related targets are disabled until cl/9186 is submitted
-    self.users.grfn.xanthous
+    self.users.aspen.xanthous
-    self.users.grfn.system.system.mugwumpSystem
+    self.users.aspen.system.system.mugwumpSystem
   ];
 
   # List of all buildable targets, for CI purposes.

ops/machines/all-systems.nix

@@ -12,7 +12,7 @@
   zamalek
 ]) ++
 
-(with depot.users.grfn.system.system; [
+(with depot.users.aspen.system.system; [
   yeren
   mugwump
   ogopogo

ops/machines/whitby/default.nix

@@ -83,7 +83,7 @@ in
           authorizedKeys =
             depot.users.tazjin.keys.all
             ++ depot.users.lukegb.keys.all
-            ++ [ depot.users.grfn.keys.whitby ];
+            ++ [ depot.users.aspen.keys.whitby ];
 
           hostKeys = [
             /etc/secrets/initrd_host_ed25519_key
@@ -189,7 +189,7 @@ in
       secret-key-files = "/run/agenix/nix-cache-priv";
 
       trusted-users = [
-        "grfn"
+        "aspen"
         "lukegb"
         "tazjin"
         "sterni"
@@ -201,7 +201,7 @@ in
       keys = with depot.users;
         tazjin.keys.all
         ++ lukegb.keys.all
-        ++ [ grfn.keys.whitby ]
+        ++ [ aspen.keys.whitby ]
         ++ sterni.keys.all
       ;
     };
@@ -565,8 +565,8 @@ in
         token_url = "https://auth.tvl.fyi/auth/realms/TVL/protocol/openid-connect/token";
         api_url = "https://auth.tvl.fyi/auth/realms/TVL/protocol/openid-connect/userinfo";
 
-        # Give lukegb, grfn, tazjin "Admin" rights.
+        # Give lukegb, aspen, tazjin "Admin" rights.
-        role_attribute_path = "((sub == 'lukegb' || sub == 'grfn' || sub == 'tazjin') && 'Admin') || 'Editor'";
+        role_attribute_path = "((sub == 'lukegb' || sub == 'aspen' || sub == 'tazjin') && 'Admin') || 'Editor'";
 
         # Allow creating new Grafana accounts from OAuth accounts.
         allow_sign_up = true;

ops/modules/tvl-users.nix

@@ -17,12 +17,10 @@
       openssh.authorizedKeys.keys = depot.users.lukegb.keys.all;
     };
 
-    users.grfn = {
+    users.aspen = {
       isNormalUser = true;
       extraGroups = [ "git" "wheel" ];
-      openssh.authorizedKeys.keys = [
+      openssh.authorizedKeys.keys = [ depot.users.aspen.keys.whitby ];
-        depot.users.grfn.keys.whitby
-      ];
     };
 
     users.edef = {

ops/modules/www/wigglydonke.rs.nix

@@ -9,7 +9,7 @@
     services.nginx.virtualHosts."wigglydonke.rs" = {
       enableACME = true;
       forceSSL = true;
-      root = "${depot.path + "/users/grfn/wigglydonke.rs"}";
+      root = "${depot.path + "/users/aspen/wigglydonke.rs"}";
     };
   };
 }

ops/secrets/secrets.nix

@@ -11,7 +11,7 @@ let
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDBRXeb8EuecLHP0bW4zuebXp4KRnXgJTZfeVWXQ1n1R"
   ];
 
-  grfn = [
+  aspen = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMcBGBoWd5pPIIQQP52rcFOQN3wAY0J/+K2fuU6SffjA "
   ];
 
@@ -22,10 +22,10 @@ let
   sanduny = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOag0XhylaTVhmT6HB8EN2Fv5Ymrc4ZfypOXONUkykTX";
   whitby = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNh/w4BSKov0jdz3gKBc98tpoLta5bb87fQXWBhAl2I";
 
-  terraform.publicKeys = tazjin ++ grfn ++ sterni ++ flokli;
+  terraform.publicKeys = tazjin ++ aspen ++ sterni ++ flokli;
-  whitbyDefault.publicKeys = tazjin ++ grfn ++ sterni ++ [ whitby ];
+  whitbyDefault.publicKeys = tazjin ++ aspen ++ sterni ++ [ whitby ];
-  allDefault.publicKeys = tazjin ++ grfn ++ sterni ++ [ sanduny whitby ];
+  allDefault.publicKeys = tazjin ++ aspen ++ sterni ++ [ sanduny whitby ];
-  sandunyDefault.publicKeys = tazjin ++ grfn ++ sterni ++ [ sanduny ];
+  sandunyDefault.publicKeys = tazjin ++ aspen ++ sterni ++ [ sanduny ];
 in
 {
   "besadii.age" = whitbyDefault;

users/aspen/bbbg/README.md

@@ -21,7 +21,7 @@ commands to install all development dependencies:
 
 ``` shell-session
 $ pwd
-/path/to/depot/users/grfn/bbbg
+/path/to/depot/users/aspen/bbbg
 $ direnv allow
 $ lorri watch --once # Wait for a single nix shell build
 ```
@@ -30,7 +30,7 @@ Then, to run a docker container with the development database:
 
 ``` shell-session
 $ pwd
-/path/to/depot/users/grfn/bbbg
+/path/to/depot/users/aspen/bbbg
 $ arion up -d
 ```
 
@@ -86,7 +86,7 @@ This will run a web server for the application listening at
 
 #### In Emacs, with [CIDER](https://docs.cider.mx/cider/index.html) + [direnv](https://github.com/wbolster/emacs-direnv)
 
-Open `//users/grfn/bbbg/src/bbbg/core.clj` in a buffer, then follow the
+Open `//users/aspen/bbbg/src/bbbg/core.clj` in a buffer, then follow the
 instructions at the end of the file
 
 ## Deployment
@@ -120,7 +120,7 @@ The current deploy configuration includes:
 You'll need:
 
 -   An uberjar for bbbg; the canonical way of building that is `nix-build
-    /path/to/depot -A users.grfn.bbbg.server-jar` but I\'m not sure how that
+    /path/to/depot -A users.aspen.bbbg.server-jar` but I\'m not sure how that
     works outside of nix
 -   A postgresql database
 -   Environment variables telling the app how to connect to that

users/aspen/bbbg/module.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, depot, ... }:
 
 let
-  bbbg = depot.users.grfn.bbbg;
+  bbbg = depot.users.aspen.bbbg;
   cfg = config.services.bbbg;
 in
 {

users/aspen/bbbg/shell.nix

@@ -16,7 +16,7 @@ mkShell {
       module=$(nix-build ~/code/depot -A users.grfn.bbbg.tf.module)
       rm -f ~/tfstate/bbbg/*.json
       cp ''${module}/*.json ~/tfstate/bbbg
-      exec ${depot.users.grfn.bbbg.tf.terraform}/bin/terraform \
+      exec ${depot.users.aspen.bbbg.tf.terraform}/bin/terraform \
         -chdir=/home/grfn/tfstate/bbbg \
         "$@"
     '')