refactor(users/glittershark): Rename to grfn r/2485

Rename my //users directory and all places that refer to glittershark to
grfn, including nix references and documentation.

This may require some extra attention inside of gerrit's database after
it lands to allow me to actually push things.

Change-Id: I4728b7ec2c60024392c1c1fa6e0d4a59b3e266fa
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2933
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: glittershark <grfn@gws.fyi>

362 files changed, 52 insertions, 56 deletions

diff --git a/README.md b/README.md
index 0f618bf21d..bd27ae3518 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ Some examples:
   generator which generates the web page and Atom feed for
   [tazj.in](https://tazj.in)
 * `//users/tazjin/finito`: A persistent finite-state machine library for Rust.
-* `//users/glittershark/xanthous`: A (WIP) TUI RPG, written in Haskell.
+* `//users/grfn/xanthous`: A (WIP) TUI RPG, written in Haskell.
 * `//users/tazjin/emacs`: tazjin's Emacs & EXWM configuration
 
 # Licensing
diff --git a/ops/machines/all-systems.nix b/ops/machines/all-systems.nix
index 493d39e06b..4b1d1457aa 100644
--- a/ops/machines/all-systems.nix
+++ b/ops/machines/all-systems.nix
@@ -10,7 +10,7 @@
   tverskoy
 ]) ++
 
-(with depot.users.glittershark.system.system; [
+(with depot.users.grfn.system.system; [
   chupacabra
   yeren
 ])
diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix
index eb5ee4ed6d..eb93aef69d 100644
--- a/ops/machines/whitby/default.nix
+++ b/ops/machines/whitby/default.nix
@@ -54,7 +54,7 @@ in lib.fix(self: {
           authorizedKeys =
             depot.users.tazjin.keys.all
             ++ depot.users.lukegb.keys.all
-            ++ [ depot.users.glittershark.keys.whitby ];
+            ++ [ depot.users.grfn.keys.whitby ];
 
           hostKeys = [
             /etc/secrets/initrd_host_ed25519_key
@@ -172,7 +172,7 @@ in lib.fix(self: {
       keys = with depot.users;
         tazjin.keys.all
         ++ lukegb.keys.all
-        ++ [ glittershark.keys.whitby ]
+        ++ [ grfn.keys.whitby ]
         ++ sterni.keys.all
         ;
     };
@@ -382,7 +382,7 @@ in lib.fix(self: {
       isNormalUser = true;
       extraGroups = [ "git" "wheel" ];
       openssh.authorizedKeys.keys = [
-        depot.users.glittershark.keys.whitby
+        depot.users.grfn.keys.whitby
       ];
     };
 
diff --git a/ops/modules/www/wigglydonke.rs.nix b/ops/modules/www/wigglydonke.rs.nix
index 0bc67898c6..4643b34317 100644
--- a/ops/modules/www/wigglydonke.rs.nix
+++ b/ops/modules/www/wigglydonke.rs.nix
@@ -9,7 +9,7 @@
     services.nginx.virtualHosts."wigglydonke.rs" = {
       enableACME = true;
       forceSSL = true;
-      root = "${depot.depotPath}/users/glittershark/wigglydonke.rs";
+      root = "${depot.depotPath}/users/grfn/wigglydonke.rs";
     };
   };
 }
diff --git a/ops/users/default.nix b/ops/users/default.nix
index 7a59128c65..cb53cc0a35 100644
--- a/ops/users/default.nix
+++ b/ops/users/default.nix
@@ -47,7 +47,7 @@
     password = "{ARGON2}$argon2id$v=19$m=65536,t=2,p=1$TrezbwIY5TKLnJiii0wafQ$K0S2p9I8tiqP907nkgoK6IbG9ia4IuDiylTcIs5pesw";
   }
   {
-    username = "glittershark";
+    username = "grfn";
     email = "grfn@gws.fyi";
     password = "{SSHA}i7PSAsXwJT3jjmmvU77aar/tU/YPDCEO";
   }
diff --git a/third_party/alsi/OWNERS b/third_party/alsi/OWNERS
index 6f0b5a3ea6..79a422fcde 100644
--- a/third_party/alsi/OWNERS
+++ b/third_party/alsi/OWNERS
@@ -1,3 +1,3 @@
 inherit: true
 owners:
- - glittershark
+ - grfn
diff --git a/third_party/lisp/OWNERS b/third_party/lisp/OWNERS
index 3f06a5376d..2d7f7e237b 100644
--- a/third_party/lisp/OWNERS
+++ b/third_party/lisp/OWNERS
@@ -2,4 +2,4 @@
 inherited: true
 owners:
   - eta
-  - glittershark
+  - grfn
diff --git a/third_party/nix/OWNERS b/third_party/nix/OWNERS
index 326136be7d..886f766d0c 100644
--- a/third_party/nix/OWNERS
+++ b/third_party/nix/OWNERS
@@ -1,5 +1,5 @@
 inherited: true
 owners:
-  - glittershark
+  - grfn
   - tazjin
   - kanepyork
diff --git a/tools/emacs-pkgs/tvl/OWNERS b/tools/emacs-pkgs/tvl/OWNERS
index 9473d17bd5..ce7e0e37ee 100644
--- a/tools/emacs-pkgs/tvl/OWNERS
+++ b/tools/emacs-pkgs/tvl/OWNERS
@@ -1,3 +1,3 @@
 inherited: true
 owners:
-  - glittershark
+  - grfn
diff --git a/users/glittershark/OWNERS b/users/grfn/OWNERS
index 67e9015c8b..da7ac5cb9e 100644
--- a/users/glittershark/OWNERS
+++ b/users/grfn/OWNERS
@@ -1,3 +1,3 @@
 inherited: false
 owners:
-  - glittershark
+  - grfn
diff --git a/users/glittershark/achilles/.envrc b/users/grfn/achilles/.envrc
index 051d09d292..051d09d292 100644
--- a/users/glittershark/achilles/.envrc
+++ b/users/grfn/achilles/.envrc
diff --git a/users/glittershark/achilles/.gitignore b/users/grfn/achilles/.gitignore
index ea8c4bf7f3..ea8c4bf7f3 100644
--- a/users/glittershark/achilles/.gitignore
+++ b/users/grfn/achilles/.gitignore
diff --git a/users/glittershark/achilles/Cargo.lock b/users/grfn/achilles/Cargo.lock
index 30e5e021f1..30e5e021f1 100644
--- a/users/glittershark/achilles/Cargo.lock
+++ b/users/grfn/achilles/Cargo.lock
diff --git a/users/glittershark/achilles/Cargo.toml b/users/grfn/achilles/Cargo.toml
index f091399a0d..f091399a0d 100644
--- a/users/glittershark/achilles/Cargo.toml
+++ b/users/grfn/achilles/Cargo.toml
diff --git a/users/glittershark/achilles/ach/.gitignore b/users/grfn/achilles/ach/.gitignore
index ac5296ebbd..ac5296ebbd 100644
--- a/users/glittershark/achilles/ach/.gitignore
+++ b/users/grfn/achilles/ach/.gitignore
diff --git a/users/glittershark/achilles/ach/Makefile b/users/grfn/achilles/ach/Makefile
index 3a8cd2865e..3a8cd2865e 100644
--- a/users/glittershark/achilles/ach/Makefile
+++ b/users/grfn/achilles/ach/Makefile
diff --git a/users/glittershark/achilles/ach/externs.ach b/users/grfn/achilles/ach/externs.ach
index faf8ce90e3..faf8ce90e3 100644
--- a/users/glittershark/achilles/ach/externs.ach
+++ b/users/grfn/achilles/ach/externs.ach
diff --git a/users/glittershark/achilles/ach/functions.ach b/users/grfn/achilles/ach/functions.ach
index dc6e7a1f3e..dc6e7a1f3e 100644
--- a/users/glittershark/achilles/ach/functions.ach
+++ b/users/grfn/achilles/ach/functions.ach
diff --git a/users/glittershark/achilles/ach/simple.ach b/users/grfn/achilles/ach/simple.ach
index 20f1677235..20f1677235 100644
--- a/users/glittershark/achilles/ach/simple.ach
+++ b/users/grfn/achilles/ach/simple.ach
diff --git a/users/glittershark/achilles/ach/units.ach b/users/grfn/achilles/ach/units.ach
index 70635d978c..70635d978c 100644
--- a/users/glittershark/achilles/ach/units.ach
+++ b/users/grfn/achilles/ach/units.ach
diff --git a/users/glittershark/achilles/default.nix b/users/grfn/achilles/default.nix
index 4ad71455d4..4ad71455d4 100644
--- a/users/glittershark/achilles/default.nix
+++ b/users/grfn/achilles/default.nix
diff --git a/users/glittershark/achilles/shell.nix b/users/grfn/achilles/shell.nix
index cdf74db415..cdf74db415 100644
--- a/users/glittershark/achilles/shell.nix
+++ b/users/grfn/achilles/shell.nix
diff --git a/users/glittershark/achilles/src/ast/hir.rs b/users/grfn/achilles/src/ast/hir.rs
index 0d145d620b..0d145d620b 100644
--- a/users/glittershark/achilles/src/ast/hir.rs
+++ b/users/grfn/achilles/src/ast/hir.rs
diff --git a/users/glittershark/achilles/src/ast/mod.rs b/users/grfn/achilles/src/ast/mod.rs
index 7dc2de8957..7dc2de8957 100644
--- a/users/glittershark/achilles/src/ast/mod.rs
+++ b/users/grfn/achilles/src/ast/mod.rs
diff --git a/users/glittershark/achilles/src/codegen/llvm.rs b/users/grfn/achilles/src/codegen/llvm.rs
index 17dec58b5f..17dec58b5f 100644
--- a/users/glittershark/achilles/src/codegen/llvm.rs
+++ b/users/grfn/achilles/src/codegen/llvm.rs
diff --git a/users/glittershark/achilles/src/codegen/mod.rs b/users/grfn/achilles/src/codegen/mod.rs
index 8ef057dba0..8ef057dba0 100644
--- a/users/glittershark/achilles/src/codegen/mod.rs
+++ b/users/grfn/achilles/src/codegen/mod.rs
diff --git a/users/glittershark/achilles/src/commands/check.rs b/users/grfn/achilles/src/commands/check.rs
index 0bea482c14..0bea482c14 100644
--- a/users/glittershark/achilles/src/commands/check.rs
+++ b/users/grfn/achilles/src/commands/check.rs
diff --git a/users/glittershark/achilles/src/commands/compile.rs b/users/grfn/achilles/src/commands/compile.rs
index be8767575a..be8767575a 100644
--- a/users/glittershark/achilles/src/commands/compile.rs
+++ b/users/grfn/achilles/src/commands/compile.rs
diff --git a/users/glittershark/achilles/src/commands/eval.rs b/users/grfn/achilles/src/commands/eval.rs
index 61a712c08a..61a712c08a 100644
--- a/users/glittershark/achilles/src/commands/eval.rs
+++ b/users/grfn/achilles/src/commands/eval.rs
diff --git a/users/glittershark/achilles/src/commands/mod.rs b/users/grfn/achilles/src/commands/mod.rs
index fd0a822708..fd0a822708 100644
--- a/users/glittershark/achilles/src/commands/mod.rs
+++ b/users/grfn/achilles/src/commands/mod.rs
diff --git a/users/glittershark/achilles/src/common/env.rs b/users/grfn/achilles/src/common/env.rs
index 59a5e46c46..59a5e46c46 100644
--- a/users/glittershark/achilles/src/common/env.rs
+++ b/users/grfn/achilles/src/common/env.rs
diff --git a/users/glittershark/achilles/src/common/error.rs b/users/grfn/achilles/src/common/error.rs
index 51575a895e..51575a895e 100644
--- a/users/glittershark/achilles/src/common/error.rs
+++ b/users/grfn/achilles/src/common/error.rs
diff --git a/users/glittershark/achilles/src/common/mod.rs b/users/grfn/achilles/src/common/mod.rs
index 8368a6dd18..8368a6dd18 100644
--- a/users/glittershark/achilles/src/common/mod.rs
+++ b/users/grfn/achilles/src/common/mod.rs
diff --git a/users/glittershark/achilles/src/common/namer.rs b/users/grfn/achilles/src/common/namer.rs
index 016e9f6ed9..016e9f6ed9 100644
--- a/users/glittershark/achilles/src/common/namer.rs
+++ b/users/grfn/achilles/src/common/namer.rs
diff --git a/users/glittershark/achilles/src/compiler.rs b/users/grfn/achilles/src/compiler.rs
index 45b215473d..45b215473d 100644
--- a/users/glittershark/achilles/src/compiler.rs
+++ b/users/grfn/achilles/src/compiler.rs
diff --git a/users/glittershark/achilles/src/interpreter/error.rs b/users/grfn/achilles/src/interpreter/error.rs
index 268d6f479a..268d6f479a 100644
--- a/users/glittershark/achilles/src/interpreter/error.rs
+++ b/users/grfn/achilles/src/interpreter/error.rs
diff --git a/users/glittershark/achilles/src/interpreter/mod.rs b/users/grfn/achilles/src/interpreter/mod.rs
index a8ba2dd3ac..a8ba2dd3ac 100644
--- a/users/glittershark/achilles/src/interpreter/mod.rs
+++ b/users/grfn/achilles/src/interpreter/mod.rs
diff --git a/users/glittershark/achilles/src/interpreter/value.rs b/users/grfn/achilles/src/interpreter/value.rs
index 55ba42f9de..55ba42f9de 100644
--- a/users/glittershark/achilles/src/interpreter/value.rs
+++ b/users/grfn/achilles/src/interpreter/value.rs
diff --git a/users/glittershark/achilles/src/main.rs b/users/grfn/achilles/src/main.rs
index 5ae1b59b3a..5ae1b59b3a 100644
--- a/users/glittershark/achilles/src/main.rs
+++ b/users/grfn/achilles/src/main.rs
diff --git a/users/glittershark/achilles/src/parser/expr.rs b/users/grfn/achilles/src/parser/expr.rs
index 8a28d00984..8a28d00984 100644
--- a/users/glittershark/achilles/src/parser/expr.rs
+++ b/users/grfn/achilles/src/parser/expr.rs
diff --git a/users/glittershark/achilles/src/parser/macros.rs b/users/grfn/achilles/src/parser/macros.rs
index 406e5c0e69..406e5c0e69 100644
--- a/users/glittershark/achilles/src/parser/macros.rs
+++ b/users/grfn/achilles/src/parser/macros.rs
diff --git a/users/glittershark/achilles/src/parser/mod.rs b/users/grfn/achilles/src/parser/mod.rs
index 3e0081bd39..3e0081bd39 100644
--- a/users/glittershark/achilles/src/parser/mod.rs
+++ b/users/grfn/achilles/src/parser/mod.rs
diff --git a/users/glittershark/achilles/src/parser/type_.rs b/users/grfn/achilles/src/parser/type_.rs
index 8a1081e252..8a1081e252 100644
--- a/users/glittershark/achilles/src/parser/type_.rs
+++ b/users/grfn/achilles/src/parser/type_.rs
diff --git a/users/glittershark/achilles/src/passes/hir/mod.rs b/users/grfn/achilles/src/passes/hir/mod.rs
index 845bfcb7ab..845bfcb7ab 100644
--- a/users/glittershark/achilles/src/passes/hir/mod.rs
+++ b/users/grfn/achilles/src/passes/hir/mod.rs
diff --git a/users/glittershark/achilles/src/passes/hir/monomorphize.rs b/users/grfn/achilles/src/passes/hir/monomorphize.rs
index 251a988f4f..251a988f4f 100644
--- a/users/glittershark/achilles/src/passes/hir/monomorphize.rs
+++ b/users/grfn/achilles/src/passes/hir/monomorphize.rs
diff --git a/users/glittershark/achilles/src/passes/hir/strip_positive_units.rs b/users/grfn/achilles/src/passes/hir/strip_positive_units.rs
index 91b56551c8..91b56551c8 100644
--- a/users/glittershark/achilles/src/passes/hir/strip_positive_units.rs
+++ b/users/grfn/achilles/src/passes/hir/strip_positive_units.rs
diff --git a/users/glittershark/achilles/src/passes/mod.rs b/users/grfn/achilles/src/passes/mod.rs
index 306869bef1..306869bef1 100644
--- a/users/glittershark/achilles/src/passes/mod.rs
+++ b/users/grfn/achilles/src/passes/mod.rs
diff --git a/users/glittershark/achilles/src/tc/mod.rs b/users/grfn/achilles/src/tc/mod.rs
index d27c45075e..d27c45075e 100644
--- a/users/glittershark/achilles/src/tc/mod.rs
+++ b/users/grfn/achilles/src/tc/mod.rs
diff --git a/users/glittershark/achilles/tests/compile.rs b/users/grfn/achilles/tests/compile.rs
index 0f1086bfd8..0f1086bfd8 100644
--- a/users/glittershark/achilles/tests/compile.rs
+++ b/users/grfn/achilles/tests/compile.rs
diff --git a/users/glittershark/emacs.d/+bindings.el b/users/grfn/emacs.d/+bindings.el
index 81ffde3679..91040eb71d 100644
--- a/users/glittershark/emacs.d/+bindings.el
+++ b/users/grfn/emacs.d/+bindings.el
@@ -1,4 +1,4 @@
-;; /+bindings.el -*- lexical-binding: t; -*-
+;; -*- lexical-binding: t; -*-
 
 (load! "utils")
 (require 'f)
diff --git a/users/glittershark/emacs.d/+commands.el b/users/grfn/emacs.d/+commands.el
index a5753c8e99..518f185cb9 100644
--- a/users/glittershark/emacs.d/+commands.el
+++ b/users/grfn/emacs.d/+commands.el
@@ -1,4 +1,4 @@
-
+;; -*- lexical-binding: t; -*-
 
 (defalias 'ex! 'evil-ex-define-cmd)
 
diff --git a/users/glittershark/emacs.d/+private.el.gpg b/users/grfn/emacs.d/+private.el.gpg
index 3179dc4249..3179dc4249 100644
--- a/users/glittershark/emacs.d/+private.el.gpg
+++ b/users/grfn/emacs.d/+private.el.gpg
Binary files differdiff --git a/users/glittershark/emacs.d/.gitignore b/users/grfn/emacs.d/.gitignore
index 1fd0e39887..1fd0e39887 100644
--- a/users/glittershark/emacs.d/.gitignore
+++ b/users/grfn/emacs.d/.gitignore
diff --git a/users/glittershark/emacs.d/autoload/evil.el b/users/grfn/emacs.d/autoload/evil.el
index 319c93c05e..319c93c05e 100644
--- a/users/glittershark/emacs.d/autoload/evil.el
+++ b/users/grfn/emacs.d/autoload/evil.el
diff --git a/users/glittershark/emacs.d/autoload/hlissner.el b/users/grfn/emacs.d/autoload/hlissner.el
index 87b2236d12..87b2236d12 100644
--- a/users/glittershark/emacs.d/autoload/hlissner.el
+++ b/users/grfn/emacs.d/autoload/hlissner.el
diff --git a/users/glittershark/emacs.d/clocked-in-elt.el b/users/grfn/emacs.d/clocked-in-elt.el
index 00fda047e4..be4161441d 100644
--- a/users/glittershark/emacs.d/clocked-in-elt.el
+++ b/users/grfn/emacs.d/clocked-in-elt.el
@@ -1,5 +1,4 @@
-;;; ~/.doom.d/clocked-in-elt.el -*- lexical-binding: t; -*-
-;;;
+;;; -*- lexical-binding: t; -*-
 (load (expand-file-name "init" (or (getenv "EMACSDIR")
                (expand-file-name
                 "../.emacs.d"
diff --git a/users/glittershark/emacs.d/clojure.el b/users/grfn/emacs.d/clojure.el
index 07f1a4e213..9dc1a68323 100644
--- a/users/glittershark/emacs.d/clojure.el
+++ b/users/grfn/emacs.d/clojure.el
@@ -1,4 +1,4 @@
-;;; ~/code/depot/users/glittershark/emacs.d/clojure.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (defun clojure-thing-at-point-setup ()
   (interactive)
diff --git a/users/glittershark/emacs.d/company-sql.el b/users/grfn/emacs.d/company-sql.el
index 2408347cef..e623aa2de1 100644
--- a/users/glittershark/emacs.d/company-sql.el
+++ b/users/grfn/emacs.d/company-sql.el
@@ -1,5 +1,3 @@
-;;; ~/.doom.d/company-sql.el
-
 ;;; Commentary:
 ;;; TODO
 
diff --git a/users/glittershark/emacs.d/config.el b/users/grfn/emacs.d/config.el
index fd6eced212..230211ea2f 100644
--- a/users/glittershark/emacs.d/config.el
+++ b/users/grfn/emacs.d/config.el
@@ -1,4 +1,4 @@
-;;; private/grfn/config.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 ;; I've swapped these keys on my keyboard
 (setq x-super-keysym 'alt
diff --git a/users/glittershark/emacs.d/cpp.el b/users/grfn/emacs.d/cpp.el
index 3f118ec37e..5b5dc8ead6 100644
--- a/users/glittershark/emacs.d/cpp.el
+++ b/users/grfn/emacs.d/cpp.el
@@ -1,4 +1,4 @@
-;;; ~/code/depot/users/glittershark/emacs.d/cpp.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 
 (load! "google-c-style")
@@ -11,7 +11,7 @@
   (when (s-starts-with?
          "/home/grfn/code/depot/third_party/nix"
          (buffer-file-name))
-    (setq lsp-clients-clangd-executable "/home/grfn/code/depot/users/glittershark/emacs.d/nix-clangd.sh"
+    (setq lsp-clients-clangd-executable "/home/grfn/code/depot/users/grfn/emacs.d/nix-clangd.sh"
           lsp-clients-clangd-args nil)
     (google-set-c-style)
     (lsp)
diff --git a/users/glittershark/emacs.d/email.el b/users/grfn/emacs.d/email.el
index 240fcfc538..b6e51f686e 100644
--- a/users/glittershark/emacs.d/email.el
+++ b/users/grfn/emacs.d/email.el
@@ -1,4 +1,4 @@
-;;; ~/code/depot/users/glittershark/emacs.d/email.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (after! notmuch
   (setq notmuch-saved-searches
diff --git a/users/glittershark/emacs.d/github-org.el b/users/grfn/emacs.d/github-org.el
index be8af3f394..f4f9d2e370 100644
--- a/users/glittershark/emacs.d/github-org.el
+++ b/users/grfn/emacs.d/github-org.el
@@ -1,4 +1,4 @@
-;;; ~/.doom.d/github-org.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (require 'ghub)
 
diff --git a/users/glittershark/emacs.d/google-c-style.el b/users/grfn/emacs.d/google-c-style.el
index 9bb12c61aa..9bb12c61aa 100644
--- a/users/glittershark/emacs.d/google-c-style.el
+++ b/users/grfn/emacs.d/google-c-style.el
diff --git a/users/glittershark/emacs.d/grid.el b/users/grfn/emacs.d/grid.el
index ad524504e9..75776a38cd 100644
--- a/users/glittershark/emacs.d/grid.el
+++ b/users/grfn/emacs.d/grid.el
@@ -1,4 +1,4 @@
-;;; ~/.doom.d/grid.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (require 's)
 
diff --git a/users/glittershark/emacs.d/init.el b/users/grfn/emacs.d/init.el
index 99a6ad7499..4ffa33ca65 100644
--- a/users/glittershark/emacs.d/init.el
+++ b/users/grfn/emacs.d/init.el
@@ -1,4 +1,4 @@
-;;; private/grfn/init.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (doom! :completion
        company           ; the ultimate code completion backend
diff --git a/users/glittershark/emacs.d/irc.el b/users/grfn/emacs.d/irc.el
index 6d378fe207..7a3ff23c33 100644
--- a/users/glittershark/emacs.d/irc.el
+++ b/users/grfn/emacs.d/irc.el
@@ -1,4 +1,4 @@
-;;; ~/.doom.d/irc.el
+;;; -*- lexical-binding: t; -*-
 
 (require 'erc)
 (require 'alert)
@@ -46,7 +46,7 @@
                                 message)))
          (or (and tvl-enabled?
                   (string-equal erc-channel "##tvl"))
-             (string-match "glittershark" message)))))
+             (string-match "grfn" message)))))
 
 (comment
  last-info
@@ -61,7 +61,7 @@ If the buffer is currently not visible, makes it sticky."
   (if (or (null match-type) (not (eq match-type 'fool)))
       (let (alert-log-messages)
         (alert (or message (buffer-string))
-               :severity (if (string-match "glittershark" (or message ""))
+               :severity (if (string-match "grfn" (or message ""))
                              'high 'low)
                :title (or nick (buffer-name))
                :data `(:message ,(or message (buffer-string))
@@ -79,7 +79,7 @@ If the buffer is currently not visible, makes it sticky."
    :predicate
    #'(lambda (info)
        (and (not (eq (current-buffer) (plist-get info :buffer)))
-            (string-match "glittershark:" (plist-get info :message))))
+            (string-match "grfn:" (plist-get info :message))))
    :persistent
    #'(lambda (info)
        ;; If the buffer is buried, or the user has been idle for
diff --git a/users/glittershark/emacs.d/lisp.el b/users/grfn/emacs.d/lisp.el
index e18a1609b2..c45cc7e6e3 100644
--- a/users/glittershark/emacs.d/lisp.el
+++ b/users/grfn/emacs.d/lisp.el
@@ -1,4 +1,4 @@
-;;; ~/code/depot/users/glittershark/emacs.d/lisp.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (defun grfn/sly-panettone ()
   (interactive)
diff --git a/users/glittershark/emacs.d/nix-clangd.sh b/users/grfn/emacs.d/nix-clangd.sh
index 16f6252d8b..16f6252d8b 100755
--- a/users/glittershark/emacs.d/nix-clangd.sh
+++ b/users/grfn/emacs.d/nix-clangd.sh
diff --git a/users/glittershark/emacs.d/nix.el b/users/grfn/emacs.d/nix.el
index a5d09f825c..ec5b474af2 100644
--- a/users/glittershark/emacs.d/nix.el
+++ b/users/grfn/emacs.d/nix.el
@@ -1,4 +1,4 @@
-;;; ~/code/depot/users/glittershark/emacs.d/nix.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (defun nix-buffer-type ()
   "Returns:
diff --git a/users/glittershark/emacs.d/org-alerts.el b/users/grfn/emacs.d/org-alerts.el
index 993791f367..8e6c3e0417 100644
--- a/users/glittershark/emacs.d/org-alerts.el
+++ b/users/grfn/emacs.d/org-alerts.el
@@ -1,4 +1,4 @@
-;;; ~/.doom.d/org-alerts.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 ;;; Commentary:
 
diff --git a/users/glittershark/emacs.d/org-config.el b/users/grfn/emacs.d/org-config.el
index 59953dfeaa..f2a60d0dc3 100644
--- a/users/glittershark/emacs.d/org-config.el
+++ b/users/grfn/emacs.d/org-config.el
@@ -1,5 +1,4 @@
-;;; ~/.doom.d/org-config.el -*- lexical-binding: t; -*-
-;;;
+;;; -*- lexical-binding: t; -*-
 
 (defun notes-file (f)
   (concat org-directory (if (string-prefix-p "/" f) "" "/") f))
diff --git a/users/glittershark/emacs.d/org-gcal.el b/users/grfn/emacs.d/org-gcal.el
index 361daaac42..3e315c5e60 100644
--- a/users/glittershark/emacs.d/org-gcal.el
+++ b/users/grfn/emacs.d/org-gcal.el
@@ -1,4 +1,4 @@
-;;; ~/.doom.d/org-gcal.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (require 'aio)
 (require 'parse-time)
diff --git a/users/glittershark/emacs.d/org-query.el b/users/grfn/emacs.d/org-query.el
index 3ed4b086af..e659e02c8b 100644
--- a/users/glittershark/emacs.d/org-query.el
+++ b/users/grfn/emacs.d/org-query.el
@@ -1,4 +1,4 @@
-;;; ~/.doom.d/org-query.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (require 'org)
 (require 'org-agenda)
diff --git a/users/glittershark/emacs.d/packages.el b/users/grfn/emacs.d/packages.el
index 67b3defdd7..67b3defdd7 100644
--- a/users/glittershark/emacs.d/packages.el
+++ b/users/grfn/emacs.d/packages.el
diff --git a/users/glittershark/emacs.d/rust.el b/users/grfn/emacs.d/rust.el
index 44c3552f6e..91d1f16a11 100644
--- a/users/glittershark/emacs.d/rust.el
+++ b/users/grfn/emacs.d/rust.el
@@ -1,4 +1,4 @@
-;;; ../code/depot/users/glittershark/emacs.d/rust.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (add-to-list 'auto-mode-alist '("\\.rs$" . rust-mode))
 
diff --git a/users/glittershark/emacs.d/show-matching-paren.el b/users/grfn/emacs.d/show-matching-paren.el
index d10751a63f..ab65a912a8 100644
--- a/users/glittershark/emacs.d/show-matching-paren.el
+++ b/users/grfn/emacs.d/show-matching-paren.el
@@ -1,4 +1,4 @@
-;;; ~/.doom.d/show-matching-paren.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 ;;; https://with-emacs.com/posts/ui-hacks/show-matching-lines-when-parentheses-go-off-screen/
 
diff --git a/users/glittershark/emacs.d/slack-snippets.el b/users/grfn/emacs.d/slack-snippets.el
index 9e05382ee6..b5bd4db748 100644
--- a/users/glittershark/emacs.d/slack-snippets.el
+++ b/users/grfn/emacs.d/slack-snippets.el
@@ -1,4 +1,4 @@
-;;; private/grfn/slack-snippets.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (require 'dash)
 (require 'dash-functional)
diff --git a/users/glittershark/emacs.d/slack.el b/users/grfn/emacs.d/slack.el
index ac81067bb1..54d3b40b09 100644
--- a/users/glittershark/emacs.d/slack.el
+++ b/users/grfn/emacs.d/slack.el
@@ -1,4 +1,4 @@
-;;; ~/code/depot/users/glittershark/emacs.d/slack.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (after! slack
   (set-face-foreground 'slack-message-output-header +solarized-s-base01)
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/annotation b/users/grfn/emacs.d/snippets/haskell-mode/annotation
index 8a2854d759..8a2854d759 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/annotation
+++ b/users/grfn/emacs.d/snippets/haskell-mode/annotation
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/benchmark-module b/users/grfn/emacs.d/snippets/haskell-mode/benchmark-module
index cbb1646e41..cbb1646e41 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/benchmark-module
+++ b/users/grfn/emacs.d/snippets/haskell-mode/benchmark-module
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/header b/users/grfn/emacs.d/snippets/haskell-mode/header
index fdd8250d86..fdd8250d86 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/header
+++ b/users/grfn/emacs.d/snippets/haskell-mode/header
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/hedgehog-generator b/users/grfn/emacs.d/snippets/haskell-mode/hedgehog-generator
index 68863f7054..68863f7054 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/hedgehog-generator
+++ b/users/grfn/emacs.d/snippets/haskell-mode/hedgehog-generator
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/hedgehog-property b/users/grfn/emacs.d/snippets/haskell-mode/hedgehog-property
index bf39a2a3ee..bf39a2a3ee 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/hedgehog-property
+++ b/users/grfn/emacs.d/snippets/haskell-mode/hedgehog-property
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/hlint b/users/grfn/emacs.d/snippets/haskell-mode/hlint
index 74b63dc672..74b63dc672 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/hlint
+++ b/users/grfn/emacs.d/snippets/haskell-mode/hlint
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/import-i b/users/grfn/emacs.d/snippets/haskell-mode/import-i
index 4a7fca2c2f..4a7fca2c2f 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/import-i
+++ b/users/grfn/emacs.d/snippets/haskell-mode/import-i
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/inl b/users/grfn/emacs.d/snippets/haskell-mode/inl
index 6e17b83d71..6e17b83d71 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/inl
+++ b/users/grfn/emacs.d/snippets/haskell-mode/inl
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/inline b/users/grfn/emacs.d/snippets/haskell-mode/inline
index 1beafbe50b..1beafbe50b 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/inline
+++ b/users/grfn/emacs.d/snippets/haskell-mode/inline
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/language pragma b/users/grfn/emacs.d/snippets/haskell-mode/language pragma
index 6f84720f45..6f84720f45 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/language pragma
+++ b/users/grfn/emacs.d/snippets/haskell-mode/language pragma
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/lens.field b/users/grfn/emacs.d/snippets/haskell-mode/lens.field
index b22ea3d2e8..b22ea3d2e8 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/lens.field
+++ b/users/grfn/emacs.d/snippets/haskell-mode/lens.field
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/module b/users/grfn/emacs.d/snippets/haskell-mode/module
index 4554d33f9b..4554d33f9b 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/module
+++ b/users/grfn/emacs.d/snippets/haskell-mode/module
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/shut up, hlint b/users/grfn/emacs.d/snippets/haskell-mode/shut up, hlint
index fccff1d66f..fccff1d66f 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/shut up, hlint
+++ b/users/grfn/emacs.d/snippets/haskell-mode/shut up, hlint
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/test-module b/users/grfn/emacs.d/snippets/haskell-mode/test-module
index 82224b36a4..82224b36a4 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/test-module
+++ b/users/grfn/emacs.d/snippets/haskell-mode/test-module
diff --git a/users/glittershark/emacs.d/snippets/haskell-mode/undefined b/users/grfn/emacs.d/snippets/haskell-mode/undefined
index 7bcd99b571..7bcd99b571 100644
--- a/users/glittershark/emacs.d/snippets/haskell-mode/undefined
+++ b/users/grfn/emacs.d/snippets/haskell-mode/undefined
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/action-type b/users/grfn/emacs.d/snippets/js2-mode/action-type
index ef8d1a3863..ef8d1a3863 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/action-type
+++ b/users/grfn/emacs.d/snippets/js2-mode/action-type
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/before b/users/grfn/emacs.d/snippets/js2-mode/before
index 4569b65831..4569b65831 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/before
+++ b/users/grfn/emacs.d/snippets/js2-mode/before
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/context b/users/grfn/emacs.d/snippets/js2-mode/context
index d83809f3c3..d83809f3c3 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/context
+++ b/users/grfn/emacs.d/snippets/js2-mode/context
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/describe b/users/grfn/emacs.d/snippets/js2-mode/describe
index bd0198181d..bd0198181d 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/describe
+++ b/users/grfn/emacs.d/snippets/js2-mode/describe
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/expect b/users/grfn/emacs.d/snippets/js2-mode/expect
index eba41ef330..eba41ef330 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/expect
+++ b/users/grfn/emacs.d/snippets/js2-mode/expect
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/function b/users/grfn/emacs.d/snippets/js2-mode/function
index b423044b44..b423044b44 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/function
+++ b/users/grfn/emacs.d/snippets/js2-mode/function
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/header b/users/grfn/emacs.d/snippets/js2-mode/header
index 3e303764cb..3e303764cb 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/header
+++ b/users/grfn/emacs.d/snippets/js2-mode/header
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/it b/users/grfn/emacs.d/snippets/js2-mode/it
index a451cfc08a..a451cfc08a 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/it
+++ b/users/grfn/emacs.d/snippets/js2-mode/it
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/it-pending b/users/grfn/emacs.d/snippets/js2-mode/it-pending
index 00da312e10..00da312e10 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/it-pending
+++ b/users/grfn/emacs.d/snippets/js2-mode/it-pending
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/module b/users/grfn/emacs.d/snippets/js2-mode/module
index dc79819d89..dc79819d89 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/module
+++ b/users/grfn/emacs.d/snippets/js2-mode/module
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/record b/users/grfn/emacs.d/snippets/js2-mode/record
index 0bb0f02436..0bb0f02436 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/record
+++ b/users/grfn/emacs.d/snippets/js2-mode/record
diff --git a/users/glittershark/emacs.d/snippets/js2-mode/test b/users/grfn/emacs.d/snippets/js2-mode/test
index 938d490a74..938d490a74 100644
--- a/users/glittershark/emacs.d/snippets/js2-mode/test
+++ b/users/grfn/emacs.d/snippets/js2-mode/test
diff --git a/users/glittershark/emacs.d/snippets/nix-mode/fetchFromGitHub b/users/grfn/emacs.d/snippets/nix-mode/fetchFromGitHub
index 9b93735730..9b93735730 100644
--- a/users/glittershark/emacs.d/snippets/nix-mode/fetchFromGitHub
+++ b/users/grfn/emacs.d/snippets/nix-mode/fetchFromGitHub
diff --git a/users/glittershark/emacs.d/snippets/nix-mode/pythonPackage b/users/grfn/emacs.d/snippets/nix-mode/pythonPackage
index 0a74c21e18..0a74c21e18 100644
--- a/users/glittershark/emacs.d/snippets/nix-mode/pythonPackage
+++ b/users/grfn/emacs.d/snippets/nix-mode/pythonPackage
diff --git a/users/glittershark/emacs.d/snippets/nix-mode/sha256 b/users/grfn/emacs.d/snippets/nix-mode/sha256
index e3d52e1c02..e3d52e1c02 100644
--- a/users/glittershark/emacs.d/snippets/nix-mode/sha256
+++ b/users/grfn/emacs.d/snippets/nix-mode/sha256
diff --git a/users/glittershark/emacs.d/snippets/org-mode/SQL source block b/users/grfn/emacs.d/snippets/org-mode/SQL source block
index b5d43fd6bc..b5d43fd6bc 100644
--- a/users/glittershark/emacs.d/snippets/org-mode/SQL source block
+++ b/users/grfn/emacs.d/snippets/org-mode/SQL source block
diff --git a/users/glittershark/emacs.d/snippets/org-mode/combat b/users/grfn/emacs.d/snippets/org-mode/combat
index ef46062d09..ef46062d09 100644
--- a/users/glittershark/emacs.d/snippets/org-mode/combat
+++ b/users/grfn/emacs.d/snippets/org-mode/combat
diff --git a/users/glittershark/emacs.d/snippets/org-mode/date b/users/grfn/emacs.d/snippets/org-mode/date
index 297529cdac..297529cdac 100644
--- a/users/glittershark/emacs.d/snippets/org-mode/date
+++ b/users/grfn/emacs.d/snippets/org-mode/date
diff --git a/users/glittershark/emacs.d/snippets/org-mode/date-time b/users/grfn/emacs.d/snippets/org-mode/date-time
index fde469276c..fde469276c 100644
--- a/users/glittershark/emacs.d/snippets/org-mode/date-time
+++ b/users/grfn/emacs.d/snippets/org-mode/date-time
diff --git a/users/glittershark/emacs.d/snippets/org-mode/description b/users/grfn/emacs.d/snippets/org-mode/description
index a43bc95cc3..a43bc95cc3 100644
--- a/users/glittershark/emacs.d/snippets/org-mode/description
+++ b/users/grfn/emacs.d/snippets/org-mode/description
diff --git a/users/glittershark/emacs.d/snippets/org-mode/nologdone b/users/grfn/emacs.d/snippets/org-mode/nologdone
index e5be85d6b3..e5be85d6b3 100644
--- a/users/glittershark/emacs.d/snippets/org-mode/nologdone
+++ b/users/grfn/emacs.d/snippets/org-mode/nologdone
diff --git a/users/glittershark/emacs.d/snippets/org-mode/python source block b/users/grfn/emacs.d/snippets/org-mode/python source block
index 247ae51b0b..247ae51b0b 100644
--- a/users/glittershark/emacs.d/snippets/org-mode/python source block
+++ b/users/grfn/emacs.d/snippets/org-mode/python source block
diff --git a/users/glittershark/emacs.d/snippets/org-mode/reveal b/users/grfn/emacs.d/snippets/org-mode/reveal
index 1bdbdfa5dc..1bdbdfa5dc 100644
--- a/users/glittershark/emacs.d/snippets/org-mode/reveal
+++ b/users/grfn/emacs.d/snippets/org-mode/reveal
diff --git a/users/glittershark/emacs.d/snippets/org-mode/transaction b/users/grfn/emacs.d/snippets/org-mode/transaction
index 37f2dd31ca..37f2dd31ca 100644
--- a/users/glittershark/emacs.d/snippets/org-mode/transaction
+++ b/users/grfn/emacs.d/snippets/org-mode/transaction
diff --git a/users/glittershark/emacs.d/snippets/python-mode/add_column b/users/grfn/emacs.d/snippets/python-mode/add_column
index 47e83850d5..47e83850d5 100644
--- a/users/glittershark/emacs.d/snippets/python-mode/add_column
+++ b/users/grfn/emacs.d/snippets/python-mode/add_column
diff --git a/users/glittershark/emacs.d/snippets/python-mode/decorate b/users/grfn/emacs.d/snippets/python-mode/decorate
index 9448b45c96..9448b45c96 100644
--- a/users/glittershark/emacs.d/snippets/python-mode/decorate
+++ b/users/grfn/emacs.d/snippets/python-mode/decorate
diff --git a/users/glittershark/emacs.d/snippets/python-mode/dunder b/users/grfn/emacs.d/snippets/python-mode/dunder
index c49ec40a15..c49ec40a15 100644
--- a/users/glittershark/emacs.d/snippets/python-mode/dunder
+++ b/users/grfn/emacs.d/snippets/python-mode/dunder
diff --git a/users/glittershark/emacs.d/snippets/python-mode/name b/users/grfn/emacs.d/snippets/python-mode/name
index eca6d60b48..eca6d60b48 100644
--- a/users/glittershark/emacs.d/snippets/python-mode/name
+++ b/users/grfn/emacs.d/snippets/python-mode/name
diff --git a/users/glittershark/emacs.d/snippets/python-mode/op.get_bind.execute b/users/grfn/emacs.d/snippets/python-mode/op.get_bind.execute
index aba801c6ba..aba801c6ba 100644
--- a/users/glittershark/emacs.d/snippets/python-mode/op.get_bind.execute
+++ b/users/grfn/emacs.d/snippets/python-mode/op.get_bind.execute
diff --git a/users/glittershark/emacs.d/snippets/python-mode/pdb b/users/grfn/emacs.d/snippets/python-mode/pdb
index 6b5c0bbc0a..6b5c0bbc0a 100644
--- a/users/glittershark/emacs.d/snippets/python-mode/pdb
+++ b/users/grfn/emacs.d/snippets/python-mode/pdb
diff --git a/users/glittershark/emacs.d/snippets/rust-mode/#[macro_use] b/users/grfn/emacs.d/snippets/rust-mode/#[macro_use]
index fea942a337..fea942a337 100644
--- a/users/glittershark/emacs.d/snippets/rust-mode/#[macro_use]
+++ b/users/grfn/emacs.d/snippets/rust-mode/#[macro_use]
diff --git a/users/glittershark/emacs.d/snippets/rust-mode/async test b/users/grfn/emacs.d/snippets/rust-mode/async test
index b48e443cb8..b48e443cb8 100644
--- a/users/glittershark/emacs.d/snippets/rust-mode/async test
+++ b/users/grfn/emacs.d/snippets/rust-mode/async test
diff --git a/users/glittershark/emacs.d/snippets/rust-mode/benchmark b/users/grfn/emacs.d/snippets/rust-mode/benchmark
index f1446923a0..f1446923a0 100644
--- a/users/glittershark/emacs.d/snippets/rust-mode/benchmark
+++ b/users/grfn/emacs.d/snippets/rust-mode/benchmark
diff --git a/users/glittershark/emacs.d/snippets/rust-mode/proptest b/users/grfn/emacs.d/snippets/rust-mode/proptest
index 377b3cfcf6..377b3cfcf6 100644
--- a/users/glittershark/emacs.d/snippets/rust-mode/proptest
+++ b/users/grfn/emacs.d/snippets/rust-mode/proptest
diff --git a/users/glittershark/emacs.d/snippets/rust-mode/tests b/users/grfn/emacs.d/snippets/rust-mode/tests
index 0a476ab586..0a476ab586 100644
--- a/users/glittershark/emacs.d/snippets/rust-mode/tests
+++ b/users/grfn/emacs.d/snippets/rust-mode/tests
diff --git a/users/glittershark/emacs.d/snippets/snippet-mode/indent b/users/grfn/emacs.d/snippets/snippet-mode/indent
index d38ffceafb..d38ffceafb 100644
--- a/users/glittershark/emacs.d/snippets/snippet-mode/indent
+++ b/users/grfn/emacs.d/snippets/snippet-mode/indent
diff --git a/users/glittershark/emacs.d/snippets/sql-mode/count(*) group by b/users/grfn/emacs.d/snippets/sql-mode/count(*) group by
index 6acc46ff39..6acc46ff39 100644
--- a/users/glittershark/emacs.d/snippets/sql-mode/count(*) group by
+++ b/users/grfn/emacs.d/snippets/sql-mode/count(*) group by
diff --git a/users/glittershark/emacs.d/snippets/terraform-mode/variable b/users/grfn/emacs.d/snippets/terraform-mode/variable
index e64175200f..e64175200f 100644
--- a/users/glittershark/emacs.d/snippets/terraform-mode/variable
+++ b/users/grfn/emacs.d/snippets/terraform-mode/variable
diff --git a/users/glittershark/emacs.d/snippets/text-mode/date b/users/grfn/emacs.d/snippets/text-mode/date
index 7b94311470..7b94311470 100644
--- a/users/glittershark/emacs.d/snippets/text-mode/date
+++ b/users/grfn/emacs.d/snippets/text-mode/date
diff --git a/users/glittershark/emacs.d/splitjoin.el b/users/grfn/emacs.d/splitjoin.el
index ea4dcfc393..dbc9704d79 100644
--- a/users/glittershark/emacs.d/splitjoin.el
+++ b/users/grfn/emacs.d/splitjoin.el
@@ -1,4 +1,4 @@
-;;; private/grfn/splitjoin.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (require 'dash)
 (load! "utils")
diff --git a/users/glittershark/emacs.d/sql-strings.el b/users/grfn/emacs.d/sql-strings.el
index 37e22af421..eef397a24e 100644
--- a/users/glittershark/emacs.d/sql-strings.el
+++ b/users/grfn/emacs.d/sql-strings.el
@@ -1,4 +1,4 @@
-;;; ~/.doom.d/sql-strings.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 ;;; https://www.emacswiki.org/emacs/StringAtPoint
 (defun ourcomments-string-or-comment-bounds-1 (what)
diff --git a/users/glittershark/emacs.d/terraform.el b/users/grfn/emacs.d/terraform.el
index 6a1dc4ba47..28e7ce09a2 100644
--- a/users/glittershark/emacs.d/terraform.el
+++ b/users/grfn/emacs.d/terraform.el
@@ -1,4 +1,4 @@
-;;; ../code/depot/users/glittershark/emacs.d/terraform.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (add-hook 'terraform-mode-hook #'terraform-format-on-save-mode)
 
diff --git a/users/glittershark/emacs.d/tests/splitjoin_test.el b/users/grfn/emacs.d/tests/splitjoin_test.el
index 6495a1a595..6495a1a595 100644
--- a/users/glittershark/emacs.d/tests/splitjoin_test.el
+++ b/users/grfn/emacs.d/tests/splitjoin_test.el
diff --git a/users/glittershark/emacs.d/themes/grfn-solarized-light-theme.el b/users/grfn/emacs.d/themes/grfn-solarized-light-theme.el
index ae00b6b5fc..ae00b6b5fc 100644
--- a/users/glittershark/emacs.d/themes/grfn-solarized-light-theme.el
+++ b/users/grfn/emacs.d/themes/grfn-solarized-light-theme.el
diff --git a/users/glittershark/emacs.d/utils.el b/users/grfn/emacs.d/utils.el
index 1bfac3ca8b..21192753a2 100644
--- a/users/glittershark/emacs.d/utils.el
+++ b/users/grfn/emacs.d/utils.el
@@ -1,4 +1,4 @@
-;;; private/grfn/utils.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 
 ;; Elisp Extras
diff --git a/users/glittershark/emacs.d/vterm.el b/users/grfn/emacs.d/vterm.el
index 02d6223a4c..a7fdea46da 100644
--- a/users/glittershark/emacs.d/vterm.el
+++ b/users/grfn/emacs.d/vterm.el
@@ -1,4 +1,4 @@
-;;; ../code/depot/users/glittershark/emacs.d/vterm.el -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
 
 (defun require-vterm ()
   (add-to-list
diff --git a/users/glittershark/gws.fyi/.envrc b/users/grfn/gws.fyi/.envrc
index be81feddb1..be81feddb1 100644
--- a/users/glittershark/gws.fyi/.envrc
+++ b/users/grfn/gws.fyi/.envrc
diff --git a/users/glittershark/gws.fyi/.gitignore b/users/grfn/gws.fyi/.gitignore
index 2b72eaed29..2b72eaed29 100644
--- a/users/glittershark/gws.fyi/.gitignore
+++ b/users/grfn/gws.fyi/.gitignore
diff --git a/users/glittershark/gws.fyi/Makefile b/users/grfn/gws.fyi/Makefile
index a21bfe7b87..d6c9f40c95 100644
--- a/users/glittershark/gws.fyi/Makefile
+++ b/users/grfn/gws.fyi/Makefile
@@ -1,7 +1,7 @@
 .PHONY: deploy
 
 deploy:
-	@$(shell nix-build `git rev-parse --show-toplevel` -A 'users.glittershark."gws.fyi"')
+	@$(shell nix-build `git rev-parse --show-toplevel` -A 'users.grfn."gws.fyi"')
 
 renew:
 	@echo Renewing...
diff --git a/users/glittershark/gws.fyi/config.el b/users/grfn/gws.fyi/config.el
index b05d897d3d..b05d897d3d 100644
--- a/users/glittershark/gws.fyi/config.el
+++ b/users/grfn/gws.fyi/config.el
diff --git a/users/glittershark/gws.fyi/default.nix b/users/grfn/gws.fyi/default.nix
index ef3ef6c570..ef3ef6c570 100644
--- a/users/glittershark/gws.fyi/default.nix
+++ b/users/grfn/gws.fyi/default.nix
diff --git a/users/glittershark/gws.fyi/index.org b/users/grfn/gws.fyi/index.org
index 0886192abf..0886192abf 100644
--- a/users/glittershark/gws.fyi/index.org
+++ b/users/grfn/gws.fyi/index.org
diff --git a/users/glittershark/gws.fyi/main.css b/users/grfn/gws.fyi/main.css
index 26423f18f1..26423f18f1 100644
--- a/users/glittershark/gws.fyi/main.css
+++ b/users/grfn/gws.fyi/main.css
diff --git a/users/glittershark/gws.fyi/orgExportHTML.nix b/users/grfn/gws.fyi/orgExportHTML.nix
index ad5a247958..ad5a247958 100644
--- a/users/glittershark/gws.fyi/orgExportHTML.nix
+++ b/users/grfn/gws.fyi/orgExportHTML.nix
diff --git a/users/glittershark/gws.fyi/shell.nix b/users/grfn/gws.fyi/shell.nix
index 846bdb6677..846bdb6677 100644
--- a/users/glittershark/gws.fyi/shell.nix
+++ b/users/grfn/gws.fyi/shell.nix
diff --git a/users/glittershark/gws.fyi/site.nix b/users/grfn/gws.fyi/site.nix
index a74bee0bef..a74bee0bef 100644
--- a/users/glittershark/gws.fyi/site.nix
+++ b/users/grfn/gws.fyi/site.nix
diff --git a/users/glittershark/keyboard/.gitignore b/users/grfn/keyboard/.gitignore
index b2be92b7db..b2be92b7db 100644
--- a/users/glittershark/keyboard/.gitignore
+++ b/users/grfn/keyboard/.gitignore
diff --git a/users/glittershark/keyboard/README.org b/users/grfn/keyboard/README.org
index b085883a10..b085883a10 100644
--- a/users/glittershark/keyboard/README.org
+++ b/users/grfn/keyboard/README.org
diff --git a/users/glittershark/keyboard/default.nix b/users/grfn/keyboard/default.nix
index 7e00486067..7e00486067 100644
--- a/users/glittershark/keyboard/default.nix
+++ b/users/grfn/keyboard/default.nix
diff --git a/users/glittershark/keyboard/flash b/users/grfn/keyboard/flash
index efc89463c8..efc89463c8 100755
--- a/users/glittershark/keyboard/flash
+++ b/users/grfn/keyboard/flash
diff --git a/users/glittershark/keyboard/increase-tapping-delay.patch b/users/grfn/keyboard/increase-tapping-delay.patch
index 316c435fed..316c435fed 100644
--- a/users/glittershark/keyboard/increase-tapping-delay.patch
+++ b/users/grfn/keyboard/increase-tapping-delay.patch
diff --git a/users/glittershark/keyboard/keymap.c b/users/grfn/keyboard/keymap.c
index fbb28c9aac..fbb28c9aac 100644
--- a/users/glittershark/keyboard/keymap.c
+++ b/users/grfn/keyboard/keymap.c
diff --git a/users/glittershark/keys.nix b/users/grfn/keys.nix
index c52229b3a8..c52229b3a8 100644
--- a/users/glittershark/keys.nix
+++ b/users/grfn/keys.nix
diff --git a/users/glittershark/org-clubhouse/.gitignore b/users/grfn/org-clubhouse/.gitignore
index 2a7dd97deb..2a7dd97deb 100644
--- a/users/glittershark/org-clubhouse/.gitignore
+++ b/users/grfn/org-clubhouse/.gitignore
diff --git a/users/glittershark/org-clubhouse/CODE_OF_CONDUCT.org b/users/grfn/org-clubhouse/CODE_OF_CONDUCT.org
index f15e387d54..f15e387d54 100644
--- a/users/glittershark/org-clubhouse/CODE_OF_CONDUCT.org
+++ b/users/grfn/org-clubhouse/CODE_OF_CONDUCT.org
diff --git a/users/glittershark/org-clubhouse/LICENSE b/users/grfn/org-clubhouse/LICENSE
index 1777f0fac3..1777f0fac3 100644
--- a/users/glittershark/org-clubhouse/LICENSE
+++ b/users/grfn/org-clubhouse/LICENSE
diff --git a/users/glittershark/org-clubhouse/README.org b/users/grfn/org-clubhouse/README.org
index 9cd8fbe892..9cd8fbe892 100644
--- a/users/glittershark/org-clubhouse/README.org
+++ b/users/grfn/org-clubhouse/README.org
diff --git a/users/glittershark/org-clubhouse/org-clubhouse.el b/users/grfn/org-clubhouse/org-clubhouse.el
index e6e29b5751..e6e29b5751 100644
--- a/users/glittershark/org-clubhouse/org-clubhouse.el
+++ b/users/grfn/org-clubhouse/org-clubhouse.el
diff --git a/users/glittershark/owothia/.envrc b/users/grfn/owothia/.envrc
index 051d09d292..051d09d292 100644
--- a/users/glittershark/owothia/.envrc
+++ b/users/grfn/owothia/.envrc
diff --git a/users/glittershark/owothia/.gitignore b/users/grfn/owothia/.gitignore
index 8e850e7a0a..8e850e7a0a 100644
--- a/users/glittershark/owothia/.gitignore
+++ b/users/grfn/owothia/.gitignore
diff --git a/users/glittershark/owothia/chatter.patch b/users/grfn/owothia/chatter.patch
index c2a6179bfb..c2a6179bfb 100644
--- a/users/glittershark/owothia/chatter.patch
+++ b/users/grfn/owothia/chatter.patch
diff --git a/users/glittershark/owothia/default.nix b/users/grfn/owothia/default.nix
index e10098ed94..e10098ed94 100644
--- a/users/glittershark/owothia/default.nix
+++ b/users/grfn/owothia/default.nix
diff --git a/users/glittershark/owothia/hie.yaml b/users/grfn/owothia/hie.yaml
index 16a6c15262..16a6c15262 100644
--- a/users/glittershark/owothia/hie.yaml
+++ b/users/grfn/owothia/hie.yaml
diff --git a/users/glittershark/owothia/owothia.cabal b/users/grfn/owothia/owothia.cabal
index ef5477ea1b..ef5477ea1b 100644
--- a/users/glittershark/owothia/owothia.cabal
+++ b/users/grfn/owothia/owothia.cabal
diff --git a/users/glittershark/owothia/regex-tdfa-text.patch b/users/grfn/owothia/regex-tdfa-text.patch
index 6b2c346543..6b2c346543 100644
--- a/users/glittershark/owothia/regex-tdfa-text.patch
+++ b/users/grfn/owothia/regex-tdfa-text.patch
diff --git a/users/glittershark/owothia/shell.nix b/users/grfn/owothia/shell.nix
index 1ad70c907b..1ad70c907b 100644
--- a/users/glittershark/owothia/shell.nix
+++ b/users/grfn/owothia/shell.nix
diff --git a/users/glittershark/owothia/src/Main.hs b/users/grfn/owothia/src/Main.hs
index 65578f258c..65578f258c 100644
--- a/users/glittershark/owothia/src/Main.hs
+++ b/users/grfn/owothia/src/Main.hs
diff --git a/users/glittershark/resume/chimera.png b/users/grfn/resume/chimera.png
index 6dde989c53..6dde989c53 100644
--- a/users/glittershark/resume/chimera.png
+++ b/users/grfn/resume/chimera.png
Binary files differdiff --git a/users/glittershark/resume/collection.sty b/users/grfn/resume/collection.sty
index 4f1540a9d2..4f1540a9d2 100644
--- a/users/glittershark/resume/collection.sty
+++ b/users/grfn/resume/collection.sty
diff --git a/users/glittershark/resume/default.nix b/users/grfn/resume/default.nix
index 2db6a650bc..2db6a650bc 100644
--- a/users/glittershark/resume/default.nix
+++ b/users/grfn/resume/default.nix
diff --git a/users/glittershark/resume/helvetica.sty b/users/grfn/resume/helvetica.sty
index dacc129a10..dacc129a10 100644
--- a/users/glittershark/resume/helvetica.sty
+++ b/users/grfn/resume/helvetica.sty
diff --git a/users/glittershark/resume/moderncv.cls b/users/grfn/resume/moderncv.cls
index a40f807337..a40f807337 100644
--- a/users/glittershark/resume/moderncv.cls
+++ b/users/grfn/resume/moderncv.cls
diff --git a/users/glittershark/resume/moderncvcolorblack.sty b/users/grfn/resume/moderncvcolorblack.sty
index 3a6e1477f3..3a6e1477f3 100644
--- a/users/glittershark/resume/moderncvcolorblack.sty
+++ b/users/grfn/resume/moderncvcolorblack.sty
diff --git a/users/glittershark/resume/moderncvcolorblue.sty b/users/grfn/resume/moderncvcolorblue.sty
index 7b949c704a..7b949c704a 100644
--- a/users/glittershark/resume/moderncvcolorblue.sty
+++ b/users/grfn/resume/moderncvcolorblue.sty
diff --git a/users/glittershark/resume/moderncvcolorgreen.sty b/users/grfn/resume/moderncvcolorgreen.sty
index 4de7f848a0..4de7f848a0 100644
--- a/users/glittershark/resume/moderncvcolorgreen.sty
+++ b/users/grfn/resume/moderncvcolorgreen.sty
diff --git a/users/glittershark/resume/moderncvcolorgrey.sty b/users/grfn/resume/moderncvcolorgrey.sty
index 9018726a23..9018726a23 100644
--- a/users/glittershark/resume/moderncvcolorgrey.sty
+++ b/users/grfn/resume/moderncvcolorgrey.sty
diff --git a/users/glittershark/resume/moderncvcolororange.sty b/users/grfn/resume/moderncvcolororange.sty
index 134ae24011..134ae24011 100644
--- a/users/glittershark/resume/moderncvcolororange.sty
+++ b/users/grfn/resume/moderncvcolororange.sty
diff --git a/users/glittershark/resume/moderncvcolorpurple.sty b/users/grfn/resume/moderncvcolorpurple.sty
index d3dc5345b0..d3dc5345b0 100644
--- a/users/glittershark/resume/moderncvcolorpurple.sty
+++ b/users/grfn/resume/moderncvcolorpurple.sty
diff --git a/users/glittershark/resume/moderncvcolorred.sty b/users/grfn/resume/moderncvcolorred.sty
index 681181997d..681181997d 100644
--- a/users/glittershark/resume/moderncvcolorred.sty
+++ b/users/grfn/resume/moderncvcolorred.sty
diff --git a/users/glittershark/resume/moderncvcompatibility.sty b/users/grfn/resume/moderncvcompatibility.sty
index 1fc53f2180..1fc53f2180 100644
--- a/users/glittershark/resume/moderncvcompatibility.sty
+++ b/users/grfn/resume/moderncvcompatibility.sty
diff --git a/users/glittershark/resume/moderncviconsletters.sty b/users/grfn/resume/moderncviconsletters.sty
index 0a4e2864be..0a4e2864be 100644
--- a/users/glittershark/resume/moderncviconsletters.sty
+++ b/users/grfn/resume/moderncviconsletters.sty
diff --git a/users/glittershark/resume/moderncviconsmarvosym.sty b/users/grfn/resume/moderncviconsmarvosym.sty
index eb1b1ec727..eb1b1ec727 100644
--- a/users/glittershark/resume/moderncviconsmarvosym.sty
+++ b/users/grfn/resume/moderncviconsmarvosym.sty
diff --git a/users/glittershark/resume/moderncvstylebanking.sty b/users/grfn/resume/moderncvstylebanking.sty
index fb0b70fdcd..fb0b70fdcd 100644
--- a/users/glittershark/resume/moderncvstylebanking.sty
+++ b/users/grfn/resume/moderncvstylebanking.sty
diff --git a/users/glittershark/resume/moderncvstylecasual.sty b/users/grfn/resume/moderncvstylecasual.sty
index e375e7612a..e375e7612a 100644
--- a/users/glittershark/resume/moderncvstylecasual.sty
+++ b/users/grfn/resume/moderncvstylecasual.sty
diff --git a/users/glittershark/resume/moderncvstyleclassic.sty b/users/grfn/resume/moderncvstyleclassic.sty
index 63cf97aa3b..63cf97aa3b 100644
--- a/users/glittershark/resume/moderncvstyleclassic.sty
+++ b/users/grfn/resume/moderncvstyleclassic.sty
diff --git a/users/glittershark/resume/moderncvstyleempty.sty b/users/grfn/resume/moderncvstyleempty.sty
index 85932464d1..85932464d1 100644
--- a/users/glittershark/resume/moderncvstyleempty.sty
+++ b/users/grfn/resume/moderncvstyleempty.sty
diff --git a/users/glittershark/resume/moderncvstyleoldstyle.sty b/users/grfn/resume/moderncvstyleoldstyle.sty
index ff732f4e2a..ff732f4e2a 100644
--- a/users/glittershark/resume/moderncvstyleoldstyle.sty
+++ b/users/grfn/resume/moderncvstyleoldstyle.sty
diff --git a/users/glittershark/resume/picture.png b/users/grfn/resume/picture.png
index 63b21b5320..63b21b5320 100644
--- a/users/glittershark/resume/picture.png
+++ b/users/grfn/resume/picture.png
Binary files differdiff --git a/users/glittershark/resume/resume.tex b/users/grfn/resume/resume.tex
index 933558d570..933558d570 100644
--- a/users/glittershark/resume/resume.tex
+++ b/users/grfn/resume/resume.tex
diff --git a/users/glittershark/resume/tweaklist.sty b/users/grfn/resume/tweaklist.sty
index adc9398932..adc9398932 100644
--- a/users/glittershark/resume/tweaklist.sty
+++ b/users/grfn/resume/tweaklist.sty
diff --git a/users/glittershark/system/.gitignore b/users/grfn/system/.gitignore
index 41fbeb02c4..41fbeb02c4 100644
--- a/users/glittershark/system/.gitignore
+++ b/users/grfn/system/.gitignore
diff --git a/users/glittershark/system/home/.skip-subtree b/users/grfn/system/home/.skip-subtree
index e69de29bb2..e69de29bb2 100644
--- a/users/glittershark/system/home/.skip-subtree
+++ b/users/grfn/system/home/.skip-subtree
diff --git a/users/glittershark/system/home/common/legacy-dotfiles.nix b/users/grfn/system/home/common/legacy-dotfiles.nix
index 33d9581e6a..33d9581e6a 100644
--- a/users/glittershark/system/home/common/legacy-dotfiles.nix
+++ b/users/grfn/system/home/common/legacy-dotfiles.nix
diff --git a/users/glittershark/system/home/common/solarized.nix b/users/grfn/system/home/common/solarized.nix
index e94693edc5..e94693edc5 100644
--- a/users/glittershark/system/home/common/solarized.nix
+++ b/users/grfn/system/home/common/solarized.nix
diff --git a/users/glittershark/system/home/default.nix b/users/grfn/system/home/default.nix
index 1efba3f3c1..1efba3f3c1 100644
--- a/users/glittershark/system/home/default.nix
+++ b/users/grfn/system/home/default.nix
diff --git a/users/glittershark/system/home/home.nix b/users/grfn/system/home/home.nix
index 39045c147d..39045c147d 100644
--- a/users/glittershark/system/home/home.nix
+++ b/users/grfn/system/home/home.nix
diff --git a/users/glittershark/system/home/machines/chupacabra.nix b/users/grfn/system/home/machines/chupacabra.nix
index 04f34ccbc4..04f34ccbc4 100644
--- a/users/glittershark/system/home/machines/chupacabra.nix
+++ b/users/grfn/system/home/machines/chupacabra.nix
diff --git a/users/glittershark/system/home/machines/dobharchu.nix b/users/grfn/system/home/machines/dobharchu.nix
index 0b8503a00e..0b8503a00e 100644
--- a/users/glittershark/system/home/machines/dobharchu.nix
+++ b/users/grfn/system/home/machines/dobharchu.nix
diff --git a/users/glittershark/system/home/machines/roswell.nix b/users/grfn/system/home/machines/roswell.nix
index 1b1bbf29c6..1b1bbf29c6 100644
--- a/users/glittershark/system/home/machines/roswell.nix
+++ b/users/grfn/system/home/machines/roswell.nix
diff --git a/users/glittershark/system/home/machines/yeren.nix b/users/grfn/system/home/machines/yeren.nix
index 8ee6602307..8ee6602307 100644
--- a/users/glittershark/system/home/machines/yeren.nix
+++ b/users/grfn/system/home/machines/yeren.nix
diff --git a/users/glittershark/system/home/modules/alacritty.nix b/users/grfn/system/home/modules/alacritty.nix
index 67d6638a31..67d6638a31 100644
--- a/users/glittershark/system/home/modules/alacritty.nix
+++ b/users/grfn/system/home/modules/alacritty.nix
diff --git a/users/glittershark/system/home/modules/alsi.nix b/users/grfn/system/home/modules/alsi.nix
index cf8b0bebe7..cf8b0bebe7 100644
--- a/users/glittershark/system/home/modules/alsi.nix
+++ b/users/grfn/system/home/modules/alsi.nix
diff --git a/users/glittershark/system/home/modules/common.nix b/users/grfn/system/home/modules/common.nix
index d420595adb..02935aaa50 100644
--- a/users/glittershark/system/home/modules/common.nix
+++ b/users/grfn/system/home/modules/common.nix
@@ -47,8 +47,8 @@
     (writeShellScriptBin "rebuild-mugwump" ''
       set -eo pipefail
       cd ~/code/depot
-      nix build -f . users.glittershark.system.system.mugwumpSystem -o /tmp/mugwump
-      nix copy -f . users.glittershark.system.system.mugwumpSystem \
+      nix build -f . users.grfn.system.system.mugwumpSystem -o /tmp/mugwump
+      nix copy -f . users.grfn.system.system.mugwumpSystem \
         --to ssh://mugwump
       system=$(readlink -ef /tmp/mugwump)
       ssh mugwump sudo nix-env -p /nix/var/nix/profiles/system --set $system
diff --git a/users/glittershark/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix
index 04a501e74b..04a501e74b 100644
--- a/users/glittershark/system/home/modules/development.nix
+++ b/users/grfn/system/home/modules/development.nix
diff --git a/users/glittershark/system/home/modules/development/agda.nix b/users/grfn/system/home/modules/development/agda.nix
index bed05693aa..bed05693aa 100644
--- a/users/glittershark/system/home/modules/development/agda.nix
+++ b/users/grfn/system/home/modules/development/agda.nix
diff --git a/users/glittershark/system/home/modules/development/kube.nix b/users/grfn/system/home/modules/development/kube.nix
index 97ae4760d4..97ae4760d4 100644
--- a/users/glittershark/system/home/modules/development/kube.nix
+++ b/users/grfn/system/home/modules/development/kube.nix
diff --git a/users/glittershark/system/home/modules/development/rust.nix b/users/grfn/system/home/modules/development/rust.nix
index 4deb834652..4deb834652 100644
--- a/users/glittershark/system/home/modules/development/rust.nix
+++ b/users/grfn/system/home/modules/development/rust.nix
diff --git a/users/glittershark/system/home/modules/emacs.nix b/users/grfn/system/home/modules/emacs.nix
index b7520085f8..b7520085f8 100644
--- a/users/glittershark/system/home/modules/emacs.nix
+++ b/users/grfn/system/home/modules/emacs.nix
diff --git a/users/glittershark/system/home/modules/email.nix b/users/grfn/system/home/modules/email.nix
index cdfcbecb7c..cdfcbecb7c 100644
--- a/users/glittershark/system/home/modules/email.nix
+++ b/users/grfn/system/home/modules/email.nix
diff --git a/users/glittershark/system/home/modules/firefox.nix b/users/grfn/system/home/modules/firefox.nix
index c7e78685a5..c7e78685a5 100644
--- a/users/glittershark/system/home/modules/firefox.nix
+++ b/users/grfn/system/home/modules/firefox.nix
diff --git a/users/glittershark/system/home/modules/games.nix b/users/grfn/system/home/modules/games.nix
index da54f99e5b..da54f99e5b 100644
--- a/users/glittershark/system/home/modules/games.nix
+++ b/users/grfn/system/home/modules/games.nix
diff --git a/users/glittershark/system/home/modules/i3.nix b/users/grfn/system/home/modules/i3.nix
index d31089133c..d31089133c 100644
--- a/users/glittershark/system/home/modules/i3.nix
+++ b/users/grfn/system/home/modules/i3.nix
diff --git a/users/glittershark/system/home/modules/lib/cloneRepo.nix b/users/grfn/system/home/modules/lib/cloneRepo.nix
index dc487dc6bd..dc487dc6bd 100644
--- a/users/glittershark/system/home/modules/lib/cloneRepo.nix
+++ b/users/grfn/system/home/modules/lib/cloneRepo.nix
diff --git a/users/glittershark/system/home/modules/lib/zshFunctions.nix b/users/grfn/system/home/modules/lib/zshFunctions.nix
index 7c39b3478c..7c39b3478c 100644
--- a/users/glittershark/system/home/modules/lib/zshFunctions.nix
+++ b/users/grfn/system/home/modules/lib/zshFunctions.nix
diff --git a/users/glittershark/system/home/modules/nixos-logo.txt b/users/grfn/system/home/modules/nixos-logo.txt
index d4b16b44f0..d4b16b44f0 100644
--- a/users/glittershark/system/home/modules/nixos-logo.txt
+++ b/users/grfn/system/home/modules/nixos-logo.txt
diff --git a/users/glittershark/system/home/modules/obs.nix b/users/grfn/system/home/modules/obs.nix
index 39f7bbe3c6..39f7bbe3c6 100644
--- a/users/glittershark/system/home/modules/obs.nix
+++ b/users/grfn/system/home/modules/obs.nix
diff --git a/users/glittershark/system/home/modules/ptt.nix b/users/grfn/system/home/modules/ptt.nix
index 436c8f2617..436c8f2617 100644
--- a/users/glittershark/system/home/modules/ptt.nix
+++ b/users/grfn/system/home/modules/ptt.nix
diff --git a/users/glittershark/system/home/modules/pure.zsh-theme b/users/grfn/system/home/modules/pure.zsh-theme
index b4776e8159..b4776e8159 100755
--- a/users/glittershark/system/home/modules/pure.zsh-theme
+++ b/users/grfn/system/home/modules/pure.zsh-theme
diff --git a/users/glittershark/system/home/modules/rtlsdr.nix b/users/grfn/system/home/modules/rtlsdr.nix
index a1c717617a..a1c717617a 100644
--- a/users/glittershark/system/home/modules/rtlsdr.nix
+++ b/users/grfn/system/home/modules/rtlsdr.nix
diff --git a/users/glittershark/system/home/modules/shell.nix b/users/grfn/system/home/modules/shell.nix
index 09d2c63561..09d2c63561 100644
--- a/users/glittershark/system/home/modules/shell.nix
+++ b/users/grfn/system/home/modules/shell.nix
diff --git a/users/glittershark/system/home/modules/tarsnap.nix b/users/grfn/system/home/modules/tarsnap.nix
index 4bff19910f..4bff19910f 100644
--- a/users/glittershark/system/home/modules/tarsnap.nix
+++ b/users/grfn/system/home/modules/tarsnap.nix
diff --git a/users/glittershark/system/home/modules/twitter.nix b/users/grfn/system/home/modules/twitter.nix
index 3cb2e90adc..3cb2e90adc 100644
--- a/users/glittershark/system/home/modules/twitter.nix
+++ b/users/grfn/system/home/modules/twitter.nix
diff --git a/users/glittershark/system/home/modules/vim.nix b/users/grfn/system/home/modules/vim.nix
index 87d4309333..87d4309333 100644
--- a/users/glittershark/system/home/modules/vim.nix
+++ b/users/grfn/system/home/modules/vim.nix
diff --git a/users/glittershark/system/home/modules/vimrc b/users/grfn/system/home/modules/vimrc
index 3e33b5e2be..3e33b5e2be 100644
--- a/users/glittershark/system/home/modules/vimrc
+++ b/users/grfn/system/home/modules/vimrc
diff --git a/users/glittershark/system/home/modules/zshrc b/users/grfn/system/home/modules/zshrc
index a12173d684..a12173d684 100644
--- a/users/glittershark/system/home/modules/zshrc
+++ b/users/grfn/system/home/modules/zshrc
diff --git a/users/glittershark/system/home/platforms/darwin.nix b/users/grfn/system/home/platforms/darwin.nix
index cf0375e941..cf0375e941 100644
--- a/users/glittershark/system/home/platforms/darwin.nix
+++ b/users/grfn/system/home/platforms/darwin.nix
diff --git a/users/glittershark/system/home/platforms/linux.nix b/users/grfn/system/home/platforms/linux.nix
index 92924e4199..92924e4199 100644
--- a/users/glittershark/system/home/platforms/linux.nix
+++ b/users/grfn/system/home/platforms/linux.nix
diff --git a/users/glittershark/system/install b/users/grfn/system/install
index a9a45953da..a9a45953da 100755
--- a/users/glittershark/system/install
+++ b/users/grfn/system/install
diff --git a/users/glittershark/system/system/.skip-subtree b/users/grfn/system/system/.skip-subtree
index e69de29bb2..e69de29bb2 100644
--- a/users/glittershark/system/system/.skip-subtree
+++ b/users/grfn/system/system/.skip-subtree
diff --git a/users/glittershark/system/system/configuration.nix b/users/grfn/system/system/configuration.nix
index eae567015b..eae567015b 100644
--- a/users/glittershark/system/system/configuration.nix
+++ b/users/grfn/system/system/configuration.nix
diff --git a/users/glittershark/system/system/default.nix b/users/grfn/system/system/default.nix
index 6592eddc08..9db9570ea0 100644
--- a/users/glittershark/system/system/default.nix
+++ b/users/grfn/system/system/default.nix
@@ -52,8 +52,8 @@ rec {
 
       caseFor = hostname: ''
         ${hostname})
-          echo "Rebuilding NixOS for //users/glittershark/nixos/${hostname}"
-          system=$(nix-build -E '(import ${depotPath} {}).users.glittershark.system.system.${hostname}' --no-out-link)
+          echo "Rebuilding NixOS for //users/grfn/nixos/${hostname}"
+          system=$(nix-build -E '(import ${depotPath} {}).users.grfn.system.system.${hostname}' --no-out-link)
           ;;
       '';
     in pkgs.writeShellScriptBin "rebuilder" ''
diff --git a/users/glittershark/system/system/iso.nix b/users/grfn/system/system/iso.nix
index 256aee6a5e..256aee6a5e 100644
--- a/users/glittershark/system/system/iso.nix
+++ b/users/grfn/system/system/iso.nix
diff --git a/users/glittershark/system/system/machines/bumblebee.nix b/users/grfn/system/system/machines/bumblebee.nix
index 0fec214092..0fec214092 100644
--- a/users/glittershark/system/system/machines/bumblebee.nix
+++ b/users/grfn/system/system/machines/bumblebee.nix
diff --git a/users/glittershark/system/system/machines/chupacabra.nix b/users/grfn/system/system/machines/chupacabra.nix
index 974e3c34e3..974e3c34e3 100644
--- a/users/glittershark/system/system/machines/chupacabra.nix
+++ b/users/grfn/system/system/machines/chupacabra.nix
diff --git a/users/glittershark/system/system/machines/mugwump.nix b/users/grfn/system/system/machines/mugwump.nix
index 77c4dda9a5..77c4dda9a5 100644
--- a/users/glittershark/system/system/machines/mugwump.nix
+++ b/users/grfn/system/system/machines/mugwump.nix
diff --git a/users/glittershark/system/system/machines/roswell.nix b/users/grfn/system/system/machines/roswell.nix
index 4b0cdec95d..6eb4a510b8 100644
--- a/users/glittershark/system/system/machines/roswell.nix
+++ b/users/grfn/system/system/machines/roswell.nix
@@ -12,6 +12,6 @@
   networking.hostName = "roswell";
 
   users.users.grfn.openssh.authorizedKeys.keys = [
-    depot.users.glittershark.keys.main
+    depot.users.grfn.keys.main
   ];
 }
diff --git a/users/glittershark/system/system/machines/yeren.nix b/users/grfn/system/system/machines/yeren.nix
index 7bb06716f7..7bb06716f7 100644
--- a/users/glittershark/system/system/machines/yeren.nix
+++ b/users/grfn/system/system/machines/yeren.nix
diff --git a/users/glittershark/system/system/modules/common.nix b/users/grfn/system/system/modules/common.nix
index 0eab590660..727b450555 100644
--- a/users/glittershark/system/system/modules/common.nix
+++ b/users/grfn/system/system/modules/common.nix
@@ -31,7 +31,7 @@ with lib;
     file
     lm_sensors
     dnsutils
-    depot.users.glittershark.system.system.rebuilder
+    depot.users.grfn.system.system.rebuilder
     htop
   ];
 
diff --git a/users/glittershark/system/system/modules/desktop.nix b/users/grfn/system/system/modules/desktop.nix
index 3adbd9d9b0..3adbd9d9b0 100644
--- a/users/glittershark/system/system/modules/desktop.nix
+++ b/users/grfn/system/system/modules/desktop.nix
diff --git a/users/glittershark/system/system/modules/development.nix b/users/grfn/system/system/modules/development.nix
index bfa0e22cff..bfa0e22cff 100644
--- a/users/glittershark/system/system/modules/development.nix
+++ b/users/grfn/system/system/modules/development.nix
diff --git a/users/glittershark/system/system/modules/fcitx.nix b/users/grfn/system/system/modules/fcitx.nix
index 812f598f9f..812f598f9f 100644
--- a/users/glittershark/system/system/modules/fcitx.nix
+++ b/users/grfn/system/system/modules/fcitx.nix
diff --git a/users/glittershark/system/system/modules/fonts.nix b/users/grfn/system/system/modules/fonts.nix
index babe30d427..babe30d427 100644
--- a/users/glittershark/system/system/modules/fonts.nix
+++ b/users/grfn/system/system/modules/fonts.nix
diff --git a/users/glittershark/system/system/modules/kernel.nix b/users/grfn/system/system/modules/kernel.nix
index 5c5ff85515..5c5ff85515 100644
--- a/users/glittershark/system/system/modules/kernel.nix
+++ b/users/grfn/system/system/modules/kernel.nix
diff --git a/users/glittershark/system/system/modules/laptop.nix b/users/grfn/system/system/modules/laptop.nix
index 8c09f3a442..8c09f3a442 100644
--- a/users/glittershark/system/system/modules/laptop.nix
+++ b/users/grfn/system/system/modules/laptop.nix
diff --git a/users/glittershark/system/system/modules/reusable/README.org b/users/grfn/system/system/modules/reusable/README.org
index 34d9bfdcb7..34d9bfdcb7 100644
--- a/users/glittershark/system/system/modules/reusable/README.org
+++ b/users/grfn/system/system/modules/reusable/README.org
diff --git a/users/glittershark/system/system/modules/reusable/battery.nix b/users/grfn/system/system/modules/reusable/battery.nix
index ca92e0c3f6..ca92e0c3f6 100644
--- a/users/glittershark/system/system/modules/reusable/battery.nix
+++ b/users/grfn/system/system/modules/reusable/battery.nix
diff --git a/users/glittershark/system/system/modules/rtlsdr.nix b/users/grfn/system/system/modules/rtlsdr.nix
index ce58ebb0dc..ce58ebb0dc 100644
--- a/users/glittershark/system/system/modules/rtlsdr.nix
+++ b/users/grfn/system/system/modules/rtlsdr.nix
diff --git a/users/glittershark/system/system/modules/sound.nix b/users/grfn/system/system/modules/sound.nix
index 15c8dd5e3f..15c8dd5e3f 100644
--- a/users/glittershark/system/system/modules/sound.nix
+++ b/users/grfn/system/system/modules/sound.nix
diff --git a/users/glittershark/system/system/modules/tvl.nix b/users/grfn/system/system/modules/tvl.nix
index 905ec8ced5..905ec8ced5 100644
--- a/users/glittershark/system/system/modules/tvl.nix
+++ b/users/grfn/system/system/modules/tvl.nix
diff --git a/users/glittershark/system/system/modules/work/kolide.deb b/users/grfn/system/system/modules/work/kolide.deb
index a319a5806f..a319a5806f 100644
--- a/users/glittershark/system/system/modules/work/kolide.deb
+++ b/users/grfn/system/system/modules/work/kolide.deb
Binary files differdiff --git a/users/glittershark/system/system/modules/work/kolide.nix b/users/grfn/system/system/modules/work/kolide.nix
index 29ee0a0d7c..29ee0a0d7c 100644
--- a/users/glittershark/system/system/modules/work/kolide.nix
+++ b/users/grfn/system/system/modules/work/kolide.nix
diff --git a/users/glittershark/system/system/modules/xserver.nix b/users/grfn/system/system/modules/xserver.nix
index 35ee44112e..35ee44112e 100644
--- a/users/glittershark/system/system/modules/xserver.nix
+++ b/users/grfn/system/system/modules/xserver.nix
diff --git a/users/glittershark/wigglydonke.rs/index.html b/users/grfn/wigglydonke.rs/index.html
index 4fd7f25fcf..4fd7f25fcf 100644
--- a/users/glittershark/wigglydonke.rs/index.html
+++ b/users/grfn/wigglydonke.rs/index.html
diff --git a/users/glittershark/wigglydonke.rs/wd.png b/users/grfn/wigglydonke.rs/wd.png
index 217443e2df..217443e2df 100644
--- a/users/glittershark/wigglydonke.rs/wd.png
+++ b/users/grfn/wigglydonke.rs/wd.png
Binary files differdiff --git a/users/glittershark/xanthous/.envrc b/users/grfn/xanthous/.envrc
index be81feddb1..be81feddb1 100644
--- a/users/glittershark/xanthous/.envrc
+++ b/users/grfn/xanthous/.envrc
diff --git a/users/glittershark/xanthous/.github/actions/nix-build/Dockerfile b/users/grfn/xanthous/.github/actions/nix-build/Dockerfile
index cfe8e35df0..cfe8e35df0 100644
--- a/users/glittershark/xanthous/.github/actions/nix-build/Dockerfile
+++ b/users/grfn/xanthous/.github/actions/nix-build/Dockerfile
diff --git a/users/glittershark/xanthous/.github/actions/nix-build/entrypoint.sh b/users/grfn/xanthous/.github/actions/nix-build/entrypoint.sh
index cb7aca541a..cb7aca541a 100755
--- a/users/glittershark/xanthous/.github/actions/nix-build/entrypoint.sh
+++ b/users/grfn/xanthous/.github/actions/nix-build/entrypoint.sh
diff --git a/users/glittershark/xanthous/.github/workflows/haskell.yml b/users/grfn/xanthous/.github/workflows/haskell.yml
index df82de3e8c..df82de3e8c 100644
--- a/users/glittershark/xanthous/.github/workflows/haskell.yml
+++ b/users/grfn/xanthous/.github/workflows/haskell.yml
diff --git a/users/glittershark/xanthous/.gitignore b/users/grfn/xanthous/.gitignore
index 74014978ff..74014978ff 100644
--- a/users/glittershark/xanthous/.gitignore
+++ b/users/grfn/xanthous/.gitignore
diff --git a/users/glittershark/xanthous/LICENSE b/users/grfn/xanthous/LICENSE
index 45644ff764..45644ff764 100644
--- a/users/glittershark/xanthous/LICENSE
+++ b/users/grfn/xanthous/LICENSE
diff --git a/users/glittershark/xanthous/README.org b/users/grfn/xanthous/README.org
index 7e1fedb069..7e1fedb069 100644
--- a/users/glittershark/xanthous/README.org
+++ b/users/grfn/xanthous/README.org
diff --git a/users/glittershark/xanthous/Setup.hs b/users/grfn/xanthous/Setup.hs
index 9a994af677..9a994af677 100644
--- a/users/glittershark/xanthous/Setup.hs
+++ b/users/grfn/xanthous/Setup.hs
diff --git a/users/glittershark/xanthous/bench/Bench.hs b/users/grfn/xanthous/bench/Bench.hs
index 5889618ee4..5889618ee4 100644
--- a/users/glittershark/xanthous/bench/Bench.hs
+++ b/users/grfn/xanthous/bench/Bench.hs
diff --git a/users/glittershark/xanthous/bench/Bench/Prelude.hs b/users/grfn/xanthous/bench/Bench/Prelude.hs
index c553abd6d5..c553abd6d5 100644
--- a/users/glittershark/xanthous/bench/Bench/Prelude.hs
+++ b/users/grfn/xanthous/bench/Bench/Prelude.hs
diff --git a/users/glittershark/xanthous/bench/Xanthous/Generators/UtilBench.hs b/users/grfn/xanthous/bench/Xanthous/Generators/UtilBench.hs
index 56310e691c..56310e691c 100644
--- a/users/glittershark/xanthous/bench/Xanthous/Generators/UtilBench.hs
+++ b/users/grfn/xanthous/bench/Xanthous/Generators/UtilBench.hs
diff --git a/users/glittershark/xanthous/bench/Xanthous/RandomBench.hs b/users/grfn/xanthous/bench/Xanthous/RandomBench.hs
index fae4af92a7..fae4af92a7 100644
--- a/users/glittershark/xanthous/bench/Xanthous/RandomBench.hs
+++ b/users/grfn/xanthous/bench/Xanthous/RandomBench.hs
diff --git a/users/glittershark/xanthous/build/generic-arbitrary-export-garbitrary.patch b/users/grfn/xanthous/build/generic-arbitrary-export-garbitrary.patch
index f0c936bfca..f0c936bfca 100644
--- a/users/glittershark/xanthous/build/generic-arbitrary-export-garbitrary.patch
+++ b/users/grfn/xanthous/build/generic-arbitrary-export-garbitrary.patch
diff --git a/users/glittershark/xanthous/build/hgeometry-fix-haddock.patch b/users/grfn/xanthous/build/hgeometry-fix-haddock.patch
index 748c65b3e0..748c65b3e0 100644
--- a/users/glittershark/xanthous/build/hgeometry-fix-haddock.patch
+++ b/users/grfn/xanthous/build/hgeometry-fix-haddock.patch
diff --git a/users/glittershark/xanthous/build/update-comonad-extras.patch b/users/grfn/xanthous/build/update-comonad-extras.patch
index cd1dbe24d3..cd1dbe24d3 100644
--- a/users/glittershark/xanthous/build/update-comonad-extras.patch
+++ b/users/grfn/xanthous/build/update-comonad-extras.patch
diff --git a/users/glittershark/xanthous/default.nix b/users/grfn/xanthous/default.nix
index 0b89a50afb..0b89a50afb 100644
--- a/users/glittershark/xanthous/default.nix
+++ b/users/grfn/xanthous/default.nix
diff --git a/users/glittershark/xanthous/hie.yaml b/users/grfn/xanthous/hie.yaml
index 49f8ec1fbb..49f8ec1fbb 100644
--- a/users/glittershark/xanthous/hie.yaml
+++ b/users/grfn/xanthous/hie.yaml
diff --git a/users/glittershark/xanthous/nixpkgs.nix b/users/grfn/xanthous/nixpkgs.nix
index 7d7c164405..7d7c164405 100644
--- a/users/glittershark/xanthous/nixpkgs.nix
+++ b/users/grfn/xanthous/nixpkgs.nix
diff --git a/users/glittershark/xanthous/package.yaml b/users/grfn/xanthous/package.yaml
index e8cda59692..e8cda59692 100644
--- a/users/glittershark/xanthous/package.yaml
+++ b/users/grfn/xanthous/package.yaml
diff --git a/users/glittershark/xanthous/pkg.nix b/users/grfn/xanthous/pkg.nix
index 16a6500866..16a6500866 100644
--- a/users/glittershark/xanthous/pkg.nix
+++ b/users/grfn/xanthous/pkg.nix
diff --git a/users/glittershark/xanthous/shell.nix b/users/grfn/xanthous/shell.nix
index 29a4952106..29a4952106 100644
--- a/users/glittershark/xanthous/shell.nix
+++ b/users/grfn/xanthous/shell.nix
diff --git a/users/glittershark/xanthous/src/Data/Aeson/Generic/DerivingVia.hs b/users/grfn/xanthous/src/Data/Aeson/Generic/DerivingVia.hs
index 34f2a94038..34f2a94038 100644
--- a/users/glittershark/xanthous/src/Data/Aeson/Generic/DerivingVia.hs
+++ b/users/grfn/xanthous/src/Data/Aeson/Generic/DerivingVia.hs
diff --git a/users/glittershark/xanthous/src/Main.hs b/users/grfn/xanthous/src/Main.hs
index dcd31afff9..dcd31afff9 100644
--- a/users/glittershark/xanthous/src/Main.hs
+++ b/users/grfn/xanthous/src/Main.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/AI/Gormlak.hs b/users/grfn/xanthous/src/Xanthous/AI/Gormlak.hs
index a6cc789d68..a6cc789d68 100644
--- a/users/glittershark/xanthous/src/Xanthous/AI/Gormlak.hs
+++ b/users/grfn/xanthous/src/Xanthous/AI/Gormlak.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/App.hs b/users/grfn/xanthous/src/Xanthous/App.hs
index 9091961b72..9091961b72 100644
--- a/users/glittershark/xanthous/src/Xanthous/App.hs
+++ b/users/grfn/xanthous/src/Xanthous/App.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/App/Autocommands.hs b/users/grfn/xanthous/src/Xanthous/App/Autocommands.hs
index f393a0e2ea..f393a0e2ea 100644
--- a/users/glittershark/xanthous/src/Xanthous/App/Autocommands.hs
+++ b/users/grfn/xanthous/src/Xanthous/App/Autocommands.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/App/Common.hs b/users/grfn/xanthous/src/Xanthous/App/Common.hs
index 69ba6f0e05..69ba6f0e05 100644
--- a/users/glittershark/xanthous/src/Xanthous/App/Common.hs
+++ b/users/grfn/xanthous/src/Xanthous/App/Common.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/App/Prompt.hs b/users/grfn/xanthous/src/Xanthous/App/Prompt.hs
index 9b5a3bf24f..9b5a3bf24f 100644
--- a/users/glittershark/xanthous/src/Xanthous/App/Prompt.hs
+++ b/users/grfn/xanthous/src/Xanthous/App/Prompt.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/App/Time.hs b/users/grfn/xanthous/src/Xanthous/App/Time.hs
index b17348f385..b17348f385 100644
--- a/users/glittershark/xanthous/src/Xanthous/App/Time.hs
+++ b/users/grfn/xanthous/src/Xanthous/App/Time.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Command.hs b/users/grfn/xanthous/src/Xanthous/Command.hs
index 37025dd37a..37025dd37a 100644
--- a/users/glittershark/xanthous/src/Xanthous/Command.hs
+++ b/users/grfn/xanthous/src/Xanthous/Command.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Data.hs b/users/grfn/xanthous/src/Xanthous/Data.hs
index c9c11b553b..c9c11b553b 100644
--- a/users/glittershark/xanthous/src/Xanthous/Data.hs
+++ b/users/grfn/xanthous/src/Xanthous/Data.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Data/App.hs b/users/grfn/xanthous/src/Xanthous/Data/App.hs
index 0361d2a59e..0361d2a59e 100644
--- a/users/glittershark/xanthous/src/Xanthous/Data/App.hs
+++ b/users/grfn/xanthous/src/Xanthous/Data/App.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Data/Entities.hs b/users/grfn/xanthous/src/Xanthous/Data/Entities.hs
index 39953410f2..39953410f2 100644
--- a/users/glittershark/xanthous/src/Xanthous/Data/Entities.hs
+++ b/users/grfn/xanthous/src/Xanthous/Data/Entities.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Data/EntityChar.hs b/users/grfn/xanthous/src/Xanthous/Data/EntityChar.hs
index 855a3462da..855a3462da 100644
--- a/users/glittershark/xanthous/src/Xanthous/Data/EntityChar.hs
+++ b/users/grfn/xanthous/src/Xanthous/Data/EntityChar.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Data/EntityMap.hs b/users/grfn/xanthous/src/Xanthous/Data/EntityMap.hs
index d24defa841..d24defa841 100644
--- a/users/glittershark/xanthous/src/Xanthous/Data/EntityMap.hs
+++ b/users/grfn/xanthous/src/Xanthous/Data/EntityMap.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Data/EntityMap/Graphics.hs b/users/grfn/xanthous/src/Xanthous/Data/EntityMap/Graphics.hs
index 19e7b0cdf0..19e7b0cdf0 100644
--- a/users/glittershark/xanthous/src/Xanthous/Data/EntityMap/Graphics.hs
+++ b/users/grfn/xanthous/src/Xanthous/Data/EntityMap/Graphics.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Data/Levels.hs b/users/grfn/xanthous/src/Xanthous/Data/Levels.hs
index efc0f53ace..efc0f53ace 100644
--- a/users/glittershark/xanthous/src/Xanthous/Data/Levels.hs
+++ b/users/grfn/xanthous/src/Xanthous/Data/Levels.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Data/NestedMap.hs b/users/grfn/xanthous/src/Xanthous/Data/NestedMap.hs
index 1b875d4483..1b875d4483 100644
--- a/users/glittershark/xanthous/src/Xanthous/Data/NestedMap.hs
+++ b/users/grfn/xanthous/src/Xanthous/Data/NestedMap.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Data/VectorBag.hs b/users/grfn/xanthous/src/Xanthous/Data/VectorBag.hs
index 2e6d48062a..2e6d48062a 100644
--- a/users/glittershark/xanthous/src/Xanthous/Data/VectorBag.hs
+++ b/users/grfn/xanthous/src/Xanthous/Data/VectorBag.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Character.hs b/users/grfn/xanthous/src/Xanthous/Entities/Character.hs
index c18d726a4b..c18d726a4b 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Character.hs
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Character.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Creature.hs b/users/grfn/xanthous/src/Xanthous/Entities/Creature.hs
index e95e9f0b98..e95e9f0b98 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Creature.hs
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Creature.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs b/users/grfn/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs
index 501a5b5972..501a5b5972 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Draw/Util.hs b/users/grfn/xanthous/src/Xanthous/Entities/Draw/Util.hs
index aa6c5fa4fc..aa6c5fa4fc 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Draw/Util.hs
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Draw/Util.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Entities.hs b/users/grfn/xanthous/src/Xanthous/Entities/Entities.hs
index a0c037a1b4..a0c037a1b4 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Entities.hs
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Entities.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Entities.hs-boot b/users/grfn/xanthous/src/Xanthous/Entities/Entities.hs-boot
index 519a862c6a..519a862c6a 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Entities.hs-boot
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Entities.hs-boot
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Environment.hs b/users/grfn/xanthous/src/Xanthous/Entities/Environment.hs
index b45a91eabe..b45a91eabe 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Environment.hs
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Environment.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Item.hs b/users/grfn/xanthous/src/Xanthous/Entities/Item.hs
index b50a5eab80..b50a5eab80 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Item.hs
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Item.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Marker.hs b/users/grfn/xanthous/src/Xanthous/Entities/Marker.hs
index 14d02872ed..14d02872ed 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Marker.hs
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Marker.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/RawTypes.hs b/users/grfn/xanthous/src/Xanthous/Entities/RawTypes.hs
index 30039662f0..30039662f0 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/RawTypes.hs
+++ b/users/grfn/xanthous/src/Xanthous/Entities/RawTypes.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Raws.hs b/users/grfn/xanthous/src/Xanthous/Entities/Raws.hs
index d4cae7ccc2..d4cae7ccc2 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Raws.hs
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Raws.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Raws/gormlak.yaml b/users/grfn/xanthous/src/Xanthous/Entities/Raws/gormlak.yaml
index 2eac895190..2eac895190 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Raws/gormlak.yaml
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Raws/gormlak.yaml
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Raws/noodles.yaml b/users/grfn/xanthous/src/Xanthous/Entities/Raws/noodles.yaml
index c3f19dce91..c3f19dce91 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Raws/noodles.yaml
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Raws/noodles.yaml
diff --git a/users/glittershark/xanthous/src/Xanthous/Entities/Raws/stick.yaml b/users/grfn/xanthous/src/Xanthous/Entities/Raws/stick.yaml
index bc7fde4d8b..bc7fde4d8b 100644
--- a/users/glittershark/xanthous/src/Xanthous/Entities/Raws/stick.yaml
+++ b/users/grfn/xanthous/src/Xanthous/Entities/Raws/stick.yaml
diff --git a/users/glittershark/xanthous/src/Xanthous/Game.hs b/users/grfn/xanthous/src/Xanthous/Game.hs
index 89c23f0de8..89c23f0de8 100644
--- a/users/glittershark/xanthous/src/Xanthous/Game.hs
+++ b/users/grfn/xanthous/src/Xanthous/Game.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Game/Arbitrary.hs b/users/grfn/xanthous/src/Xanthous/Game/Arbitrary.hs
index 1b15ad4ffa..1b15ad4ffa 100644
--- a/users/glittershark/xanthous/src/Xanthous/Game/Arbitrary.hs
+++ b/users/grfn/xanthous/src/Xanthous/Game/Arbitrary.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Game/Draw.hs b/users/grfn/xanthous/src/Xanthous/Game/Draw.hs
index 2375ae8c55..2375ae8c55 100644
--- a/users/glittershark/xanthous/src/Xanthous/Game/Draw.hs
+++ b/users/grfn/xanthous/src/Xanthous/Game/Draw.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Game/Env.hs b/users/grfn/xanthous/src/Xanthous/Game/Env.hs
index 6e10d0f735..6e10d0f735 100644
--- a/users/glittershark/xanthous/src/Xanthous/Game/Env.hs
+++ b/users/grfn/xanthous/src/Xanthous/Game/Env.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Game/Lenses.hs b/users/grfn/xanthous/src/Xanthous/Game/Lenses.hs
index 6242b855f1..6242b855f1 100644
--- a/users/glittershark/xanthous/src/Xanthous/Game/Lenses.hs
+++ b/users/grfn/xanthous/src/Xanthous/Game/Lenses.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Game/Prompt.hs b/users/grfn/xanthous/src/Xanthous/Game/Prompt.hs
index 30b5fe7545..30b5fe7545 100644
--- a/users/glittershark/xanthous/src/Xanthous/Game/Prompt.hs
+++ b/users/grfn/xanthous/src/Xanthous/Game/Prompt.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Game/State.hs b/users/grfn/xanthous/src/Xanthous/Game/State.hs
index f614cad473..f614cad473 100644
--- a/users/glittershark/xanthous/src/Xanthous/Game/State.hs
+++ b/users/grfn/xanthous/src/Xanthous/Game/State.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Generators.hs b/users/grfn/xanthous/src/Xanthous/Generators.hs
index ef37070b6e..ef37070b6e 100644
--- a/users/glittershark/xanthous/src/Xanthous/Generators.hs
+++ b/users/grfn/xanthous/src/Xanthous/Generators.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Generators/CaveAutomata.hs b/users/grfn/xanthous/src/Xanthous/Generators/CaveAutomata.hs
index be904662f3..be904662f3 100644
--- a/users/glittershark/xanthous/src/Xanthous/Generators/CaveAutomata.hs
+++ b/users/grfn/xanthous/src/Xanthous/Generators/CaveAutomata.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Generators/Dungeon.hs b/users/grfn/xanthous/src/Xanthous/Generators/Dungeon.hs
index f30713ce11..f30713ce11 100644
--- a/users/glittershark/xanthous/src/Xanthous/Generators/Dungeon.hs
+++ b/users/grfn/xanthous/src/Xanthous/Generators/Dungeon.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Generators/LevelContents.hs b/users/grfn/xanthous/src/Xanthous/Generators/LevelContents.hs
index 8ebcc7f4da..8ebcc7f4da 100644
--- a/users/glittershark/xanthous/src/Xanthous/Generators/LevelContents.hs
+++ b/users/grfn/xanthous/src/Xanthous/Generators/LevelContents.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Generators/Util.hs b/users/grfn/xanthous/src/Xanthous/Generators/Util.hs
index 88aadd5aad..88aadd5aad 100644
--- a/users/glittershark/xanthous/src/Xanthous/Generators/Util.hs
+++ b/users/grfn/xanthous/src/Xanthous/Generators/Util.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Generators/Village.hs b/users/grfn/xanthous/src/Xanthous/Generators/Village.hs
index cc9c9d963f..cc9c9d963f 100644
--- a/users/glittershark/xanthous/src/Xanthous/Generators/Village.hs
+++ b/users/grfn/xanthous/src/Xanthous/Generators/Village.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Messages.hs b/users/grfn/xanthous/src/Xanthous/Messages.hs
index 2b1b3da1e8..2b1b3da1e8 100644
--- a/users/glittershark/xanthous/src/Xanthous/Messages.hs
+++ b/users/grfn/xanthous/src/Xanthous/Messages.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Messages/Template.hs b/users/grfn/xanthous/src/Xanthous/Messages/Template.hs
index 5176880355..5176880355 100644
--- a/users/glittershark/xanthous/src/Xanthous/Messages/Template.hs
+++ b/users/grfn/xanthous/src/Xanthous/Messages/Template.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Monad.hs b/users/grfn/xanthous/src/Xanthous/Monad.hs
index db602de56f..db602de56f 100644
--- a/users/glittershark/xanthous/src/Xanthous/Monad.hs
+++ b/users/grfn/xanthous/src/Xanthous/Monad.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Orphans.hs b/users/grfn/xanthous/src/Xanthous/Orphans.hs
index 1fe9708edb..1fe9708edb 100644
--- a/users/glittershark/xanthous/src/Xanthous/Orphans.hs
+++ b/users/grfn/xanthous/src/Xanthous/Orphans.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Prelude.hs b/users/grfn/xanthous/src/Xanthous/Prelude.hs
index 4d79b026f1..4d79b026f1 100644
--- a/users/glittershark/xanthous/src/Xanthous/Prelude.hs
+++ b/users/grfn/xanthous/src/Xanthous/Prelude.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Random.hs b/users/grfn/xanthous/src/Xanthous/Random.hs
index 6d34109df7..6d34109df7 100644
--- a/users/glittershark/xanthous/src/Xanthous/Random.hs
+++ b/users/grfn/xanthous/src/Xanthous/Random.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Util.hs b/users/grfn/xanthous/src/Xanthous/Util.hs
index 524ad4819d..524ad4819d 100644
--- a/users/glittershark/xanthous/src/Xanthous/Util.hs
+++ b/users/grfn/xanthous/src/Xanthous/Util.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Util/Comonad.hs b/users/grfn/xanthous/src/Xanthous/Util/Comonad.hs
index 9e158cc8e2..9e158cc8e2 100644
--- a/users/glittershark/xanthous/src/Xanthous/Util/Comonad.hs
+++ b/users/grfn/xanthous/src/Xanthous/Util/Comonad.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Util/Graph.hs b/users/grfn/xanthous/src/Xanthous/Util/Graph.hs
index 8e5c04f4bf..8e5c04f4bf 100644
--- a/users/glittershark/xanthous/src/Xanthous/Util/Graph.hs
+++ b/users/grfn/xanthous/src/Xanthous/Util/Graph.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Util/Graphics.hs b/users/grfn/xanthous/src/Xanthous/Util/Graphics.hs
index 6ba63a2d8a..6ba63a2d8a 100644
--- a/users/glittershark/xanthous/src/Xanthous/Util/Graphics.hs
+++ b/users/grfn/xanthous/src/Xanthous/Util/Graphics.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Util/Inflection.hs b/users/grfn/xanthous/src/Xanthous/Util/Inflection.hs
index 724f2339dd..724f2339dd 100644
--- a/users/glittershark/xanthous/src/Xanthous/Util/Inflection.hs
+++ b/users/grfn/xanthous/src/Xanthous/Util/Inflection.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Util/JSON.hs b/users/grfn/xanthous/src/Xanthous/Util/JSON.hs
index 91d1328e4a..91d1328e4a 100644
--- a/users/glittershark/xanthous/src/Xanthous/Util/JSON.hs
+++ b/users/grfn/xanthous/src/Xanthous/Util/JSON.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Util/Optparse.hs b/users/grfn/xanthous/src/Xanthous/Util/Optparse.hs
index dfa6537235..dfa6537235 100644
--- a/users/glittershark/xanthous/src/Xanthous/Util/Optparse.hs
+++ b/users/grfn/xanthous/src/Xanthous/Util/Optparse.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/Util/QuickCheck.hs b/users/grfn/xanthous/src/Xanthous/Util/QuickCheck.hs
index be12bc2945..be12bc2945 100644
--- a/users/glittershark/xanthous/src/Xanthous/Util/QuickCheck.hs
+++ b/users/grfn/xanthous/src/Xanthous/Util/QuickCheck.hs
diff --git a/users/glittershark/xanthous/src/Xanthous/messages.yaml b/users/grfn/xanthous/src/Xanthous/messages.yaml
index c1835ef232..c1835ef232 100644
--- a/users/glittershark/xanthous/src/Xanthous/messages.yaml
+++ b/users/grfn/xanthous/src/Xanthous/messages.yaml
diff --git a/users/glittershark/xanthous/test/Spec.hs b/users/grfn/xanthous/test/Spec.hs
index f15c393ac9..f15c393ac9 100644
--- a/users/glittershark/xanthous/test/Spec.hs
+++ b/users/grfn/xanthous/test/Spec.hs
diff --git a/users/glittershark/xanthous/test/Test/Prelude.hs b/users/grfn/xanthous/test/Test/Prelude.hs
index c423796184..c423796184 100644
--- a/users/glittershark/xanthous/test/Test/Prelude.hs
+++ b/users/grfn/xanthous/test/Test/Prelude.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Data/EntitiesSpec.hs b/users/grfn/xanthous/test/Xanthous/Data/EntitiesSpec.hs
index e403503743..e403503743 100644
--- a/users/glittershark/xanthous/test/Xanthous/Data/EntitiesSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Data/EntitiesSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Data/EntityCharSpec.hs b/users/grfn/xanthous/test/Xanthous/Data/EntityCharSpec.hs
index 9e8024c9d2..9e8024c9d2 100644
--- a/users/glittershark/xanthous/test/Xanthous/Data/EntityCharSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Data/EntityCharSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Data/EntityMap/GraphicsSpec.hs b/users/grfn/xanthous/test/Xanthous/Data/EntityMap/GraphicsSpec.hs
index fd37548ce8..fd37548ce8 100644
--- a/users/glittershark/xanthous/test/Xanthous/Data/EntityMap/GraphicsSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Data/EntityMap/GraphicsSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Data/EntityMapSpec.hs b/users/grfn/xanthous/test/Xanthous/Data/EntityMapSpec.hs
index 7c5cad0196..7c5cad0196 100644
--- a/users/glittershark/xanthous/test/Xanthous/Data/EntityMapSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Data/EntityMapSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Data/LevelsSpec.hs b/users/grfn/xanthous/test/Xanthous/Data/LevelsSpec.hs
index 4e46946a93..4e46946a93 100644
--- a/users/glittershark/xanthous/test/Xanthous/Data/LevelsSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Data/LevelsSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Data/NestedMapSpec.hs b/users/grfn/xanthous/test/Xanthous/Data/NestedMapSpec.hs
index acf7a67268..acf7a67268 100644
--- a/users/glittershark/xanthous/test/Xanthous/Data/NestedMapSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Data/NestedMapSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/DataSpec.hs b/users/grfn/xanthous/test/Xanthous/DataSpec.hs
index 91dc6cea1b..91dc6cea1b 100644
--- a/users/glittershark/xanthous/test/Xanthous/DataSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/DataSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Entities/RawsSpec.hs b/users/grfn/xanthous/test/Xanthous/Entities/RawsSpec.hs
index 2e6f35457f..2e6f35457f 100644
--- a/users/glittershark/xanthous/test/Xanthous/Entities/RawsSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Entities/RawsSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/GameSpec.hs b/users/grfn/xanthous/test/Xanthous/GameSpec.hs
index 2fa8527d0e..2fa8527d0e 100644
--- a/users/glittershark/xanthous/test/Xanthous/GameSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/GameSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Generators/UtilSpec.hs b/users/grfn/xanthous/test/Xanthous/Generators/UtilSpec.hs
index cdfadc06f5..cdfadc06f5 100644
--- a/users/glittershark/xanthous/test/Xanthous/Generators/UtilSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Generators/UtilSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/MessageSpec.hs b/users/grfn/xanthous/test/Xanthous/MessageSpec.hs
index b681e537ef..b681e537ef 100644
--- a/users/glittershark/xanthous/test/Xanthous/MessageSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/MessageSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Messages/TemplateSpec.hs b/users/grfn/xanthous/test/Xanthous/Messages/TemplateSpec.hs
index 2a3873c3b0..2a3873c3b0 100644
--- a/users/glittershark/xanthous/test/Xanthous/Messages/TemplateSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Messages/TemplateSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/OrphansSpec.hs b/users/grfn/xanthous/test/Xanthous/OrphansSpec.hs
index 3740945877..3740945877 100644
--- a/users/glittershark/xanthous/test/Xanthous/OrphansSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/OrphansSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/RandomSpec.hs b/users/grfn/xanthous/test/Xanthous/RandomSpec.hs
index 187336f086..187336f086 100644
--- a/users/glittershark/xanthous/test/Xanthous/RandomSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/RandomSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Util/GraphSpec.hs b/users/grfn/xanthous/test/Xanthous/Util/GraphSpec.hs
index 35ff090b28..35ff090b28 100644
--- a/users/glittershark/xanthous/test/Xanthous/Util/GraphSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Util/GraphSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Util/GraphicsSpec.hs b/users/grfn/xanthous/test/Xanthous/Util/GraphicsSpec.hs
index 61e5892803..61e5892803 100644
--- a/users/glittershark/xanthous/test/Xanthous/Util/GraphicsSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Util/GraphicsSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/Util/InflectionSpec.hs b/users/grfn/xanthous/test/Xanthous/Util/InflectionSpec.hs
index fad8410431..fad8410431 100644
--- a/users/glittershark/xanthous/test/Xanthous/Util/InflectionSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/Util/InflectionSpec.hs
diff --git a/users/glittershark/xanthous/test/Xanthous/UtilSpec.hs b/users/grfn/xanthous/test/Xanthous/UtilSpec.hs
index 8538ea5098..8538ea5098 100644
--- a/users/glittershark/xanthous/test/Xanthous/UtilSpec.hs
+++ b/users/grfn/xanthous/test/Xanthous/UtilSpec.hs
diff --git a/users/glittershark/xanthous/xanthous.cabal b/users/grfn/xanthous/xanthous.cabal
index 9648933b76..9648933b76 100644
--- a/users/glittershark/xanthous/xanthous.cabal
+++ b/users/grfn/xanthous/xanthous.cabal
diff --git a/web/panettone/OWNERS b/web/panettone/OWNERS
index aedec9ae6d..b2b0acc303 100644
--- a/web/panettone/OWNERS
+++ b/web/panettone/OWNERS
@@ -1,5 +1,5 @@
 inherited: true
 owners:
-  - glittershark
+  - grfn
   - tazjin
   - sterni
diff --git a/web/panettone/src/authentication.lisp b/web/panettone/src/authentication.lisp
index 07b9a6a87c..c335345020 100644
--- a/web/panettone/src/authentication.lisp
+++ b/web/panettone/src/authentication.lisp
@@ -95,7 +95,7 @@ instance of `user'"
           (ldap-entry->user ldap-entry))))))
 
 (comment
- (find-user-by-dn "cn=glittershark,ou=users,dc=tvl,dc=fyi")
+ (find-user-by-dn "cn=grfn,ou=users,dc=tvl,dc=fyi")
  )
 
 (defun authenticate-user (user-or-username password)
diff --git a/web/panettone/src/model.lisp b/web/panettone/src/model.lisp
index 4fa51026a0..77a7cd6da9 100644
--- a/web/panettone/src/model.lisp
+++ b/web/panettone/src/model.lisp
@@ -413,7 +413,7 @@ explicitly subscribing to / unsubscribing from individual issues."
  (ddl/init)
  (make-instance 'issue :subject "test")
  (create-issue :subject "test"
-               :author-dn "cn=glittershark,ou=users,dc=tvl,dc=fyi")
+               :author-dn "cn=grfn,ou=users,dc=tvl,dc=fyi")
 
  (issue-commenter-dns 1)
  (issue-subscribers 1)