From 1cebb775f1b8a5ca9d149c23df453a5f56f95fb8 Mon Sep 17 00:00:00 2001
From: Aspen Smith <root@gws.fyi>
Date: Sun, 31 Mar 2024 14:11:01 -0400
Subject: feat(aspen/system): Switch linux user login to aspen

Change-Id: I10369a20db3f1be92caf0bace94e8beb6af1dbaa
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11302
Tested-by: BuildkiteCI
Autosubmit: aspen <root@gws.fyi>
Reviewed-by: aspen <root@gws.fyi>
---
 users/aspen/system/home/modules/common.nix           | 6 +++---
 users/aspen/system/home/modules/desktop.nix          | 4 ++--
 users/aspen/system/home/modules/development.nix      | 4 ++--
 users/aspen/system/home/modules/development/agda.nix | 6 +++---
 users/aspen/system/home/modules/emacs.nix            | 2 +-
 users/aspen/system/home/modules/email.nix            | 2 +-
 users/aspen/system/home/modules/i3.nix               | 4 ++--
 users/aspen/system/home/modules/lib/cloneRepo.nix    | 4 ++--
 users/aspen/system/home/modules/tarsnap.nix          | 4 ++--
 users/aspen/system/home/platforms/linux.nix          | 4 ++--
 users/aspen/system/system/default.nix                | 2 +-
 users/aspen/system/system/iso.nix                    | 2 +-
 users/aspen/system/system/machines/mugwump.nix       | 2 +-
 users/aspen/system/system/modules/common.nix         | 6 +++---
 users/aspen/system/system/modules/desktop.nix        | 2 +-
 users/aspen/system/system/modules/development.nix    | 4 ++--
 users/aspen/system/system/modules/wireshark.nix      | 2 +-
 17 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'users')

diff --git a/users/aspen/system/home/modules/common.nix b/users/aspen/system/home/modules/common.nix
index b82827798e..429621194b 100644
--- a/users/aspen/system/home/modules/common.nix
+++ b/users/aspen/system/home/modules/common.nix
@@ -14,12 +14,12 @@
     ../modules/lib/cloneRepo.nix
   ];
 
-  home.username = "grfn";
-  home.homeDirectory = "/home/grfn";
+  home.username = "aspen";
+  home.homeDirectory = "/home/aspen";
 
   programs.password-store.enable = true;
 
-  grfn.impure.clonedRepos.passwordStore = {
+  aspen.impure.clonedRepos.passwordStore = {
     github = "glittershark/pass";
     path = ".local/share/password-store";
   };
diff --git a/users/aspen/system/home/modules/desktop.nix b/users/aspen/system/home/modules/desktop.nix
index cab3b658e0..07df127ec1 100644
--- a/users/aspen/system/home/modules/desktop.nix
+++ b/users/aspen/system/home/modules/desktop.nix
@@ -38,8 +38,8 @@
   gtk = {
     enable = true;
     gtk3.bookmarks = [
-      "file:///home/grfn/code"
-      "file:///home/grfn/notes"
+      "file:///home/aspen/code"
+      "file:///home/aspen/notes"
     ];
   };
 }
diff --git a/users/aspen/system/home/modules/development.nix b/users/aspen/system/home/modules/development.nix
index 26817af497..2695b0fc88 100644
--- a/users/aspen/system/home/modules/development.nix
+++ b/users/aspen/system/home/modules/development.nix
@@ -33,7 +33,7 @@ with lib;
   imports = [
     ./lib/zshFunctions.nix
     ./development/kube.nix
-    # TODO(grfn): agda build is broken in the nixpkgs checkout
+    # TODO(aspen): agda build is broken in the nixpkgs checkout
     # ./development/agda.nix
     ./development/rust.nix
   ];
@@ -68,7 +68,7 @@ with lib;
 
     nodePackages.prettier
   ] ++ optionals (stdenv.isLinux) [
-    # TODO(grfn): replace with stable again once the current julia debacle
+    # TODO(aspen): replace with stable again once the current julia debacle
     # is resolved upstream, see https://github.com/NixOS/nixpkgs/pull/121114
     julia_16-bin
     valgrind
diff --git a/users/aspen/system/home/modules/development/agda.nix b/users/aspen/system/home/modules/development/agda.nix
index afd22a306d..55381994c4 100644
--- a/users/aspen/system/home/modules/development/agda.nix
+++ b/users/aspen/system/home/modules/development/agda.nix
@@ -29,7 +29,7 @@ in
       ]))
   ];
 
-  grfn.impure.clonedRepos = {
+  aspen.impure.clonedRepos = {
     agda-stdlib = {
       github = "agda/agda-stdlib";
       path = "code/agda-stdlib";
@@ -51,8 +51,8 @@ in
   '';
 
   home.file.".agda/libraries".text = ''
-    /home/grfn/code/agda-stdlib/standard-library.agda-lib
-    /home/grfn/code/agda-categories/agda-categories.agda-lib
+    /home/aspen/code/agda-stdlib/standard-library.agda-lib
+    /home/aspen/code/agda-categories/agda-categories.agda-lib
   '';
 
 }
diff --git a/users/aspen/system/home/modules/emacs.nix b/users/aspen/system/home/modules/emacs.nix
index 3db4e293f8..6936da4b9d 100644
--- a/users/aspen/system/home/modules/emacs.nix
+++ b/users/aspen/system/home/modules/emacs.nix
@@ -76,7 +76,7 @@ in
         );
       };
 
-      grfn.impure.clonedRepos = {
+      aspen.impure.clonedRepos = {
         orgClubhouse = {
           github = "glittershark/org-clubhouse";
           path = "code/org-clubhouse";
diff --git a/users/aspen/system/home/modules/email.nix b/users/aspen/system/home/modules/email.nix
index 5cf5a67eaa..cb92c40cee 100644
--- a/users/aspen/system/home/modules/email.nix
+++ b/users/aspen/system/home/modules/email.nix
@@ -16,7 +16,7 @@ let
     personal = {
       primary = true;
       address = "root@gws.fyi";
-      aliases = [ "grfn@gws.fyi" "aspen@gws.fyi" ];
+      aliases = [ "aspen@gws.fyi" "aspen@gws.fyi" ];
       passEntry = "root-gws-msmtp";
     };
   };
diff --git a/users/aspen/system/home/modules/i3.nix b/users/aspen/system/home/modules/i3.nix
index 1ce842af20..34bd7f1b2a 100644
--- a/users/aspen/system/home/modules/i3.nix
+++ b/users/aspen/system/home/modules/i3.nix
@@ -290,14 +290,14 @@ in
                   }
 
                   external_script inbox {
-                      script_path = '${emacsclient "(grfn/num-inbox-items-message)"}'
+                      script_path = '${emacsclient "(aspen/num-inbox-items-message)"}'
                       format = 'Inbox: {output}'
                       cache_timeout = 120
                       color = "#93a1a1"
                   }
 
                   external_script current_task {
-                      script_path = '${emacsclient "(grfn/org-current-clocked-in-task-message)"}'
+                      script_path = '${emacsclient "(aspen/org-current-clocked-in-task-message)"}'
                       # format = '{output}'
                       cache_timeout = 60
                       color = "#93a1a1"
diff --git a/users/aspen/system/home/modules/lib/cloneRepo.nix b/users/aspen/system/home/modules/lib/cloneRepo.nix
index 806a8be03c..f3cf59d249 100644
--- a/users/aspen/system/home/modules/lib/cloneRepo.nix
+++ b/users/aspen/system/home/modules/lib/cloneRepo.nix
@@ -2,7 +2,7 @@
 with lib;
 {
   options = {
-    grfn.impure.clonedRepos = mkOption {
+    aspen.impure.clonedRepos = mkOption {
       description = "Repositories to clone";
       default = { };
       type = with types; attrsOf (
@@ -71,6 +71,6 @@ with lib;
               fi
             fi
           '')
-        config.grfn.impure.clonedRepos;
+        config.aspen.impure.clonedRepos;
   };
 }
diff --git a/users/aspen/system/home/modules/tarsnap.nix b/users/aspen/system/home/modules/tarsnap.nix
index 87002610cb..fb2a050852 100644
--- a/users/aspen/system/home/modules/tarsnap.nix
+++ b/users/aspen/system/home/modules/tarsnap.nix
@@ -9,10 +9,10 @@
     ### Recommended options
 
     # Tarsnap cache directory
-    cachedir /home/grfn/.cache/tarsnap
+    cachedir /home/aspen/.cache/tarsnap
 
     # Tarsnap key file
-    keyfile /home/grfn/.private/tarsnap.key
+    keyfile /home/aspen/.private/tarsnap.key
 
     # Don't archive files which have the nodump flag set.
     nodump
diff --git a/users/aspen/system/home/platforms/linux.nix b/users/aspen/system/home/platforms/linux.nix
index 1bcfa08e0d..7952de5172 100644
--- a/users/aspen/system/home/platforms/linux.nix
+++ b/users/aspen/system/home/platforms/linux.nix
@@ -38,7 +38,7 @@ in
     pandoc
     barrier
     depot.tools.nsfv-setup
-    gimp # TODO(grfn): use glimpse once it build again
+    gimp # TODO(aspen): use glimpse once it build again
 
     # System utilities
     powertop
@@ -55,7 +55,7 @@ in
     keybase
     openssl
     yubikey-manager
-    # TODO(grfn): lagging behind yubikey-manager and doesn't support cryptography >= 39
+    # TODO(aspen): lagging behind yubikey-manager and doesn't support cryptography >= 39
     # yubikey-manager-qt
 
     # Spotify...etc
diff --git a/users/aspen/system/system/default.nix b/users/aspen/system/system/default.nix
index ec3a002051..f0f3051e9d 100644
--- a/users/aspen/system/system/default.nix
+++ b/users/aspen/system/system/default.nix
@@ -16,7 +16,7 @@ rec {
     # Use the same nixpkgs as everything else
     home-manager.useGlobalPkgs = true;
 
-    home-manager.users.grfn = { config, lib, ... }: {
+    home-manager.users.aspen = { config, lib, ... }: {
       imports = [ ../home/machines/roswell.nix ];
       lib.depot = depot;
     };
diff --git a/users/aspen/system/system/iso.nix b/users/aspen/system/system/iso.nix
index 398145f1cf..ef5d3ed78b 100644
--- a/users/aspen/system/system/iso.nix
+++ b/users/aspen/system/system/iso.nix
@@ -12,7 +12,7 @@ let
     networking.firewall.enable = false;
     networking.wireless.enable = lib.mkForce false;
 
-    # TODO(grfn): enabling this (in the minimal profile) fails the iso build,
+    # TODO(aspen): enabling this (in the minimal profile) fails the iso build,
     # since gtk+3 needs to be built which fails due to cairo without xlibs
     environment.noXlibs = false;
   };
diff --git a/users/aspen/system/system/machines/mugwump.nix b/users/aspen/system/system/machines/mugwump.nix
index 446f7cd92d..4cfa117134 100644
--- a/users/aspen/system/system/machines/mugwump.nix
+++ b/users/aspen/system/system/machines/mugwump.nix
@@ -73,7 +73,7 @@ with lib;
 
   nix.gc.dates = "monthly";
 
-  users.users.grfn.openssh.authorizedKeys.keys = [
+  users.users.aspen.openssh.authorizedKeys.keys = [
     depot.users.aspen.keys.whitby
   ];
 
diff --git a/users/aspen/system/system/modules/common.nix b/users/aspen/system/system/modules/common.nix
index 17140317f5..3eaeb2efc6 100644
--- a/users/aspen/system/system/modules/common.nix
+++ b/users/aspen/system/system/modules/common.nix
@@ -49,7 +49,7 @@ with lib;
     settings = { X11Forwarding = true; };
   };
 
-  users.users.grfn.openssh.authorizedKeys.keys =
+  users.users.aspen.openssh.authorizedKeys.keys =
     [ depot.users.aspen.keys.main ];
 
   programs.ssh.startAgent = true;
@@ -59,7 +59,7 @@ with lib;
   users.mutableUsers = true;
   programs.zsh.enable = true;
   environment.pathsToLink = [ "/share/zsh" ];
-  users.users.grfn = {
+  users.users.aspen = {
     isNormalUser = true;
     initialPassword = "password";
     extraGroups = [
@@ -71,7 +71,7 @@ with lib;
   };
 
   nix = {
-    settings.trusted-users = [ "grfn" ];
+    settings.trusted-users = [ "aspen" ];
     distributedBuilds = true;
 
     gc = {
diff --git a/users/aspen/system/system/modules/desktop.nix b/users/aspen/system/system/modules/desktop.nix
index 3adbd9d9b0..9a5fc825e1 100644
--- a/users/aspen/system/system/modules/desktop.nix
+++ b/users/aspen/system/system/modules/desktop.nix
@@ -10,7 +10,7 @@
 
   programs.nm-applet.enable = true;
 
-  users.users.grfn.extraGroups = [
+  users.users.aspen.extraGroups = [
     "audio"
     "video"
   ];
diff --git a/users/aspen/system/system/modules/development.nix b/users/aspen/system/system/modules/development.nix
index d17e9d424c..bd5e326b2e 100644
--- a/users/aspen/system/system/modules/development.nix
+++ b/users/aspen/system/system/modules/development.nix
@@ -2,11 +2,11 @@
 
 {
   virtualisation.docker.enable = true;
-  users.users.grfn.extraGroups = [ "docker" ];
+  users.users.aspen.extraGroups = [ "docker" ];
 
   security.pam.loginLimits = [
     {
-      domain = "grfn";
+      domain = "aspen";
       type = "soft";
       item = "nofile";
       value = "65535";
diff --git a/users/aspen/system/system/modules/wireshark.nix b/users/aspen/system/system/modules/wireshark.nix
index 30658419fc..b233d40041 100644
--- a/users/aspen/system/system/modules/wireshark.nix
+++ b/users/aspen/system/system/modules/wireshark.nix
@@ -5,5 +5,5 @@
     enable = true;
     package = pkgs.wireshark;
   };
-  users.users.grfn.extraGroups = [ "wireshark" ];
+  users.users.aspen.extraGroups = [ "wireshark" ];
 }
-- 
cgit 1.4.1