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 0f618bf21d24..bd27ae3518e8 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 493d39e06b73..4b1d1457aa49 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 eb5ee4ed6d12..eb93aef69dac 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 0bc67898c633..4643b343174a 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 7a59128c657d..cb53cc0a355c 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 6f0b5a3ea6d8..79a422fcde1c 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 3f06a5376d1a..2d7f7e237b76 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 326136be7d3f..886f766d0c25 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 9473d17bd557..ce7e0e37ee4f 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 67e9015c8bd5..da7ac5cb9ef9 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 051d09d292a8..051d09d292a8 100644
--- a/users/glittershark/achilles/.envrc
+++ b/users/grfn/achilles/.envrc
diff --git a/users/glittershark/achilles/.gitignore b/users/grfn/achilles/.gitignore
index ea8c4bf7f35f..ea8c4bf7f35f 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 30e5e021f147..30e5e021f147 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 f091399a0dd4..f091399a0dd4 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 ac5296ebbd74..ac5296ebbd74 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 3a8cd2865e87..3a8cd2865e87 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 faf8ce90e353..faf8ce90e353 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 dc6e7a1f3e34..dc6e7a1f3e34 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 20f1677235c0..20f1677235c0 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 70635d978c7c..70635d978c7c 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 4ad71455d444..4ad71455d444 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 cdf74db415ca..cdf74db415ca 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 0d145d620bef..0d145d620bef 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 7dc2de895709..7dc2de895709 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 17dec58b5ff7..17dec58b5ff7 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 8ef057dba04f..8ef057dba04f 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 0bea482c1478..0bea482c1478 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 be8767575ab5..be8767575ab5 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 61a712c08a8e..61a712c08a8e 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 fd0a822708c2..fd0a822708c2 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 59a5e46c466f..59a5e46c466f 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 51575a895e91..51575a895e91 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 8368a6dd180f..8368a6dd180f 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 016e9f6ed99a..016e9f6ed99a 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 45b215473d7f..45b215473d7f 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 268d6f479a1e..268d6f479a1e 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 a8ba2dd3acdc..a8ba2dd3acdc 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 55ba42f9de58..55ba42f9de58 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 5ae1b59b3a8e..5ae1b59b3a8e 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 8a28d00984c9..8a28d00984c9 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 406e5c0e699e..406e5c0e699e 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 3e0081bd391d..3e0081bd391d 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 8a1081e2521f..8a1081e2521f 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 845bfcb7ab6a..845bfcb7ab6a 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 251a988f4f6f..251a988f4f6f 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 91b56551c82d..91b56551c82d 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 306869bef1d5..306869bef1d5 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 d27c45075e97..d27c45075e97 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 0f1086bfd8e1..0f1086bfd8e1 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 81ffde367915..91040eb71d0c 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 a5753c8e995b..518f185cb9c2 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 3179dc424980..3179dc424980 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 1fd0e3988771..1fd0e3988771 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 319c93c05e47..319c93c05e47 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 87b2236d12c7..87b2236d12c7 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 00fda047e4a9..be4161441dce 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 07f1a4e21373..9dc1a683236e 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 2408347ceffc..e623aa2de131 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 fd6eced21249..230211ea2f72 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 3f118ec37e84..5b5dc8ead652 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 240fcfc53861..b6e51f686e1c 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 be8af3f39466..f4f9d2e37069 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 9bb12c61aae4..9bb12c61aae4 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 ad524504e9a9..75776a38cd9d 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 99a6ad74995d..4ffa33ca651c 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 6d378fe2075e..7a3ff23c33ba 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 e18a1609b231..c45cc7e6e381 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 16f6252d8b27..16f6252d8b27 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 a5d09f825c17..ec5b474af218 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 993791f367ae..8e6c3e0417ff 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 59953dfeaaa0..f2a60d0dc3a2 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 361daaac42f5..3e315c5e6046 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 3ed4b086af0c..e659e02c8b59 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 67b3defdd7ec..67b3defdd7ec 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 44c3552f6ea7..91d1f16a1115 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 d10751a63f94..ab65a912a8d1 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 9e05382ee6f0..b5bd4db7482c 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 ac81067bb179..54d3b40b099c 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 8a2854d759df..8a2854d759df 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 cbb1646e41d1..cbb1646e41d1 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 fdd8250d86ca..fdd8250d86ca 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 68863f70542b..68863f70542b 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 bf39a2a3eecb..bf39a2a3eecb 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 74b63dc672e4..74b63dc672e4 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 4a7fca2c2fd6..4a7fca2c2fd6 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 6e17b83d7114..6e17b83d7114 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 1beafbe50b56..1beafbe50b56 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 6f84720f4511..6f84720f4511 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 b22ea3d2e888..b22ea3d2e888 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 4554d33f9ba7..4554d33f9ba7 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 fccff1d66f29..fccff1d66f29 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 82224b36a49e..82224b36a49e 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 7bcd99b5716c..7bcd99b5716c 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 ef8d1a3863ee..ef8d1a3863ee 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 4569b6583143..4569b6583143 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 d83809f3c35e..d83809f3c35e 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 bd0198181d02..bd0198181d02 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 eba41ef3309d..eba41ef3309d 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 b423044b4410..b423044b4410 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 3e303764cb0b..3e303764cb0b 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 a451cfc08a90..a451cfc08a90 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 00da312e1096..00da312e1096 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 dc79819d8979..dc79819d8979 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 0bb0f024367b..0bb0f024367b 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 938d490a74e8..938d490a74e8 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 9b9373573048..9b9373573048 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 0a74c21e1857..0a74c21e1857 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 e3d52e1c0201..e3d52e1c0201 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 b5d43fd6bc01..b5d43fd6bc01 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 ef46062d09b4..ef46062d09b4 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 297529cdac64..297529cdac64 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 fde469276c3f..fde469276c3f 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 a43bc95cc3ed..a43bc95cc3ed 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 e5be85d6b3c0..e5be85d6b3c0 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 247ae51b0b78..247ae51b0b78 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 1bdbdfa5dc36..1bdbdfa5dc36 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 37f2dd31caff..37f2dd31caff 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 47e83850d5b7..47e83850d5b7 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 9448b45c9623..9448b45c9623 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 c49ec40a15cc..c49ec40a15cc 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 eca6d60b481f..eca6d60b481f 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 aba801c6baf9..aba801c6baf9 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 6b5c0bbc0a73..6b5c0bbc0a73 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 fea942a337f6..fea942a337f6 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 b48e443cb8e1..b48e443cb8e1 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 f1446923a0e4..f1446923a0e4 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 377b3cfcf60c..377b3cfcf60c 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 0a476ab58661..0a476ab58661 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 d38ffceafbad..d38ffceafbad 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 6acc46ff397a..6acc46ff397a 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 e64175200f44..e64175200f44 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 7b9431147011..7b9431147011 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 ea4dcfc39318..dbc9704d7909 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 37e22af421c6..eef397a24ea6 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 6a1dc4ba47cc..28e7ce09a25a 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 6495a1a5952e..6495a1a5952e 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 ae00b6b5fc75..ae00b6b5fc75 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 1bfac3ca8b33..21192753a268 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 02d6223a4cc5..a7fdea46da32 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 be81feddb1a5..be81feddb1a5 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 2b72eaed2988..2b72eaed2988 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 a21bfe7b872e..d6c9f40c9536 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 b05d897d3ddb..b05d897d3ddb 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 ef3ef6c57080..ef3ef6c57080 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 0886192abf28..0886192abf28 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 26423f18f12f..26423f18f12f 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 ad5a24795826..ad5a24795826 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 846bdb6677a3..846bdb6677a3 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 a74bee0bef0a..a74bee0bef0a 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 b2be92b7db01..b2be92b7db01 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 b085883a1049..b085883a1049 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 7e004860672a..7e004860672a 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 efc89463c84b..efc89463c84b 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 316c435fed6c..316c435fed6c 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 fbb28c9aac59..fbb28c9aac59 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 c52229b3a898..c52229b3a898 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 2a7dd97debf1..2a7dd97debf1 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 f15e387d5464..f15e387d5464 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 1777f0fac3ea..1777f0fac3ea 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 9cd8fbe8921d..9cd8fbe8921d 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 e6e29b575187..e6e29b575187 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 051d09d292a8..051d09d292a8 100644
--- a/users/glittershark/owothia/.envrc
+++ b/users/grfn/owothia/.envrc
diff --git a/users/glittershark/owothia/.gitignore b/users/grfn/owothia/.gitignore
index 8e850e7a0af2..8e850e7a0af2 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 c2a6179bfbbf..c2a6179bfbbf 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 e10098ed943b..e10098ed943b 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 16a6c1526259..16a6c1526259 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 ef5477ea1bf2..ef5477ea1bf2 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 6b2c34654382..6b2c34654382 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 1ad70c907baa..1ad70c907baa 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 65578f258c1a..65578f258c1a 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 6dde989c53b0..6dde989c53b0 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 4f1540a9d214..4f1540a9d214 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 2db6a650bc6e..2db6a650bc6e 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 dacc129a1025..dacc129a1025 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 a40f80733736..a40f80733736 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 3a6e1477f322..3a6e1477f322 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 7b949c704acd..7b949c704acd 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 4de7f848a04e..4de7f848a04e 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 9018726a2384..9018726a2384 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 134ae2401133..134ae2401133 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 d3dc5345b080..d3dc5345b080 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 681181997d38..681181997d38 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 1fc53f2180e1..1fc53f2180e1 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 0a4e2864be29..0a4e2864be29 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 eb1b1ec727bb..eb1b1ec727bb 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 fb0b70fdcd10..fb0b70fdcd10 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 e375e7612a5a..e375e7612a5a 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 63cf97aa3b7d..63cf97aa3b7d 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 85932464d1c5..85932464d1c5 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 ff732f4e2af5..ff732f4e2af5 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 63b21b5320ed..63b21b5320ed 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 933558d570b6..933558d570b6 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 adc939893261..adc939893261 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 41fbeb02c47d..41fbeb02c47d 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 e69de29bb2d1..e69de29bb2d1 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 33d9581e6a61..33d9581e6a61 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 e94693edc566..e94693edc566 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 1efba3f3c1e5..1efba3f3c1e5 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 39045c147d76..39045c147d76 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 04f34ccbc4ae..04f34ccbc4ae 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 0b8503a00e98..0b8503a00e98 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 1b1bbf29c616..1b1bbf29c616 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 8ee66023075b..8ee66023075b 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 67d6638a31f8..67d6638a31f8 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 cf8b0bebe743..cf8b0bebe743 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 d420595adb1d..02935aaa50f5 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 04a501e74b38..04a501e74b38 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 bed05693aa40..bed05693aa40 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 97ae4760d43b..97ae4760d43b 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 4deb83465289..4deb83465289 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 b7520085f835..b7520085f835 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 cdfcbecb7c00..cdfcbecb7c00 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 c7e78685a5a3..c7e78685a5a3 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 da54f99e5b39..da54f99e5b39 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 d31089133c2d..d31089133c2d 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 dc487dc6bd05..dc487dc6bd05 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 7c39b3478cfd..7c39b3478cfd 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 d4b16b44f0bf..d4b16b44f0bf 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 39f7bbe3c6fc..39f7bbe3c6fc 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 436c8f261797..436c8f261797 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 b4776e81596d..b4776e81596d 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 a1c717617a62..a1c717617a62 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 09d2c6356172..09d2c6356172 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 4bff19910f05..4bff19910f05 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 3cb2e90adc34..3cb2e90adc34 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 87d4309333dd..87d4309333dd 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 3e33b5e2bee7..3e33b5e2bee7 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 a12173d6842d..a12173d6842d 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 cf0375e94162..cf0375e94162 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 92924e419973..92924e419973 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 a9a45953da07..a9a45953da07 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 e69de29bb2d1..e69de29bb2d1 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 eae567015b73..eae567015b73 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 6592eddc08e3..9db9570ea00e 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 256aee6a5e3a..256aee6a5e3a 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 0fec21409255..0fec21409255 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 974e3c34e37b..974e3c34e37b 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 77c4dda9a558..77c4dda9a558 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 4b0cdec95d18..6eb4a510b8cd 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 7bb06716f79a..7bb06716f79a 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 0eab590660a4..727b450555f5 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 3adbd9d9b07f..3adbd9d9b07f 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 bfa0e22cff0a..bfa0e22cff0a 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 812f598f9f47..812f598f9f47 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 babe30d4271f..babe30d4271f 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 5c5ff8551594..5c5ff8551594 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 8c09f3a44266..8c09f3a44266 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 34d9bfdcb729..34d9bfdcb729 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 ca92e0c3f61c..ca92e0c3f61c 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 ce58ebb0dcda..ce58ebb0dcda 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 15c8dd5e3f92..15c8dd5e3f92 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 905ec8ced537..905ec8ced537 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 a319a5806fca..a319a5806fca 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 29ee0a0d7ce4..29ee0a0d7ce4 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 35ee44112ea1..35ee44112ea1 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 4fd7f25fcf8c..4fd7f25fcf8c 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 217443e2df82..217443e2df82 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 be81feddb1a5..be81feddb1a5 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 cfe8e35df091..cfe8e35df091 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 cb7aca541a3f..cb7aca541a3f 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 df82de3e8caf..df82de3e8caf 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 74014978ffac..74014978ffac 100644
--- a/users/glittershark/xanthous/.gitignore
+++ b/users/grfn/xanthous/.gitignore
diff --git a/users/glittershark/xanthous/LICENSE b/users/grfn/xanthous/LICENSE
index 45644ff76449..45644ff76449 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 7e1fedb069b1..7e1fedb069b1 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 9a994af677b0..9a994af677b0 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 5889618ee432..5889618ee432 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 c553abd6d5d0..c553abd6d5d0 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 56310e691c33..56310e691c33 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 fae4af92a7a5..fae4af92a7a5 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 f0c936bfca18..f0c936bfca18 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 748c65b3e0db..748c65b3e0db 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 cd1dbe24d361..cd1dbe24d361 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 0b89a50afb9e..0b89a50afb9e 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 49f8ec1fbb3d..49f8ec1fbb3d 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 7d7c16440545..7d7c16440545 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 e8cda59692a4..e8cda59692a4 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 16a6500866a7..16a6500866a7 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 29a4952106a1..29a4952106a1 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 34f2a9403892..34f2a9403892 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 dcd31afff9c7..dcd31afff9c7 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 a6cc789d6894..a6cc789d6894 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 9091961b725c..9091961b725c 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 f393a0e2ea9a..f393a0e2ea9a 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 69ba6f0e0596..69ba6f0e0596 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 9b5a3bf24fa7..9b5a3bf24fa7 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 b17348f3853e..b17348f3853e 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 37025dd37ad2..37025dd37ad2 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 c9c11b553b67..c9c11b553b67 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 0361d2a59ed5..0361d2a59ed5 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 39953410f2f3..39953410f2f3 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 855a3462daee..855a3462daee 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 d24defa841ab..d24defa841ab 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 19e7b0cdf086..19e7b0cdf086 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 efc0f53acecf..efc0f53acecf 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 1b875d448302..1b875d448302 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 2e6d48062a45..2e6d48062a45 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 c18d726a4bfd..c18d726a4bfd 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 e95e9f0b985b..e95e9f0b985b 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 501a5b597221..501a5b597221 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 aa6c5fa4fc47..aa6c5fa4fc47 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 a0c037a1b4ed..a0c037a1b4ed 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 519a862c6a5a..519a862c6a5a 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 b45a91eabed2..b45a91eabed2 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 b50a5eab809d..b50a5eab809d 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 14d02872ed4e..14d02872ed4e 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 30039662f071..30039662f071 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 d4cae7ccc299..d4cae7ccc299 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 2eac895190b3..2eac895190b3 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 c3f19dce91d1..c3f19dce91d1 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 bc7fde4d8b02..bc7fde4d8b02 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 89c23f0de850..89c23f0de850 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 1b15ad4ffa64..1b15ad4ffa64 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 2375ae8c557e..2375ae8c557e 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 6e10d0f73581..6e10d0f73581 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 6242b855f1cc..6242b855f1cc 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 30b5fe7545e0..30b5fe7545e0 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 f614cad47339..f614cad47339 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 ef37070b6ede..ef37070b6ede 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 be904662f3f7..be904662f3f7 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 f30713ce1182..f30713ce1182 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 8ebcc7f4da83..8ebcc7f4da83 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 88aadd5aadd9..88aadd5aadd9 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 cc9c9d963f5c..cc9c9d963f5c 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 2b1b3da1e8c1..2b1b3da1e8c1 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 5176880355f4..5176880355f4 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 db602de56f3a..db602de56f3a 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 1fe9708edbe0..1fe9708edbe0 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 4d79b026f14a..4d79b026f14a 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 6d34109df7f8..6d34109df7f8 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 524ad4819dac..524ad4819dac 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 9e158cc8e2d4..9e158cc8e2d4 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 8e5c04f4bfa9..8e5c04f4bfa9 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 6ba63a2d8a3f..6ba63a2d8a3f 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 724f2339dd21..724f2339dd21 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 91d1328e4a10..91d1328e4a10 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 dfa65372351d..dfa65372351d 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 be12bc294513..be12bc294513 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 c1835ef2327b..c1835ef2327b 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 f15c393ac917..f15c393ac917 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 c423796184f7..c423796184f7 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 e403503743c0..e403503743c0 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 9e8024c9d223..9e8024c9d223 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 fd37548ce864..fd37548ce864 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 7c5cad019616..7c5cad019616 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 4e46946a93b0..4e46946a93b0 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 acf7a67268f4..acf7a67268f4 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 91dc6cea1ba5..91dc6cea1ba5 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 2e6f35457fc7..2e6f35457fc7 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 2fa8527d0e59..2fa8527d0e59 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 cdfadc06f505..cdfadc06f505 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 b681e537efe6..b681e537efe6 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 2a3873c3b016..2a3873c3b016 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 3740945877ef..3740945877ef 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 187336f08650..187336f08650 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 35ff090b28b9..35ff090b28b9 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 61e589280362..61e589280362 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 fad841043152..fad841043152 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 8538ea5098ba..8538ea5098ba 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 9648933b768b..9648933b768b 100644
--- a/users/glittershark/xanthous/xanthous.cabal
+++ b/users/grfn/xanthous/xanthous.cabal
diff --git a/web/panettone/OWNERS b/web/panettone/OWNERS
index aedec9ae6d02..b2b0acc303c8 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 07b9a6a87cd5..c3353450201d 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 4fa51026a086..77a7cd6da92f 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)