diff --git a/README.md b/README.md index 986b73627..f58f937ce 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ personal or experimental code that does not require review. Some examples: -* `//users/grfn/xanthous`: A (WIP) TUI RPG, written in Haskell. +* `//users/aspen/xanthous`: A (WIP) TUI RPG, written in Haskell. * `//users/tazjin/emacs`: tazjin's Emacs & EXWM configuration * `//users/tazjin/finito`: A persistent finite-state machine library for Rust. diff --git a/default.nix b/default.nix index c4db2fa58..0ffbdbaba 100644 --- a/default.nix +++ b/default.nix @@ -108,8 +108,8 @@ readTree.fix (self: (readDepot { # list below. ci.excluded = [ # xanthous and related targets are disabled until cl/9186 is submitted - self.users.grfn.xanthous - self.users.grfn.system.system.mugwumpSystem + self.users.aspen.xanthous + self.users.aspen.system.system.mugwumpSystem ]; # List of all buildable targets, for CI purposes. diff --git a/ops/machines/all-systems.nix b/ops/machines/all-systems.nix index e2371d76e..449d41a5f 100644 --- a/ops/machines/all-systems.nix +++ b/ops/machines/all-systems.nix @@ -12,7 +12,7 @@ zamalek ]) ++ -(with depot.users.grfn.system.system; [ +(with depot.users.aspen.system.system; [ yeren mugwump ogopogo diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix index d57f76982..4eb913531 100644 --- a/ops/machines/whitby/default.nix +++ b/ops/machines/whitby/default.nix @@ -83,7 +83,7 @@ in authorizedKeys = depot.users.tazjin.keys.all ++ depot.users.lukegb.keys.all - ++ [ depot.users.grfn.keys.whitby ]; + ++ [ depot.users.aspen.keys.whitby ]; hostKeys = [ /etc/secrets/initrd_host_ed25519_key @@ -189,7 +189,7 @@ in secret-key-files = "/run/agenix/nix-cache-priv"; trusted-users = [ - "grfn" + "aspen" "lukegb" "tazjin" "sterni" @@ -201,7 +201,7 @@ in keys = with depot.users; tazjin.keys.all ++ lukegb.keys.all - ++ [ grfn.keys.whitby ] + ++ [ aspen.keys.whitby ] ++ sterni.keys.all ; }; @@ -565,8 +565,8 @@ in token_url = "https://auth.tvl.fyi/auth/realms/TVL/protocol/openid-connect/token"; api_url = "https://auth.tvl.fyi/auth/realms/TVL/protocol/openid-connect/userinfo"; - # Give lukegb, grfn, tazjin "Admin" rights. - role_attribute_path = "((sub == 'lukegb' || sub == 'grfn' || sub == 'tazjin') && 'Admin') || 'Editor'"; + # Give lukegb, aspen, tazjin "Admin" rights. + role_attribute_path = "((sub == 'lukegb' || sub == 'aspen' || sub == 'tazjin') && 'Admin') || 'Editor'"; # Allow creating new Grafana accounts from OAuth accounts. allow_sign_up = true; diff --git a/ops/modules/tvl-users.nix b/ops/modules/tvl-users.nix index d8269746a..ea83b435f 100644 --- a/ops/modules/tvl-users.nix +++ b/ops/modules/tvl-users.nix @@ -17,12 +17,10 @@ openssh.authorizedKeys.keys = depot.users.lukegb.keys.all; }; - users.grfn = { + users.aspen = { isNormalUser = true; extraGroups = [ "git" "wheel" ]; - openssh.authorizedKeys.keys = [ - depot.users.grfn.keys.whitby - ]; + openssh.authorizedKeys.keys = [ depot.users.aspen.keys.whitby ]; }; users.edef = { diff --git a/ops/modules/www/wigglydonke.rs.nix b/ops/modules/www/wigglydonke.rs.nix index 3d85e4eb9..644016432 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.path + "/users/grfn/wigglydonke.rs"}"; + root = "${depot.path + "/users/aspen/wigglydonke.rs"}"; }; }; } diff --git a/ops/secrets/secrets.nix b/ops/secrets/secrets.nix index cdaceedb3..5cbf2bf61 100644 --- a/ops/secrets/secrets.nix +++ b/ops/secrets/secrets.nix @@ -11,7 +11,7 @@ let "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDBRXeb8EuecLHP0bW4zuebXp4KRnXgJTZfeVWXQ1n1R" ]; - grfn = [ + aspen = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMcBGBoWd5pPIIQQP52rcFOQN3wAY0J/+K2fuU6SffjA " ]; @@ -22,10 +22,10 @@ let sanduny = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOag0XhylaTVhmT6HB8EN2Fv5Ymrc4ZfypOXONUkykTX"; whitby = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNh/w4BSKov0jdz3gKBc98tpoLta5bb87fQXWBhAl2I"; - terraform.publicKeys = tazjin ++ grfn ++ sterni ++ flokli; - whitbyDefault.publicKeys = tazjin ++ grfn ++ sterni ++ [ whitby ]; - allDefault.publicKeys = tazjin ++ grfn ++ sterni ++ [ sanduny whitby ]; - sandunyDefault.publicKeys = tazjin ++ grfn ++ sterni ++ [ sanduny ]; + terraform.publicKeys = tazjin ++ aspen ++ sterni ++ flokli; + whitbyDefault.publicKeys = tazjin ++ aspen ++ sterni ++ [ whitby ]; + allDefault.publicKeys = tazjin ++ aspen ++ sterni ++ [ sanduny whitby ]; + sandunyDefault.publicKeys = tazjin ++ aspen ++ sterni ++ [ sanduny ]; in { "besadii.age" = whitbyDefault; diff --git a/users/grfn/OWNERS b/users/aspen/OWNERS similarity index 100% rename from users/grfn/OWNERS rename to users/aspen/OWNERS diff --git a/users/grfn/achilles/.envrc b/users/aspen/achilles/.envrc similarity index 100% rename from users/grfn/achilles/.envrc rename to users/aspen/achilles/.envrc diff --git a/users/grfn/achilles/.gitignore b/users/aspen/achilles/.gitignore similarity index 100% rename from users/grfn/achilles/.gitignore rename to users/aspen/achilles/.gitignore diff --git a/users/grfn/achilles/Cargo.lock b/users/aspen/achilles/Cargo.lock similarity index 100% rename from users/grfn/achilles/Cargo.lock rename to users/aspen/achilles/Cargo.lock diff --git a/users/grfn/achilles/Cargo.toml b/users/aspen/achilles/Cargo.toml similarity index 100% rename from users/grfn/achilles/Cargo.toml rename to users/aspen/achilles/Cargo.toml diff --git a/users/grfn/achilles/ach/.gitignore b/users/aspen/achilles/ach/.gitignore similarity index 100% rename from users/grfn/achilles/ach/.gitignore rename to users/aspen/achilles/ach/.gitignore diff --git a/users/grfn/achilles/ach/Makefile b/users/aspen/achilles/ach/Makefile similarity index 100% rename from users/grfn/achilles/ach/Makefile rename to users/aspen/achilles/ach/Makefile diff --git a/users/grfn/achilles/ach/externs.ach b/users/aspen/achilles/ach/externs.ach similarity index 100% rename from users/grfn/achilles/ach/externs.ach rename to users/aspen/achilles/ach/externs.ach diff --git a/users/grfn/achilles/ach/functions.ach b/users/aspen/achilles/ach/functions.ach similarity index 100% rename from users/grfn/achilles/ach/functions.ach rename to users/aspen/achilles/ach/functions.ach diff --git a/users/grfn/achilles/ach/simple.ach b/users/aspen/achilles/ach/simple.ach similarity index 100% rename from users/grfn/achilles/ach/simple.ach rename to users/aspen/achilles/ach/simple.ach diff --git a/users/grfn/achilles/ach/units.ach b/users/aspen/achilles/ach/units.ach similarity index 100% rename from users/grfn/achilles/ach/units.ach rename to users/aspen/achilles/ach/units.ach diff --git a/users/grfn/achilles/default.nix b/users/aspen/achilles/default.nix similarity index 100% rename from users/grfn/achilles/default.nix rename to users/aspen/achilles/default.nix diff --git a/users/grfn/achilles/shell.nix b/users/aspen/achilles/shell.nix similarity index 100% rename from users/grfn/achilles/shell.nix rename to users/aspen/achilles/shell.nix diff --git a/users/grfn/achilles/src/ast/hir.rs b/users/aspen/achilles/src/ast/hir.rs similarity index 100% rename from users/grfn/achilles/src/ast/hir.rs rename to users/aspen/achilles/src/ast/hir.rs diff --git a/users/grfn/achilles/src/ast/mod.rs b/users/aspen/achilles/src/ast/mod.rs similarity index 100% rename from users/grfn/achilles/src/ast/mod.rs rename to users/aspen/achilles/src/ast/mod.rs diff --git a/users/grfn/achilles/src/codegen/llvm.rs b/users/aspen/achilles/src/codegen/llvm.rs similarity index 100% rename from users/grfn/achilles/src/codegen/llvm.rs rename to users/aspen/achilles/src/codegen/llvm.rs diff --git a/users/grfn/achilles/src/codegen/mod.rs b/users/aspen/achilles/src/codegen/mod.rs similarity index 100% rename from users/grfn/achilles/src/codegen/mod.rs rename to users/aspen/achilles/src/codegen/mod.rs diff --git a/users/grfn/achilles/src/commands/check.rs b/users/aspen/achilles/src/commands/check.rs similarity index 100% rename from users/grfn/achilles/src/commands/check.rs rename to users/aspen/achilles/src/commands/check.rs diff --git a/users/grfn/achilles/src/commands/compile.rs b/users/aspen/achilles/src/commands/compile.rs similarity index 100% rename from users/grfn/achilles/src/commands/compile.rs rename to users/aspen/achilles/src/commands/compile.rs diff --git a/users/grfn/achilles/src/commands/eval.rs b/users/aspen/achilles/src/commands/eval.rs similarity index 100% rename from users/grfn/achilles/src/commands/eval.rs rename to users/aspen/achilles/src/commands/eval.rs diff --git a/users/grfn/achilles/src/commands/mod.rs b/users/aspen/achilles/src/commands/mod.rs similarity index 100% rename from users/grfn/achilles/src/commands/mod.rs rename to users/aspen/achilles/src/commands/mod.rs diff --git a/users/grfn/achilles/src/common/env.rs b/users/aspen/achilles/src/common/env.rs similarity index 100% rename from users/grfn/achilles/src/common/env.rs rename to users/aspen/achilles/src/common/env.rs diff --git a/users/grfn/achilles/src/common/error.rs b/users/aspen/achilles/src/common/error.rs similarity index 100% rename from users/grfn/achilles/src/common/error.rs rename to users/aspen/achilles/src/common/error.rs diff --git a/users/grfn/achilles/src/common/mod.rs b/users/aspen/achilles/src/common/mod.rs similarity index 100% rename from users/grfn/achilles/src/common/mod.rs rename to users/aspen/achilles/src/common/mod.rs diff --git a/users/grfn/achilles/src/common/namer.rs b/users/aspen/achilles/src/common/namer.rs similarity index 100% rename from users/grfn/achilles/src/common/namer.rs rename to users/aspen/achilles/src/common/namer.rs diff --git a/users/grfn/achilles/src/compiler.rs b/users/aspen/achilles/src/compiler.rs similarity index 100% rename from users/grfn/achilles/src/compiler.rs rename to users/aspen/achilles/src/compiler.rs diff --git a/users/grfn/achilles/src/interpreter/error.rs b/users/aspen/achilles/src/interpreter/error.rs similarity index 100% rename from users/grfn/achilles/src/interpreter/error.rs rename to users/aspen/achilles/src/interpreter/error.rs diff --git a/users/grfn/achilles/src/interpreter/mod.rs b/users/aspen/achilles/src/interpreter/mod.rs similarity index 100% rename from users/grfn/achilles/src/interpreter/mod.rs rename to users/aspen/achilles/src/interpreter/mod.rs diff --git a/users/grfn/achilles/src/interpreter/value.rs b/users/aspen/achilles/src/interpreter/value.rs similarity index 100% rename from users/grfn/achilles/src/interpreter/value.rs rename to users/aspen/achilles/src/interpreter/value.rs diff --git a/users/grfn/achilles/src/main.rs b/users/aspen/achilles/src/main.rs similarity index 100% rename from users/grfn/achilles/src/main.rs rename to users/aspen/achilles/src/main.rs diff --git a/users/grfn/achilles/src/parser/expr.rs b/users/aspen/achilles/src/parser/expr.rs similarity index 100% rename from users/grfn/achilles/src/parser/expr.rs rename to users/aspen/achilles/src/parser/expr.rs diff --git a/users/grfn/achilles/src/parser/macros.rs b/users/aspen/achilles/src/parser/macros.rs similarity index 100% rename from users/grfn/achilles/src/parser/macros.rs rename to users/aspen/achilles/src/parser/macros.rs diff --git a/users/grfn/achilles/src/parser/mod.rs b/users/aspen/achilles/src/parser/mod.rs similarity index 100% rename from users/grfn/achilles/src/parser/mod.rs rename to users/aspen/achilles/src/parser/mod.rs diff --git a/users/grfn/achilles/src/parser/type_.rs b/users/aspen/achilles/src/parser/type_.rs similarity index 100% rename from users/grfn/achilles/src/parser/type_.rs rename to users/aspen/achilles/src/parser/type_.rs diff --git a/users/grfn/achilles/src/parser/util.rs b/users/aspen/achilles/src/parser/util.rs similarity index 100% rename from users/grfn/achilles/src/parser/util.rs rename to users/aspen/achilles/src/parser/util.rs diff --git a/users/grfn/achilles/src/passes/hir/mod.rs b/users/aspen/achilles/src/passes/hir/mod.rs similarity index 100% rename from users/grfn/achilles/src/passes/hir/mod.rs rename to users/aspen/achilles/src/passes/hir/mod.rs diff --git a/users/grfn/achilles/src/passes/hir/monomorphize.rs b/users/aspen/achilles/src/passes/hir/monomorphize.rs similarity index 100% rename from users/grfn/achilles/src/passes/hir/monomorphize.rs rename to users/aspen/achilles/src/passes/hir/monomorphize.rs diff --git a/users/grfn/achilles/src/passes/hir/strip_positive_units.rs b/users/aspen/achilles/src/passes/hir/strip_positive_units.rs similarity index 100% rename from users/grfn/achilles/src/passes/hir/strip_positive_units.rs rename to users/aspen/achilles/src/passes/hir/strip_positive_units.rs diff --git a/users/grfn/achilles/src/passes/mod.rs b/users/aspen/achilles/src/passes/mod.rs similarity index 100% rename from users/grfn/achilles/src/passes/mod.rs rename to users/aspen/achilles/src/passes/mod.rs diff --git a/users/grfn/achilles/src/tc/mod.rs b/users/aspen/achilles/src/tc/mod.rs similarity index 100% rename from users/grfn/achilles/src/tc/mod.rs rename to users/aspen/achilles/src/tc/mod.rs diff --git a/users/grfn/achilles/tests/compile.rs b/users/aspen/achilles/tests/compile.rs similarity index 100% rename from users/grfn/achilles/tests/compile.rs rename to users/aspen/achilles/tests/compile.rs diff --git a/users/grfn/bbbg/.clj-kondo/config.edn b/users/aspen/bbbg/.clj-kondo/config.edn similarity index 100% rename from users/grfn/bbbg/.clj-kondo/config.edn rename to users/aspen/bbbg/.clj-kondo/config.edn diff --git a/users/grfn/bbbg/.envrc b/users/aspen/bbbg/.envrc similarity index 100% rename from users/grfn/bbbg/.envrc rename to users/aspen/bbbg/.envrc diff --git a/users/grfn/bbbg/.gitignore b/users/aspen/bbbg/.gitignore similarity index 100% rename from users/grfn/bbbg/.gitignore rename to users/aspen/bbbg/.gitignore diff --git a/users/grfn/bbbg/Makefile b/users/aspen/bbbg/Makefile similarity index 100% rename from users/grfn/bbbg/Makefile rename to users/aspen/bbbg/Makefile diff --git a/users/grfn/bbbg/README.md b/users/aspen/bbbg/README.md similarity index 95% rename from users/grfn/bbbg/README.md rename to users/aspen/bbbg/README.md index a7181333b..41f59319c 100644 --- a/users/grfn/bbbg/README.md +++ b/users/aspen/bbbg/README.md @@ -21,7 +21,7 @@ commands to install all development dependencies: ``` shell-session $ pwd -/path/to/depot/users/grfn/bbbg +/path/to/depot/users/aspen/bbbg $ direnv allow $ lorri watch --once # Wait for a single nix shell build ``` @@ -30,7 +30,7 @@ Then, to run a docker container with the development database: ``` shell-session $ pwd -/path/to/depot/users/grfn/bbbg +/path/to/depot/users/aspen/bbbg $ arion up -d ``` @@ -86,7 +86,7 @@ This will run a web server for the application listening at #### In Emacs, with [CIDER](https://docs.cider.mx/cider/index.html) + [direnv](https://github.com/wbolster/emacs-direnv) -Open `//users/grfn/bbbg/src/bbbg/core.clj` in a buffer, then follow the +Open `//users/aspen/bbbg/src/bbbg/core.clj` in a buffer, then follow the instructions at the end of the file ## Deployment @@ -120,7 +120,7 @@ The current deploy configuration includes: You'll need: - An uberjar for bbbg; the canonical way of building that is `nix-build - /path/to/depot -A users.grfn.bbbg.server-jar` but I\'m not sure how that + /path/to/depot -A users.aspen.bbbg.server-jar` but I\'m not sure how that works outside of nix - A postgresql database - Environment variables telling the app how to connect to that diff --git a/users/grfn/bbbg/arion-compose.nix b/users/aspen/bbbg/arion-compose.nix similarity index 100% rename from users/grfn/bbbg/arion-compose.nix rename to users/aspen/bbbg/arion-compose.nix diff --git a/users/grfn/bbbg/arion-pkgs.nix b/users/aspen/bbbg/arion-pkgs.nix similarity index 100% rename from users/grfn/bbbg/arion-pkgs.nix rename to users/aspen/bbbg/arion-pkgs.nix diff --git a/users/grfn/bbbg/default.nix b/users/aspen/bbbg/default.nix similarity index 100% rename from users/grfn/bbbg/default.nix rename to users/aspen/bbbg/default.nix diff --git a/users/grfn/bbbg/deps.edn b/users/aspen/bbbg/deps.edn similarity index 100% rename from users/grfn/bbbg/deps.edn rename to users/aspen/bbbg/deps.edn diff --git a/users/grfn/bbbg/deps.nix b/users/aspen/bbbg/deps.nix similarity index 100% rename from users/grfn/bbbg/deps.nix rename to users/aspen/bbbg/deps.nix diff --git a/users/grfn/bbbg/env/dev/bbbg-signup/env.clj b/users/aspen/bbbg/env/dev/bbbg-signup/env.clj similarity index 100% rename from users/grfn/bbbg/env/dev/bbbg-signup/env.clj rename to users/aspen/bbbg/env/dev/bbbg-signup/env.clj diff --git a/users/grfn/bbbg/env/dev/logback.xml b/users/aspen/bbbg/env/dev/logback.xml similarity index 100% rename from users/grfn/bbbg/env/dev/logback.xml rename to users/aspen/bbbg/env/dev/logback.xml diff --git a/users/grfn/bbbg/env/prod/bbbg-signup/env.clj b/users/aspen/bbbg/env/prod/bbbg-signup/env.clj similarity index 100% rename from users/grfn/bbbg/env/prod/bbbg-signup/env.clj rename to users/aspen/bbbg/env/prod/bbbg-signup/env.clj diff --git a/users/grfn/bbbg/env/prod/logback.xml b/users/aspen/bbbg/env/prod/logback.xml similarity index 100% rename from users/grfn/bbbg/env/prod/logback.xml rename to users/aspen/bbbg/env/prod/logback.xml diff --git a/users/grfn/bbbg/env/test/bbbg-signup/env.clj b/users/aspen/bbbg/env/test/bbbg-signup/env.clj similarity index 100% rename from users/grfn/bbbg/env/test/bbbg-signup/env.clj rename to users/aspen/bbbg/env/test/bbbg-signup/env.clj diff --git a/users/grfn/bbbg/env/test/logback.xml b/users/aspen/bbbg/env/test/logback.xml similarity index 100% rename from users/grfn/bbbg/env/test/logback.xml rename to users/aspen/bbbg/env/test/logback.xml diff --git a/users/grfn/bbbg/module.nix b/users/aspen/bbbg/module.nix similarity index 99% rename from users/grfn/bbbg/module.nix rename to users/aspen/bbbg/module.nix index 70bb2c77e..c5bacdf4d 100644 --- a/users/grfn/bbbg/module.nix +++ b/users/aspen/bbbg/module.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, depot, ... }: let - bbbg = depot.users.grfn.bbbg; + bbbg = depot.users.aspen.bbbg; cfg = config.services.bbbg; in { diff --git a/users/grfn/bbbg/pom.xml b/users/aspen/bbbg/pom.xml similarity index 100% rename from users/grfn/bbbg/pom.xml rename to users/aspen/bbbg/pom.xml diff --git a/users/grfn/bbbg/resources/base.css b/users/aspen/bbbg/resources/base.css similarity index 100% rename from users/grfn/bbbg/resources/base.css rename to users/aspen/bbbg/resources/base.css diff --git a/users/grfn/bbbg/resources/migrations/20211212165646-init-schema.down.sql b/users/aspen/bbbg/resources/migrations/20211212165646-init-schema.down.sql similarity index 100% rename from users/grfn/bbbg/resources/migrations/20211212165646-init-schema.down.sql rename to users/aspen/bbbg/resources/migrations/20211212165646-init-schema.down.sql diff --git a/users/grfn/bbbg/resources/migrations/20211212165646-init-schema.up.sql b/users/aspen/bbbg/resources/migrations/20211212165646-init-schema.up.sql similarity index 100% rename from users/grfn/bbbg/resources/migrations/20211212165646-init-schema.up.sql rename to users/aspen/bbbg/resources/migrations/20211212165646-init-schema.up.sql diff --git a/users/grfn/bbbg/resources/migrations/20211220002229-add-attendee-checks.down.sql b/users/aspen/bbbg/resources/migrations/20211220002229-add-attendee-checks.down.sql similarity index 100% rename from users/grfn/bbbg/resources/migrations/20211220002229-add-attendee-checks.down.sql rename to users/aspen/bbbg/resources/migrations/20211220002229-add-attendee-checks.down.sql diff --git a/users/grfn/bbbg/resources/migrations/20211220002229-add-attendee-checks.up.sql b/users/aspen/bbbg/resources/migrations/20211220002229-add-attendee-checks.up.sql similarity index 100% rename from users/grfn/bbbg/resources/migrations/20211220002229-add-attendee-checks.up.sql rename to users/aspen/bbbg/resources/migrations/20211220002229-add-attendee-checks.up.sql diff --git a/users/grfn/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.down.sql b/users/aspen/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.down.sql similarity index 100% rename from users/grfn/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.down.sql rename to users/aspen/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.down.sql diff --git a/users/grfn/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.up.sql b/users/aspen/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.up.sql similarity index 100% rename from users/grfn/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.up.sql rename to users/aspen/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.up.sql diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff2 b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff2 similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff2 rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff2 diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff2 b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff2 similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff2 rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff2 diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff2 b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff2 similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff2 rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff2 diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff2 b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff2 similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff2 rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff2 diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff2 b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff2 similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff2 rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff2 diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff2 b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff2 similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff2 rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff2 diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff diff --git a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff2 b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff2 similarity index 100% rename from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff2 rename to users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff2 diff --git a/users/grfn/bbbg/resources/public/main.js b/users/aspen/bbbg/resources/public/main.js similarity index 100% rename from users/grfn/bbbg/resources/public/main.js rename to users/aspen/bbbg/resources/public/main.js diff --git a/users/grfn/bbbg/resources/public/robots.txt b/users/aspen/bbbg/resources/public/robots.txt similarity index 100% rename from users/grfn/bbbg/resources/public/robots.txt rename to users/aspen/bbbg/resources/public/robots.txt diff --git a/users/grfn/bbbg/shell.nix b/users/aspen/bbbg/shell.nix similarity index 89% rename from users/grfn/bbbg/shell.nix rename to users/aspen/bbbg/shell.nix index e26569657..c253a2b9b 100644 --- a/users/grfn/bbbg/shell.nix +++ b/users/aspen/bbbg/shell.nix @@ -16,7 +16,7 @@ mkShell { module=$(nix-build ~/code/depot -A users.grfn.bbbg.tf.module) rm -f ~/tfstate/bbbg/*.json cp ''${module}/*.json ~/tfstate/bbbg - exec ${depot.users.grfn.bbbg.tf.terraform}/bin/terraform \ + exec ${depot.users.aspen.bbbg.tf.terraform}/bin/terraform \ -chdir=/home/grfn/tfstate/bbbg \ "$@" '') diff --git a/users/grfn/bbbg/src/bbbg/attendee.clj b/users/aspen/bbbg/src/bbbg/attendee.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/attendee.clj rename to users/aspen/bbbg/src/bbbg/attendee.clj diff --git a/users/grfn/bbbg/src/bbbg/attendee_check.clj b/users/aspen/bbbg/src/bbbg/attendee_check.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/attendee_check.clj rename to users/aspen/bbbg/src/bbbg/attendee_check.clj diff --git a/users/grfn/bbbg/src/bbbg/core.clj b/users/aspen/bbbg/src/bbbg/core.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/core.clj rename to users/aspen/bbbg/src/bbbg/core.clj diff --git a/users/grfn/bbbg/src/bbbg/db.clj b/users/aspen/bbbg/src/bbbg/db.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/db.clj rename to users/aspen/bbbg/src/bbbg/db.clj diff --git a/users/grfn/bbbg/src/bbbg/db/attendee.clj b/users/aspen/bbbg/src/bbbg/db/attendee.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/db/attendee.clj rename to users/aspen/bbbg/src/bbbg/db/attendee.clj diff --git a/users/grfn/bbbg/src/bbbg/db/attendee_check.clj b/users/aspen/bbbg/src/bbbg/db/attendee_check.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/db/attendee_check.clj rename to users/aspen/bbbg/src/bbbg/db/attendee_check.clj diff --git a/users/grfn/bbbg/src/bbbg/db/event.clj b/users/aspen/bbbg/src/bbbg/db/event.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/db/event.clj rename to users/aspen/bbbg/src/bbbg/db/event.clj diff --git a/users/grfn/bbbg/src/bbbg/db/event_attendee.clj b/users/aspen/bbbg/src/bbbg/db/event_attendee.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/db/event_attendee.clj rename to users/aspen/bbbg/src/bbbg/db/event_attendee.clj diff --git a/users/grfn/bbbg/src/bbbg/db/user.clj b/users/aspen/bbbg/src/bbbg/db/user.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/db/user.clj rename to users/aspen/bbbg/src/bbbg/db/user.clj diff --git a/users/grfn/bbbg/src/bbbg/discord.clj b/users/aspen/bbbg/src/bbbg/discord.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/discord.clj rename to users/aspen/bbbg/src/bbbg/discord.clj diff --git a/users/grfn/bbbg/src/bbbg/discord/auth.clj b/users/aspen/bbbg/src/bbbg/discord/auth.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/discord/auth.clj rename to users/aspen/bbbg/src/bbbg/discord/auth.clj diff --git a/users/grfn/bbbg/src/bbbg/event.clj b/users/aspen/bbbg/src/bbbg/event.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/event.clj rename to users/aspen/bbbg/src/bbbg/event.clj diff --git a/users/grfn/bbbg/src/bbbg/event_attendee.clj b/users/aspen/bbbg/src/bbbg/event_attendee.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/event_attendee.clj rename to users/aspen/bbbg/src/bbbg/event_attendee.clj diff --git a/users/grfn/bbbg/src/bbbg/handlers/attendee_checks.clj b/users/aspen/bbbg/src/bbbg/handlers/attendee_checks.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/handlers/attendee_checks.clj rename to users/aspen/bbbg/src/bbbg/handlers/attendee_checks.clj diff --git a/users/grfn/bbbg/src/bbbg/handlers/attendees.clj b/users/aspen/bbbg/src/bbbg/handlers/attendees.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/handlers/attendees.clj rename to users/aspen/bbbg/src/bbbg/handlers/attendees.clj diff --git a/users/grfn/bbbg/src/bbbg/handlers/core.clj b/users/aspen/bbbg/src/bbbg/handlers/core.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/handlers/core.clj rename to users/aspen/bbbg/src/bbbg/handlers/core.clj diff --git a/users/grfn/bbbg/src/bbbg/handlers/events.clj b/users/aspen/bbbg/src/bbbg/handlers/events.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/handlers/events.clj rename to users/aspen/bbbg/src/bbbg/handlers/events.clj diff --git a/users/grfn/bbbg/src/bbbg/handlers/home.clj b/users/aspen/bbbg/src/bbbg/handlers/home.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/handlers/home.clj rename to users/aspen/bbbg/src/bbbg/handlers/home.clj diff --git a/users/grfn/bbbg/src/bbbg/handlers/signup_form.clj b/users/aspen/bbbg/src/bbbg/handlers/signup_form.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/handlers/signup_form.clj rename to users/aspen/bbbg/src/bbbg/handlers/signup_form.clj diff --git a/users/grfn/bbbg/src/bbbg/meetup/import.clj b/users/aspen/bbbg/src/bbbg/meetup/import.clj similarity index 97% rename from users/grfn/bbbg/src/bbbg/meetup/import.clj rename to users/aspen/bbbg/src/bbbg/meetup/import.clj index d13d63e16..bbf867897 100644 --- a/users/grfn/bbbg/src/bbbg/meetup/import.clj +++ b/users/aspen/bbbg/src/bbbg/meetup/import.clj @@ -116,7 +116,7 @@ ;;; Have you been to one of our events before? Note, attendance at all events will require proof of vaccination until further notice. (comment - (def -filename- "/home/grfn/code/depot/users/grfn/bbbg/sample-data.tsv") + (def -filename- "/home/aspen/code/depot/users/aspen/bbbg/sample-data.tsv") (def event-id #uuid "09f8fed6-7480-451b-89a2-bb4edaeae657") (read-attendees -filename-) diff --git a/users/grfn/bbbg/src/bbbg/meetup_user.clj b/users/aspen/bbbg/src/bbbg/meetup_user.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/meetup_user.clj rename to users/aspen/bbbg/src/bbbg/meetup_user.clj diff --git a/users/grfn/bbbg/src/bbbg/styles.clj b/users/aspen/bbbg/src/bbbg/styles.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/styles.clj rename to users/aspen/bbbg/src/bbbg/styles.clj diff --git a/users/grfn/bbbg/src/bbbg/user.clj b/users/aspen/bbbg/src/bbbg/user.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/user.clj rename to users/aspen/bbbg/src/bbbg/user.clj diff --git a/users/grfn/bbbg/src/bbbg/util/core.clj b/users/aspen/bbbg/src/bbbg/util/core.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/util/core.clj rename to users/aspen/bbbg/src/bbbg/util/core.clj diff --git a/users/grfn/bbbg/src/bbbg/util/dev_secrets.clj b/users/aspen/bbbg/src/bbbg/util/dev_secrets.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/util/dev_secrets.clj rename to users/aspen/bbbg/src/bbbg/util/dev_secrets.clj diff --git a/users/grfn/bbbg/src/bbbg/util/display.clj b/users/aspen/bbbg/src/bbbg/util/display.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/util/display.clj rename to users/aspen/bbbg/src/bbbg/util/display.clj diff --git a/users/grfn/bbbg/src/bbbg/util/spec.clj b/users/aspen/bbbg/src/bbbg/util/spec.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/util/spec.clj rename to users/aspen/bbbg/src/bbbg/util/spec.clj diff --git a/users/grfn/bbbg/src/bbbg/util/sql.clj b/users/aspen/bbbg/src/bbbg/util/sql.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/util/sql.clj rename to users/aspen/bbbg/src/bbbg/util/sql.clj diff --git a/users/grfn/bbbg/src/bbbg/util/time.clj b/users/aspen/bbbg/src/bbbg/util/time.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/util/time.clj rename to users/aspen/bbbg/src/bbbg/util/time.clj diff --git a/users/grfn/bbbg/src/bbbg/views/flash.clj b/users/aspen/bbbg/src/bbbg/views/flash.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/views/flash.clj rename to users/aspen/bbbg/src/bbbg/views/flash.clj diff --git a/users/grfn/bbbg/src/bbbg/web.clj b/users/aspen/bbbg/src/bbbg/web.clj similarity index 100% rename from users/grfn/bbbg/src/bbbg/web.clj rename to users/aspen/bbbg/src/bbbg/web.clj diff --git a/users/grfn/bbbg/test/bbbg/meetup/import_test.clj b/users/aspen/bbbg/test/bbbg/meetup/import_test.clj similarity index 100% rename from users/grfn/bbbg/test/bbbg/meetup/import_test.clj rename to users/aspen/bbbg/test/bbbg/meetup/import_test.clj diff --git a/users/grfn/bbbg/tf.nix b/users/aspen/bbbg/tf.nix similarity index 94% rename from users/grfn/bbbg/tf.nix rename to users/aspen/bbbg/tf.nix index d5b19d9eb..e6ea69dfd 100644 --- a/users/grfn/bbbg/tf.nix +++ b/users/aspen/bbbg/tf.nix @@ -1,7 +1,7 @@ { depot, ... }: let - inherit (depot.users.grfn) + inherit (depot.users.aspen) terraform ; @@ -50,7 +50,7 @@ terraform.workspace "bbbg" ]; shell = pkgs.zsh; openssh.authorizedKeys.keys = [ - depot.users.grfn.keys.main + depot.users.aspen.keys.main ]; }; @@ -67,7 +67,7 @@ terraform.workspace "bbbg" age.secrets = { bbbg.file = - depot.users.grfn.secrets."bbbg.age"; + depot.users.aspen.secrets."bbbg.age"; }; services.bbbg.enable = true; diff --git a/users/grfn/emacs.d/+bindings.el b/users/aspen/emacs.d/+bindings.el similarity index 100% rename from users/grfn/emacs.d/+bindings.el rename to users/aspen/emacs.d/+bindings.el diff --git a/users/grfn/emacs.d/+commands.el b/users/aspen/emacs.d/+commands.el similarity index 100% rename from users/grfn/emacs.d/+commands.el rename to users/aspen/emacs.d/+commands.el diff --git a/users/grfn/emacs.d/+private.el.gpg b/users/aspen/emacs.d/+private.el.gpg similarity index 100% rename from users/grfn/emacs.d/+private.el.gpg rename to users/aspen/emacs.d/+private.el.gpg diff --git a/users/grfn/emacs.d/.gitignore b/users/aspen/emacs.d/.gitignore similarity index 100% rename from users/grfn/emacs.d/.gitignore rename to users/aspen/emacs.d/.gitignore diff --git a/users/grfn/emacs.d/autoload/evil.el b/users/aspen/emacs.d/autoload/evil.el similarity index 100% rename from users/grfn/emacs.d/autoload/evil.el rename to users/aspen/emacs.d/autoload/evil.el diff --git a/users/grfn/emacs.d/autoload/hlissner.el b/users/aspen/emacs.d/autoload/hlissner.el similarity index 100% rename from users/grfn/emacs.d/autoload/hlissner.el rename to users/aspen/emacs.d/autoload/hlissner.el diff --git a/users/grfn/emacs.d/clocked-in-elt.el b/users/aspen/emacs.d/clocked-in-elt.el similarity index 100% rename from users/grfn/emacs.d/clocked-in-elt.el rename to users/aspen/emacs.d/clocked-in-elt.el diff --git a/users/grfn/emacs.d/clojure.el b/users/aspen/emacs.d/clojure.el similarity index 100% rename from users/grfn/emacs.d/clojure.el rename to users/aspen/emacs.d/clojure.el diff --git a/users/grfn/emacs.d/company-sql.el b/users/aspen/emacs.d/company-sql.el similarity index 100% rename from users/grfn/emacs.d/company-sql.el rename to users/aspen/emacs.d/company-sql.el diff --git a/users/grfn/emacs.d/config.el b/users/aspen/emacs.d/config.el similarity index 100% rename from users/grfn/emacs.d/config.el rename to users/aspen/emacs.d/config.el diff --git a/users/grfn/emacs.d/cpp.el b/users/aspen/emacs.d/cpp.el similarity index 72% rename from users/grfn/emacs.d/cpp.el rename to users/aspen/emacs.d/cpp.el index 5b5dc8ead..6068736ec 100644 --- a/users/grfn/emacs.d/cpp.el +++ b/users/aspen/emacs.d/cpp.el @@ -7,18 +7,18 @@ (add-to-list 'flycheck-disabled-checkers 'c/c++-gcc) (add-to-list 'flycheck-disabled-checkers 'c/c++-clang)) -(defun +grfn/cpp-setup () +(defun +aspen/cpp-setup () (when (s-starts-with? - "/home/grfn/code/depot/third_party/nix" + "/home/aspen/code/depot/third_party/nix" (buffer-file-name)) - (setq lsp-clients-clangd-executable "/home/grfn/code/depot/users/grfn/emacs.d/nix-clangd.sh" + (setq lsp-clients-clangd-executable "/home/aspen/code/depot/users/aspen/emacs.d/nix-clangd.sh" lsp-clients-clangd-args nil) (google-set-c-style) (lsp) (add-to-list 'flycheck-disabled-checkers 'c/c++-gcc) (add-to-list 'flycheck-disabled-checkers 'c/c++-clang))) -(add-hook 'c++-mode-hook #'+grfn/cpp-setup) +(add-hook 'c++-mode-hook #'+aspen/cpp-setup) (use-package! protobuf-mode) @@ -34,6 +34,6 @@ (comment (setq lsp-clients-clangd-executable - "/home/grfn/code/depot/third_party/nix/clangd.sh" + "/home/aspen/code/depot/third_party/nix/clangd.sh" lsp-clients-clangd-args nil) ) diff --git a/users/grfn/emacs.d/email.el b/users/aspen/emacs.d/email.el similarity index 100% rename from users/grfn/emacs.d/email.el rename to users/aspen/emacs.d/email.el diff --git a/users/grfn/emacs.d/github-org.el b/users/aspen/emacs.d/github-org.el similarity index 100% rename from users/grfn/emacs.d/github-org.el rename to users/aspen/emacs.d/github-org.el diff --git a/users/grfn/emacs.d/google-c-style.el b/users/aspen/emacs.d/google-c-style.el similarity index 100% rename from users/grfn/emacs.d/google-c-style.el rename to users/aspen/emacs.d/google-c-style.el diff --git a/users/grfn/emacs.d/grid.el b/users/aspen/emacs.d/grid.el similarity index 100% rename from users/grfn/emacs.d/grid.el rename to users/aspen/emacs.d/grid.el diff --git a/users/grfn/emacs.d/init.el b/users/aspen/emacs.d/init.el similarity index 100% rename from users/grfn/emacs.d/init.el rename to users/aspen/emacs.d/init.el diff --git a/users/grfn/emacs.d/irc.el b/users/aspen/emacs.d/irc.el similarity index 100% rename from users/grfn/emacs.d/irc.el rename to users/aspen/emacs.d/irc.el diff --git a/users/grfn/emacs.d/lisp.el b/users/aspen/emacs.d/lisp.el similarity index 100% rename from users/grfn/emacs.d/lisp.el rename to users/aspen/emacs.d/lisp.el diff --git a/users/grfn/emacs.d/nix-clangd.sh b/users/aspen/emacs.d/nix-clangd.sh similarity index 100% rename from users/grfn/emacs.d/nix-clangd.sh rename to users/aspen/emacs.d/nix-clangd.sh diff --git a/users/grfn/emacs.d/nix.el b/users/aspen/emacs.d/nix.el similarity index 100% rename from users/grfn/emacs.d/nix.el rename to users/aspen/emacs.d/nix.el diff --git a/users/grfn/emacs.d/org-alerts.el b/users/aspen/emacs.d/org-alerts.el similarity index 100% rename from users/grfn/emacs.d/org-alerts.el rename to users/aspen/emacs.d/org-alerts.el diff --git a/users/grfn/emacs.d/org-config.el b/users/aspen/emacs.d/org-config.el similarity index 84% rename from users/grfn/emacs.d/org-config.el rename to users/aspen/emacs.d/org-config.el index c26207ad0..b8d88d319 100644 --- a/users/grfn/emacs.d/org-config.el +++ b/users/aspen/emacs.d/org-config.el @@ -1,35 +1,35 @@ ;;; -*- lexical-binding: t; -*- -(defun +grfn/org-setup () +(defun +aspen/org-setup () (setq-local truncate-lines -1) (display-line-numbers-mode -1) (line-number-mode -1)) -(add-hook 'org-mode-hook #'+grfn/org-setup) +(add-hook 'org-mode-hook #'+aspen/org-setup) (defun notes-file (f) (concat org-directory (if (string-prefix-p "/" f) "" "/") f)) -(defun grfn/org-project-tag->key (tag) +(defun aspen/org-project-tag->key (tag) (s-replace-regexp "^project__" "" tag)) -(defun grfn/org-project-tag->name (tag) +(defun aspen/org-project-tag->name (tag) (s-titleized-words - (s-join " " (s-split "_" (grfn/org-project-tag->key tag))))) + (s-join " " (s-split "_" (aspen/org-project-tag->key tag))))) -(defun grfn/org-project-tag->keys (tag) +(defun aspen/org-project-tag->keys (tag) (s-join "" (cons "p" (-map (lambda (s) (substring-no-properties s 0 1)) - (s-split "_" (grfn/org-project-tag->key tag)))))) + (s-split "_" (aspen/org-project-tag->key tag)))))) -(defun grfn/org-projects->agenda-commands (project-tags) +(defun aspen/org-projects->agenda-commands (project-tags) (loop for tag in project-tags - collect `(,(grfn/org-project-tag->keys tag) - ,(grfn/org-project-tag->name tag) + collect `(,(aspen/org-project-tag->keys tag) + ,(aspen/org-project-tag->name tag) tags-todo ,tag))) -(defun grfn/org-projects () +(defun aspen/org-projects () (loop for (tag) in (org-global-tags-completion-table (directory-files-recursively "~/notes" "\\.org$")) @@ -37,7 +37,7 @@ collect tag)) (comment - (grfn/org-projects->agenda-commands (grfn/org-projects)) + (aspen/org-projects->agenda-commands (aspen/org-projects)) ) (setq @@ -105,7 +105,7 @@ ) org-capture-templates-contexts - `(("px" ((in-file . "/home/grfn/code/depot/users/grfn/xanthous/.*"))) + `(("px" ((in-file . "/home/aspen/code/depot/users/aspen/xanthous/.*"))) ("e" ((in-mode . "notmuch-show-mode")))) org-deadline-warning-days 1 @@ -121,14 +121,14 @@ ("nt" "Next tooling" tags-todo "tooling") ("p" . "Project...") - ,@(grfn/org-projects->agenda-commands (grfn/org-projects))) + ,@(aspen/org-projects->agenda-commands (aspen/org-projects))) org-agenda-dim-blocked-tasks nil org-enforce-todo-dependencies nil org-babel-clojure-backend 'cider) -(defun +grfn/insert-work-template () +(defun +aspen/insert-work-template () (interactive) (goto-char (point-min)) (forward-line) @@ -142,20 +142,20 @@ #+PROPERTY: NOBLOCKING t #+COLUMNS: %TODO %40ITEM(Task) %17EFFORT(Estimated){:} %CLOCKSUM(Time Spent) %17STORY-TYPE(Type) %TAGS")) -(defun +grfn/insert-org-template () +(defun +aspen/insert-org-template () (interactive) (pcase (buffer-file-name) - ((s-contains "/work/") (+grfn/insert-work-template)))) + ((s-contains "/work/") (+aspen/insert-work-template)))) ;;; TODO: this doesn't work? -(define-auto-insert "\\.org?$" #'grfn/insert-org-template t) +(define-auto-insert "\\.org?$" #'aspen/insert-org-template t) (defun forge--post-submit-around---link-pr-to-org-item (orig) (let ((cb (funcall orig))) (lambda (value headers status req) (prog1 (funcall cb value headers status req) - (grfn/at-org-clocked-in-item + (aspen/at-org-clocked-in-item (let ((url (alist-get 'html_url value)) (number (alist-get 'number value))) (org-set-property diff --git a/users/grfn/emacs.d/org-gcal.el b/users/aspen/emacs.d/org-gcal.el similarity index 100% rename from users/grfn/emacs.d/org-gcal.el rename to users/aspen/emacs.d/org-gcal.el diff --git a/users/grfn/emacs.d/org-query.el b/users/aspen/emacs.d/org-query.el similarity index 100% rename from users/grfn/emacs.d/org-query.el rename to users/aspen/emacs.d/org-query.el diff --git a/users/grfn/emacs.d/packages.el b/users/aspen/emacs.d/packages.el similarity index 100% rename from users/grfn/emacs.d/packages.el rename to users/aspen/emacs.d/packages.el diff --git a/users/grfn/emacs.d/rust.el b/users/aspen/emacs.d/rust.el similarity index 100% rename from users/grfn/emacs.d/rust.el rename to users/aspen/emacs.d/rust.el diff --git a/users/grfn/emacs.d/show-matching-paren.el b/users/aspen/emacs.d/show-matching-paren.el similarity index 100% rename from users/grfn/emacs.d/show-matching-paren.el rename to users/aspen/emacs.d/show-matching-paren.el diff --git a/users/grfn/emacs.d/slack-snippets.el b/users/aspen/emacs.d/slack-snippets.el similarity index 100% rename from users/grfn/emacs.d/slack-snippets.el rename to users/aspen/emacs.d/slack-snippets.el diff --git a/users/grfn/emacs.d/slack.el b/users/aspen/emacs.d/slack.el similarity index 100% rename from users/grfn/emacs.d/slack.el rename to users/aspen/emacs.d/slack.el diff --git a/users/grfn/emacs.d/snippets/haskell-mode/annotation b/users/aspen/emacs.d/snippets/haskell-mode/annotation similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/annotation rename to users/aspen/emacs.d/snippets/haskell-mode/annotation diff --git a/users/grfn/emacs.d/snippets/haskell-mode/benchmark-module b/users/aspen/emacs.d/snippets/haskell-mode/benchmark-module similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/benchmark-module rename to users/aspen/emacs.d/snippets/haskell-mode/benchmark-module diff --git a/users/grfn/emacs.d/snippets/haskell-mode/header b/users/aspen/emacs.d/snippets/haskell-mode/header similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/header rename to users/aspen/emacs.d/snippets/haskell-mode/header diff --git a/users/grfn/emacs.d/snippets/haskell-mode/hedgehog-generator b/users/aspen/emacs.d/snippets/haskell-mode/hedgehog-generator similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/hedgehog-generator rename to users/aspen/emacs.d/snippets/haskell-mode/hedgehog-generator diff --git a/users/grfn/emacs.d/snippets/haskell-mode/hedgehog-property b/users/aspen/emacs.d/snippets/haskell-mode/hedgehog-property similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/hedgehog-property rename to users/aspen/emacs.d/snippets/haskell-mode/hedgehog-property diff --git a/users/grfn/emacs.d/snippets/haskell-mode/hlint b/users/aspen/emacs.d/snippets/haskell-mode/hlint similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/hlint rename to users/aspen/emacs.d/snippets/haskell-mode/hlint diff --git a/users/grfn/emacs.d/snippets/haskell-mode/import-i b/users/aspen/emacs.d/snippets/haskell-mode/import-i similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/import-i rename to users/aspen/emacs.d/snippets/haskell-mode/import-i diff --git a/users/grfn/emacs.d/snippets/haskell-mode/inl b/users/aspen/emacs.d/snippets/haskell-mode/inl similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/inl rename to users/aspen/emacs.d/snippets/haskell-mode/inl diff --git a/users/grfn/emacs.d/snippets/haskell-mode/inline b/users/aspen/emacs.d/snippets/haskell-mode/inline similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/inline rename to users/aspen/emacs.d/snippets/haskell-mode/inline diff --git a/users/grfn/emacs.d/snippets/haskell-mode/language pragma b/users/aspen/emacs.d/snippets/haskell-mode/language pragma similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/language pragma rename to users/aspen/emacs.d/snippets/haskell-mode/language pragma diff --git a/users/grfn/emacs.d/snippets/haskell-mode/lens.field b/users/aspen/emacs.d/snippets/haskell-mode/lens.field similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/lens.field rename to users/aspen/emacs.d/snippets/haskell-mode/lens.field diff --git a/users/grfn/emacs.d/snippets/haskell-mode/module b/users/aspen/emacs.d/snippets/haskell-mode/module similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/module rename to users/aspen/emacs.d/snippets/haskell-mode/module diff --git a/users/grfn/emacs.d/snippets/haskell-mode/shut up, hlint b/users/aspen/emacs.d/snippets/haskell-mode/shut up, hlint similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/shut up, hlint rename to users/aspen/emacs.d/snippets/haskell-mode/shut up, hlint diff --git a/users/grfn/emacs.d/snippets/haskell-mode/test-group b/users/aspen/emacs.d/snippets/haskell-mode/test-group similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/test-group rename to users/aspen/emacs.d/snippets/haskell-mode/test-group diff --git a/users/grfn/emacs.d/snippets/haskell-mode/test-module b/users/aspen/emacs.d/snippets/haskell-mode/test-module similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/test-module rename to users/aspen/emacs.d/snippets/haskell-mode/test-module diff --git a/users/grfn/emacs.d/snippets/haskell-mode/undefined b/users/aspen/emacs.d/snippets/haskell-mode/undefined similarity index 100% rename from users/grfn/emacs.d/snippets/haskell-mode/undefined rename to users/aspen/emacs.d/snippets/haskell-mode/undefined diff --git a/users/grfn/emacs.d/snippets/js2-mode/action-type b/users/aspen/emacs.d/snippets/js2-mode/action-type similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/action-type rename to users/aspen/emacs.d/snippets/js2-mode/action-type diff --git a/users/grfn/emacs.d/snippets/js2-mode/before b/users/aspen/emacs.d/snippets/js2-mode/before similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/before rename to users/aspen/emacs.d/snippets/js2-mode/before diff --git a/users/grfn/emacs.d/snippets/js2-mode/context b/users/aspen/emacs.d/snippets/js2-mode/context similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/context rename to users/aspen/emacs.d/snippets/js2-mode/context diff --git a/users/grfn/emacs.d/snippets/js2-mode/describe b/users/aspen/emacs.d/snippets/js2-mode/describe similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/describe rename to users/aspen/emacs.d/snippets/js2-mode/describe diff --git a/users/grfn/emacs.d/snippets/js2-mode/expect b/users/aspen/emacs.d/snippets/js2-mode/expect similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/expect rename to users/aspen/emacs.d/snippets/js2-mode/expect diff --git a/users/grfn/emacs.d/snippets/js2-mode/function b/users/aspen/emacs.d/snippets/js2-mode/function similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/function rename to users/aspen/emacs.d/snippets/js2-mode/function diff --git a/users/grfn/emacs.d/snippets/js2-mode/header b/users/aspen/emacs.d/snippets/js2-mode/header similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/header rename to users/aspen/emacs.d/snippets/js2-mode/header diff --git a/users/grfn/emacs.d/snippets/js2-mode/it b/users/aspen/emacs.d/snippets/js2-mode/it similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/it rename to users/aspen/emacs.d/snippets/js2-mode/it diff --git a/users/grfn/emacs.d/snippets/js2-mode/it-pending b/users/aspen/emacs.d/snippets/js2-mode/it-pending similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/it-pending rename to users/aspen/emacs.d/snippets/js2-mode/it-pending diff --git a/users/grfn/emacs.d/snippets/js2-mode/module b/users/aspen/emacs.d/snippets/js2-mode/module similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/module rename to users/aspen/emacs.d/snippets/js2-mode/module diff --git a/users/grfn/emacs.d/snippets/js2-mode/record b/users/aspen/emacs.d/snippets/js2-mode/record similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/record rename to users/aspen/emacs.d/snippets/js2-mode/record diff --git a/users/grfn/emacs.d/snippets/js2-mode/test b/users/aspen/emacs.d/snippets/js2-mode/test similarity index 100% rename from users/grfn/emacs.d/snippets/js2-mode/test rename to users/aspen/emacs.d/snippets/js2-mode/test diff --git a/users/grfn/emacs.d/snippets/nix-mode/fetchFromGitHub b/users/aspen/emacs.d/snippets/nix-mode/fetchFromGitHub similarity index 100% rename from users/grfn/emacs.d/snippets/nix-mode/fetchFromGitHub rename to users/aspen/emacs.d/snippets/nix-mode/fetchFromGitHub diff --git a/users/grfn/emacs.d/snippets/nix-mode/pythonPackage b/users/aspen/emacs.d/snippets/nix-mode/pythonPackage similarity index 100% rename from users/grfn/emacs.d/snippets/nix-mode/pythonPackage rename to users/aspen/emacs.d/snippets/nix-mode/pythonPackage diff --git a/users/grfn/emacs.d/snippets/nix-mode/sha256 b/users/aspen/emacs.d/snippets/nix-mode/sha256 similarity index 100% rename from users/grfn/emacs.d/snippets/nix-mode/sha256 rename to users/aspen/emacs.d/snippets/nix-mode/sha256 diff --git a/users/grfn/emacs.d/snippets/org-mode/SQL source block b/users/aspen/emacs.d/snippets/org-mode/SQL source block similarity index 100% rename from users/grfn/emacs.d/snippets/org-mode/SQL source block rename to users/aspen/emacs.d/snippets/org-mode/SQL source block diff --git a/users/grfn/emacs.d/snippets/org-mode/combat b/users/aspen/emacs.d/snippets/org-mode/combat similarity index 100% rename from users/grfn/emacs.d/snippets/org-mode/combat rename to users/aspen/emacs.d/snippets/org-mode/combat diff --git a/users/grfn/emacs.d/snippets/org-mode/date b/users/aspen/emacs.d/snippets/org-mode/date similarity index 100% rename from users/grfn/emacs.d/snippets/org-mode/date rename to users/aspen/emacs.d/snippets/org-mode/date diff --git a/users/grfn/emacs.d/snippets/org-mode/date-time b/users/aspen/emacs.d/snippets/org-mode/date-time similarity index 100% rename from users/grfn/emacs.d/snippets/org-mode/date-time rename to users/aspen/emacs.d/snippets/org-mode/date-time diff --git a/users/grfn/emacs.d/snippets/org-mode/description b/users/aspen/emacs.d/snippets/org-mode/description similarity index 100% rename from users/grfn/emacs.d/snippets/org-mode/description rename to users/aspen/emacs.d/snippets/org-mode/description diff --git a/users/grfn/emacs.d/snippets/org-mode/nologdone b/users/aspen/emacs.d/snippets/org-mode/nologdone similarity index 100% rename from users/grfn/emacs.d/snippets/org-mode/nologdone rename to users/aspen/emacs.d/snippets/org-mode/nologdone diff --git a/users/grfn/emacs.d/snippets/org-mode/python source block b/users/aspen/emacs.d/snippets/org-mode/python source block similarity index 100% rename from users/grfn/emacs.d/snippets/org-mode/python source block rename to users/aspen/emacs.d/snippets/org-mode/python source block diff --git a/users/grfn/emacs.d/snippets/org-mode/reveal b/users/aspen/emacs.d/snippets/org-mode/reveal similarity index 100% rename from users/grfn/emacs.d/snippets/org-mode/reveal rename to users/aspen/emacs.d/snippets/org-mode/reveal diff --git a/users/grfn/emacs.d/snippets/org-mode/transaction b/users/aspen/emacs.d/snippets/org-mode/transaction similarity index 100% rename from users/grfn/emacs.d/snippets/org-mode/transaction rename to users/aspen/emacs.d/snippets/org-mode/transaction diff --git a/users/grfn/emacs.d/snippets/prolog-mode/use-module b/users/aspen/emacs.d/snippets/prolog-mode/use-module similarity index 100% rename from users/grfn/emacs.d/snippets/prolog-mode/use-module rename to users/aspen/emacs.d/snippets/prolog-mode/use-module diff --git a/users/grfn/emacs.d/snippets/python-mode/add_column b/users/aspen/emacs.d/snippets/python-mode/add_column similarity index 100% rename from users/grfn/emacs.d/snippets/python-mode/add_column rename to users/aspen/emacs.d/snippets/python-mode/add_column diff --git a/users/grfn/emacs.d/snippets/python-mode/decorate b/users/aspen/emacs.d/snippets/python-mode/decorate similarity index 100% rename from users/grfn/emacs.d/snippets/python-mode/decorate rename to users/aspen/emacs.d/snippets/python-mode/decorate diff --git a/users/grfn/emacs.d/snippets/python-mode/dunder b/users/aspen/emacs.d/snippets/python-mode/dunder similarity index 100% rename from users/grfn/emacs.d/snippets/python-mode/dunder rename to users/aspen/emacs.d/snippets/python-mode/dunder diff --git a/users/grfn/emacs.d/snippets/python-mode/name b/users/aspen/emacs.d/snippets/python-mode/name similarity index 100% rename from users/grfn/emacs.d/snippets/python-mode/name rename to users/aspen/emacs.d/snippets/python-mode/name diff --git a/users/grfn/emacs.d/snippets/python-mode/op.get_bind.execute b/users/aspen/emacs.d/snippets/python-mode/op.get_bind.execute similarity index 100% rename from users/grfn/emacs.d/snippets/python-mode/op.get_bind.execute rename to users/aspen/emacs.d/snippets/python-mode/op.get_bind.execute diff --git a/users/grfn/emacs.d/snippets/python-mode/pdb b/users/aspen/emacs.d/snippets/python-mode/pdb similarity index 100% rename from users/grfn/emacs.d/snippets/python-mode/pdb rename to users/aspen/emacs.d/snippets/python-mode/pdb diff --git a/users/grfn/emacs.d/snippets/rust-mode/#[macro_use] b/users/aspen/emacs.d/snippets/rust-mode/#[macro_use] similarity index 100% rename from users/grfn/emacs.d/snippets/rust-mode/#[macro_use] rename to users/aspen/emacs.d/snippets/rust-mode/#[macro_use] diff --git a/users/grfn/emacs.d/snippets/rust-mode/async test b/users/aspen/emacs.d/snippets/rust-mode/async test similarity index 100% rename from users/grfn/emacs.d/snippets/rust-mode/async test rename to users/aspen/emacs.d/snippets/rust-mode/async test diff --git a/users/grfn/emacs.d/snippets/rust-mode/benchmark b/users/aspen/emacs.d/snippets/rust-mode/benchmark similarity index 100% rename from users/grfn/emacs.d/snippets/rust-mode/benchmark rename to users/aspen/emacs.d/snippets/rust-mode/benchmark diff --git a/users/grfn/emacs.d/snippets/rust-mode/proptest b/users/aspen/emacs.d/snippets/rust-mode/proptest similarity index 100% rename from users/grfn/emacs.d/snippets/rust-mode/proptest rename to users/aspen/emacs.d/snippets/rust-mode/proptest diff --git a/users/grfn/emacs.d/snippets/rust-mode/test-module b/users/aspen/emacs.d/snippets/rust-mode/test-module similarity index 100% rename from users/grfn/emacs.d/snippets/rust-mode/test-module rename to users/aspen/emacs.d/snippets/rust-mode/test-module diff --git a/users/grfn/emacs.d/snippets/rust-mode/tests b/users/aspen/emacs.d/snippets/rust-mode/tests similarity index 100% rename from users/grfn/emacs.d/snippets/rust-mode/tests rename to users/aspen/emacs.d/snippets/rust-mode/tests diff --git a/users/grfn/emacs.d/snippets/snippet-mode/indent b/users/aspen/emacs.d/snippets/snippet-mode/indent similarity index 100% rename from users/grfn/emacs.d/snippets/snippet-mode/indent rename to users/aspen/emacs.d/snippets/snippet-mode/indent diff --git a/users/grfn/emacs.d/snippets/sql-mode/count(*) group by b/users/aspen/emacs.d/snippets/sql-mode/count(*) group by similarity index 100% rename from users/grfn/emacs.d/snippets/sql-mode/count(*) group by rename to users/aspen/emacs.d/snippets/sql-mode/count(*) group by diff --git a/users/grfn/emacs.d/snippets/terraform-mode/variable b/users/aspen/emacs.d/snippets/terraform-mode/variable similarity index 100% rename from users/grfn/emacs.d/snippets/terraform-mode/variable rename to users/aspen/emacs.d/snippets/terraform-mode/variable diff --git a/users/grfn/emacs.d/snippets/text-mode/date b/users/aspen/emacs.d/snippets/text-mode/date similarity index 100% rename from users/grfn/emacs.d/snippets/text-mode/date rename to users/aspen/emacs.d/snippets/text-mode/date diff --git a/users/grfn/emacs.d/splitjoin.el b/users/aspen/emacs.d/splitjoin.el similarity index 100% rename from users/grfn/emacs.d/splitjoin.el rename to users/aspen/emacs.d/splitjoin.el diff --git a/users/grfn/emacs.d/sql-strings.el b/users/aspen/emacs.d/sql-strings.el similarity index 100% rename from users/grfn/emacs.d/sql-strings.el rename to users/aspen/emacs.d/sql-strings.el diff --git a/users/grfn/emacs.d/terraform.el b/users/aspen/emacs.d/terraform.el similarity index 100% rename from users/grfn/emacs.d/terraform.el rename to users/aspen/emacs.d/terraform.el diff --git a/users/grfn/emacs.d/tests/splitjoin_test.el b/users/aspen/emacs.d/tests/splitjoin_test.el similarity index 100% rename from users/grfn/emacs.d/tests/splitjoin_test.el rename to users/aspen/emacs.d/tests/splitjoin_test.el diff --git a/users/grfn/emacs.d/themes/grfn-solarized-light-theme.el b/users/aspen/emacs.d/themes/grfn-solarized-light-theme.el similarity index 100% rename from users/grfn/emacs.d/themes/grfn-solarized-light-theme.el rename to users/aspen/emacs.d/themes/grfn-solarized-light-theme.el diff --git a/users/grfn/emacs.d/utils.el b/users/aspen/emacs.d/utils.el similarity index 100% rename from users/grfn/emacs.d/utils.el rename to users/aspen/emacs.d/utils.el diff --git a/users/grfn/emacs.d/vterm.el b/users/aspen/emacs.d/vterm.el similarity index 100% rename from users/grfn/emacs.d/vterm.el rename to users/aspen/emacs.d/vterm.el diff --git a/users/grfn/keyboard/.gitignore b/users/aspen/keyboard/.gitignore similarity index 100% rename from users/grfn/keyboard/.gitignore rename to users/aspen/keyboard/.gitignore diff --git a/users/grfn/keyboard/README.org b/users/aspen/keyboard/README.org similarity index 100% rename from users/grfn/keyboard/README.org rename to users/aspen/keyboard/README.org diff --git a/users/grfn/keyboard/default.nix b/users/aspen/keyboard/default.nix similarity index 100% rename from users/grfn/keyboard/default.nix rename to users/aspen/keyboard/default.nix diff --git a/users/aspen/keyboard/flash b/users/aspen/keyboard/flash new file mode 100755 index 000000000..ab6557a44 --- /dev/null +++ b/users/aspen/keyboard/flash @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +exec "$(nix-build --no-out-link ../../.. -A users.aspen.keyboard.flash)" diff --git a/users/grfn/keyboard/increase-tapping-delay.patch b/users/aspen/keyboard/increase-tapping-delay.patch similarity index 100% rename from users/grfn/keyboard/increase-tapping-delay.patch rename to users/aspen/keyboard/increase-tapping-delay.patch diff --git a/users/grfn/keyboard/keymap.c b/users/aspen/keyboard/keymap.c similarity index 100% rename from users/grfn/keyboard/keymap.c rename to users/aspen/keyboard/keymap.c diff --git a/users/grfn/keys.nix b/users/aspen/keys.nix similarity index 100% rename from users/grfn/keys.nix rename to users/aspen/keys.nix diff --git a/users/grfn/org-clubhouse/.gitignore b/users/aspen/org-clubhouse/.gitignore similarity index 100% rename from users/grfn/org-clubhouse/.gitignore rename to users/aspen/org-clubhouse/.gitignore diff --git a/users/grfn/org-clubhouse/CODE_OF_CONDUCT.org b/users/aspen/org-clubhouse/CODE_OF_CONDUCT.org similarity index 100% rename from users/grfn/org-clubhouse/CODE_OF_CONDUCT.org rename to users/aspen/org-clubhouse/CODE_OF_CONDUCT.org diff --git a/users/grfn/org-clubhouse/LICENSE b/users/aspen/org-clubhouse/LICENSE similarity index 100% rename from users/grfn/org-clubhouse/LICENSE rename to users/aspen/org-clubhouse/LICENSE diff --git a/users/grfn/org-clubhouse/README.org b/users/aspen/org-clubhouse/README.org similarity index 100% rename from users/grfn/org-clubhouse/README.org rename to users/aspen/org-clubhouse/README.org diff --git a/users/grfn/org-clubhouse/org-clubhouse.el b/users/aspen/org-clubhouse/org-clubhouse.el similarity index 100% rename from users/grfn/org-clubhouse/org-clubhouse.el rename to users/aspen/org-clubhouse/org-clubhouse.el diff --git a/users/grfn/pkgs/cargo-hakari.nix b/users/aspen/pkgs/cargo-hakari.nix similarity index 100% rename from users/grfn/pkgs/cargo-hakari.nix rename to users/aspen/pkgs/cargo-hakari.nix diff --git a/users/grfn/pkgs/cargo-nextest.nix b/users/aspen/pkgs/cargo-nextest.nix similarity index 100% rename from users/grfn/pkgs/cargo-nextest.nix rename to users/aspen/pkgs/cargo-nextest.nix diff --git a/users/grfn/pkgs/notmuch-extract-patch.nix b/users/aspen/pkgs/notmuch-extract-patch.nix similarity index 100% rename from users/grfn/pkgs/notmuch-extract-patch.nix rename to users/aspen/pkgs/notmuch-extract-patch.nix diff --git a/users/grfn/resume/chimera.png b/users/aspen/resume/chimera.png similarity index 100% rename from users/grfn/resume/chimera.png rename to users/aspen/resume/chimera.png diff --git a/users/grfn/resume/collection.sty b/users/aspen/resume/collection.sty similarity index 100% rename from users/grfn/resume/collection.sty rename to users/aspen/resume/collection.sty diff --git a/users/grfn/resume/default.nix b/users/aspen/resume/default.nix similarity index 100% rename from users/grfn/resume/default.nix rename to users/aspen/resume/default.nix diff --git a/users/grfn/resume/helvetica.sty b/users/aspen/resume/helvetica.sty similarity index 100% rename from users/grfn/resume/helvetica.sty rename to users/aspen/resume/helvetica.sty diff --git a/users/grfn/resume/moderncv.cls b/users/aspen/resume/moderncv.cls similarity index 100% rename from users/grfn/resume/moderncv.cls rename to users/aspen/resume/moderncv.cls diff --git a/users/grfn/resume/moderncvcolorblack.sty b/users/aspen/resume/moderncvcolorblack.sty similarity index 100% rename from users/grfn/resume/moderncvcolorblack.sty rename to users/aspen/resume/moderncvcolorblack.sty diff --git a/users/grfn/resume/moderncvcolorblue.sty b/users/aspen/resume/moderncvcolorblue.sty similarity index 100% rename from users/grfn/resume/moderncvcolorblue.sty rename to users/aspen/resume/moderncvcolorblue.sty diff --git a/users/grfn/resume/moderncvcolorgreen.sty b/users/aspen/resume/moderncvcolorgreen.sty similarity index 100% rename from users/grfn/resume/moderncvcolorgreen.sty rename to users/aspen/resume/moderncvcolorgreen.sty diff --git a/users/grfn/resume/moderncvcolorgrey.sty b/users/aspen/resume/moderncvcolorgrey.sty similarity index 100% rename from users/grfn/resume/moderncvcolorgrey.sty rename to users/aspen/resume/moderncvcolorgrey.sty diff --git a/users/grfn/resume/moderncvcolororange.sty b/users/aspen/resume/moderncvcolororange.sty similarity index 100% rename from users/grfn/resume/moderncvcolororange.sty rename to users/aspen/resume/moderncvcolororange.sty diff --git a/users/grfn/resume/moderncvcolorpurple.sty b/users/aspen/resume/moderncvcolorpurple.sty similarity index 100% rename from users/grfn/resume/moderncvcolorpurple.sty rename to users/aspen/resume/moderncvcolorpurple.sty diff --git a/users/grfn/resume/moderncvcolorred.sty b/users/aspen/resume/moderncvcolorred.sty similarity index 100% rename from users/grfn/resume/moderncvcolorred.sty rename to users/aspen/resume/moderncvcolorred.sty diff --git a/users/grfn/resume/moderncvcompatibility.sty b/users/aspen/resume/moderncvcompatibility.sty similarity index 100% rename from users/grfn/resume/moderncvcompatibility.sty rename to users/aspen/resume/moderncvcompatibility.sty diff --git a/users/grfn/resume/moderncviconsletters.sty b/users/aspen/resume/moderncviconsletters.sty similarity index 100% rename from users/grfn/resume/moderncviconsletters.sty rename to users/aspen/resume/moderncviconsletters.sty diff --git a/users/grfn/resume/moderncviconsmarvosym.sty b/users/aspen/resume/moderncviconsmarvosym.sty similarity index 100% rename from users/grfn/resume/moderncviconsmarvosym.sty rename to users/aspen/resume/moderncviconsmarvosym.sty diff --git a/users/grfn/resume/moderncvstylebanking.sty b/users/aspen/resume/moderncvstylebanking.sty similarity index 100% rename from users/grfn/resume/moderncvstylebanking.sty rename to users/aspen/resume/moderncvstylebanking.sty diff --git a/users/grfn/resume/moderncvstylecasual.sty b/users/aspen/resume/moderncvstylecasual.sty similarity index 100% rename from users/grfn/resume/moderncvstylecasual.sty rename to users/aspen/resume/moderncvstylecasual.sty diff --git a/users/grfn/resume/moderncvstyleclassic.sty b/users/aspen/resume/moderncvstyleclassic.sty similarity index 100% rename from users/grfn/resume/moderncvstyleclassic.sty rename to users/aspen/resume/moderncvstyleclassic.sty diff --git a/users/grfn/resume/moderncvstyleempty.sty b/users/aspen/resume/moderncvstyleempty.sty similarity index 100% rename from users/grfn/resume/moderncvstyleempty.sty rename to users/aspen/resume/moderncvstyleempty.sty diff --git a/users/grfn/resume/moderncvstyleoldstyle.sty b/users/aspen/resume/moderncvstyleoldstyle.sty similarity index 100% rename from users/grfn/resume/moderncvstyleoldstyle.sty rename to users/aspen/resume/moderncvstyleoldstyle.sty diff --git a/users/grfn/resume/picture.png b/users/aspen/resume/picture.png similarity index 100% rename from users/grfn/resume/picture.png rename to users/aspen/resume/picture.png diff --git a/users/grfn/resume/resume.tex b/users/aspen/resume/resume.tex similarity index 100% rename from users/grfn/resume/resume.tex rename to users/aspen/resume/resume.tex diff --git a/users/grfn/resume/tweaklist.sty b/users/aspen/resume/tweaklist.sty similarity index 100% rename from users/grfn/resume/tweaklist.sty rename to users/aspen/resume/tweaklist.sty diff --git a/users/grfn/secrets/.envrc b/users/aspen/secrets/.envrc similarity index 100% rename from users/grfn/secrets/.envrc rename to users/aspen/secrets/.envrc diff --git a/users/grfn/secrets/bbbg.age b/users/aspen/secrets/bbbg.age similarity index 100% rename from users/grfn/secrets/bbbg.age rename to users/aspen/secrets/bbbg.age diff --git a/users/grfn/secrets/buildkite-ssh-key.age b/users/aspen/secrets/buildkite-ssh-key.age similarity index 100% rename from users/grfn/secrets/buildkite-ssh-key.age rename to users/aspen/secrets/buildkite-ssh-key.age diff --git a/users/grfn/secrets/buildkite-token.age b/users/aspen/secrets/buildkite-token.age similarity index 100% rename from users/grfn/secrets/buildkite-token.age rename to users/aspen/secrets/buildkite-token.age diff --git a/users/grfn/secrets/cloudflare.age b/users/aspen/secrets/cloudflare.age similarity index 100% rename from users/grfn/secrets/cloudflare.age rename to users/aspen/secrets/cloudflare.age diff --git a/users/grfn/secrets/ddclient-password.age b/users/aspen/secrets/ddclient-password.age similarity index 100% rename from users/grfn/secrets/ddclient-password.age rename to users/aspen/secrets/ddclient-password.age diff --git a/users/grfn/secrets/default.nix b/users/aspen/secrets/default.nix similarity index 100% rename from users/grfn/secrets/default.nix rename to users/aspen/secrets/default.nix diff --git a/users/grfn/secrets/secrets.nix b/users/aspen/secrets/secrets.nix similarity index 100% rename from users/grfn/secrets/secrets.nix rename to users/aspen/secrets/secrets.nix diff --git a/users/grfn/secrets/shell.nix b/users/aspen/secrets/shell.nix similarity index 100% rename from users/grfn/secrets/shell.nix rename to users/aspen/secrets/shell.nix diff --git a/users/grfn/secrets/windtunnel-bot-github-token.age b/users/aspen/secrets/windtunnel-bot-github-token.age similarity index 100% rename from users/grfn/secrets/windtunnel-bot-github-token.age rename to users/aspen/secrets/windtunnel-bot-github-token.age diff --git a/users/grfn/system/.gitignore b/users/aspen/system/.gitignore similarity index 100% rename from users/grfn/system/.gitignore rename to users/aspen/system/.gitignore diff --git a/users/grfn/system/home/.skip-subtree b/users/aspen/system/home/.skip-subtree similarity index 100% rename from users/grfn/system/home/.skip-subtree rename to users/aspen/system/home/.skip-subtree diff --git a/users/grfn/system/home/common/solarized.nix b/users/aspen/system/home/common/solarized.nix similarity index 100% rename from users/grfn/system/home/common/solarized.nix rename to users/aspen/system/home/common/solarized.nix diff --git a/users/grfn/system/home/default.nix b/users/aspen/system/home/default.nix similarity index 100% rename from users/grfn/system/home/default.nix rename to users/aspen/system/home/default.nix diff --git a/users/grfn/system/home/home.nix b/users/aspen/system/home/home.nix similarity index 100% rename from users/grfn/system/home/home.nix rename to users/aspen/system/home/home.nix diff --git a/users/grfn/system/home/machines/dobharchu.nix b/users/aspen/system/home/machines/dobharchu.nix similarity index 100% rename from users/grfn/system/home/machines/dobharchu.nix rename to users/aspen/system/home/machines/dobharchu.nix diff --git a/users/grfn/system/home/machines/ogopogo.nix b/users/aspen/system/home/machines/ogopogo.nix similarity index 100% rename from users/grfn/system/home/machines/ogopogo.nix rename to users/aspen/system/home/machines/ogopogo.nix diff --git a/users/grfn/system/home/machines/roswell.nix b/users/aspen/system/home/machines/roswell.nix similarity index 100% rename from users/grfn/system/home/machines/roswell.nix rename to users/aspen/system/home/machines/roswell.nix diff --git a/users/grfn/system/home/machines/yeren.nix b/users/aspen/system/home/machines/yeren.nix similarity index 100% rename from users/grfn/system/home/machines/yeren.nix rename to users/aspen/system/home/machines/yeren.nix diff --git a/users/grfn/system/home/modules/.gitignore b/users/aspen/system/home/modules/.gitignore similarity index 100% rename from users/grfn/system/home/modules/.gitignore rename to users/aspen/system/home/modules/.gitignore diff --git a/users/grfn/system/home/modules/alacritty.nix b/users/aspen/system/home/modules/alacritty.nix similarity index 100% rename from users/grfn/system/home/modules/alacritty.nix rename to users/aspen/system/home/modules/alacritty.nix diff --git a/users/grfn/system/home/modules/alsi.nix b/users/aspen/system/home/modules/alsi.nix similarity index 100% rename from users/grfn/system/home/modules/alsi.nix rename to users/aspen/system/home/modules/alsi.nix diff --git a/users/grfn/system/home/modules/common.nix b/users/aspen/system/home/modules/common.nix similarity index 87% rename from users/grfn/system/home/modules/common.nix rename to users/aspen/system/home/modules/common.nix index 17d58a36c..b932d2ace 100644 --- a/users/grfn/system/home/modules/common.nix +++ b/users/aspen/system/home/modules/common.nix @@ -50,8 +50,8 @@ (writeShellScriptBin "rebuild-mugwump" '' set -eo pipefail cd ~/code/depot - nix build -f . users.grfn.system.system.mugwumpSystem -o /tmp/mugwump - nix copy -f . users.grfn.system.system.mugwumpSystem \ + nix build -f . users.aspen.system.system.mugwumpSystem -o /tmp/mugwump + nix copy -f . users.aspen.system.system.mugwumpSystem \ --to ssh://mugwump system=$(readlink -ef /tmp/mugwump) ssh mugwump sudo nix-env -p /nix/var/nix/profiles/system --set $system @@ -61,8 +61,8 @@ (writeShellScriptBin "rebuild-roswell" '' set -eo pipefail cd ~/code/depot - nix build -f . users.grfn.system.system.roswellSystem -o /tmp/roswell - nix copy -f . users.grfn.system.system.roswellSystem \ + nix build -f . users.aspen.system.system.roswellSystem -o /tmp/roswell + nix copy -f . users.aspen.system.system.roswellSystem \ --to ssh://roswell system=$(readlink -ef /tmp/roswell) ssh roswell sudo nix-env -p /nix/var/nix/profiles/system --set $system @@ -72,7 +72,7 @@ (writeShellScriptBin "rebuild-home" '' set -eo pipefail cd ~/code/depot - nix build -f . users.grfn.system.home.$(hostname)Home -o /tmp/home + nix build -f . users.aspen.system.home.$(hostname)Home -o /tmp/home /tmp/home/activate '') ]; diff --git a/users/grfn/system/home/modules/desktop.nix b/users/aspen/system/home/modules/desktop.nix similarity index 100% rename from users/grfn/system/home/modules/desktop.nix rename to users/aspen/system/home/modules/desktop.nix diff --git a/users/grfn/system/home/modules/development.nix b/users/aspen/system/home/modules/development.nix similarity index 100% rename from users/grfn/system/home/modules/development.nix rename to users/aspen/system/home/modules/development.nix diff --git a/users/grfn/system/home/modules/development/agda.nix b/users/aspen/system/home/modules/development/agda.nix similarity index 100% rename from users/grfn/system/home/modules/development/agda.nix rename to users/aspen/system/home/modules/development/agda.nix diff --git a/users/grfn/system/home/modules/development/kube.nix b/users/aspen/system/home/modules/development/kube.nix similarity index 100% rename from users/grfn/system/home/modules/development/kube.nix rename to users/aspen/system/home/modules/development/kube.nix diff --git a/users/grfn/system/home/modules/development/ocaml.nix b/users/aspen/system/home/modules/development/ocaml.nix similarity index 100% rename from users/grfn/system/home/modules/development/ocaml.nix rename to users/aspen/system/home/modules/development/ocaml.nix diff --git a/users/grfn/system/home/modules/development/readyset.nix b/users/aspen/system/home/modules/development/readyset.nix similarity index 100% rename from users/grfn/system/home/modules/development/readyset.nix rename to users/aspen/system/home/modules/development/readyset.nix diff --git a/users/grfn/system/home/modules/development/rust.nix b/users/aspen/system/home/modules/development/rust.nix similarity index 90% rename from users/grfn/system/home/modules/development/rust.nix rename to users/aspen/system/home/modules/development/rust.nix index 105a23bc8..c4b20f231 100644 --- a/users/grfn/system/home/modules/development/rust.nix +++ b/users/aspen/system/home/modules/development/rust.nix @@ -17,8 +17,8 @@ with lib; sccache evcxr - depot.users.grfn.pkgs.cargo-hakari - depot.users.grfn.pkgs.cargo-nextest + depot.users.aspen.pkgs.cargo-hakari + depot.users.aspen.pkgs.cargo-nextest # benchmarking+profiling cargo-criterion diff --git a/users/grfn/system/home/modules/emacs.nix b/users/aspen/system/home/modules/emacs.nix similarity index 100% rename from users/grfn/system/home/modules/emacs.nix rename to users/aspen/system/home/modules/emacs.nix diff --git a/users/grfn/system/home/modules/email.nix b/users/aspen/system/home/modules/email.nix similarity index 97% rename from users/grfn/system/home/modules/email.nix rename to users/aspen/system/home/modules/email.nix index b45232407..231d048a6 100644 --- a/users/grfn/system/home/modules/email.nix +++ b/users/aspen/system/home/modules/email.nix @@ -41,7 +41,7 @@ in home.packages = with pkgs; [ mu msmtp - config.lib.depot.users.grfn.pkgs.notmuch-extract-patch + config.lib.depot.users.aspen.pkgs.notmuch-extract-patch ]; systemd.user.services = mapAttrs' diff --git a/users/grfn/system/home/modules/firefox.nix b/users/aspen/system/home/modules/firefox.nix similarity index 100% rename from users/grfn/system/home/modules/firefox.nix rename to users/aspen/system/home/modules/firefox.nix diff --git a/users/grfn/system/home/modules/games.nix b/users/aspen/system/home/modules/games.nix similarity index 100% rename from users/grfn/system/home/modules/games.nix rename to users/aspen/system/home/modules/games.nix diff --git a/users/grfn/system/home/modules/i3.nix b/users/aspen/system/home/modules/i3.nix similarity index 100% rename from users/grfn/system/home/modules/i3.nix rename to users/aspen/system/home/modules/i3.nix diff --git a/users/grfn/system/home/modules/lib/cloneRepo.nix b/users/aspen/system/home/modules/lib/cloneRepo.nix similarity index 100% rename from users/grfn/system/home/modules/lib/cloneRepo.nix rename to users/aspen/system/home/modules/lib/cloneRepo.nix diff --git a/users/grfn/system/home/modules/lib/zshFunctions.nix b/users/aspen/system/home/modules/lib/zshFunctions.nix similarity index 100% rename from users/grfn/system/home/modules/lib/zshFunctions.nix rename to users/aspen/system/home/modules/lib/zshFunctions.nix diff --git a/users/grfn/system/home/modules/nixos-logo.txt b/users/aspen/system/home/modules/nixos-logo.txt similarity index 100% rename from users/grfn/system/home/modules/nixos-logo.txt rename to users/aspen/system/home/modules/nixos-logo.txt diff --git a/users/grfn/system/home/modules/obs.nix b/users/aspen/system/home/modules/obs.nix similarity index 100% rename from users/grfn/system/home/modules/obs.nix rename to users/aspen/system/home/modules/obs.nix diff --git a/users/grfn/system/home/modules/ptt.nix b/users/aspen/system/home/modules/ptt.nix similarity index 100% rename from users/grfn/system/home/modules/ptt.nix rename to users/aspen/system/home/modules/ptt.nix diff --git a/users/grfn/system/home/modules/pure.zsh-theme b/users/aspen/system/home/modules/pure.zsh-theme similarity index 100% rename from users/grfn/system/home/modules/pure.zsh-theme rename to users/aspen/system/home/modules/pure.zsh-theme diff --git a/users/grfn/system/home/modules/rtlsdr.nix b/users/aspen/system/home/modules/rtlsdr.nix similarity index 100% rename from users/grfn/system/home/modules/rtlsdr.nix rename to users/aspen/system/home/modules/rtlsdr.nix diff --git a/users/grfn/system/home/modules/shell.nix b/users/aspen/system/home/modules/shell.nix similarity index 100% rename from users/grfn/system/home/modules/shell.nix rename to users/aspen/system/home/modules/shell.nix diff --git a/users/grfn/system/home/modules/tarsnap.nix b/users/aspen/system/home/modules/tarsnap.nix similarity index 100% rename from users/grfn/system/home/modules/tarsnap.nix rename to users/aspen/system/home/modules/tarsnap.nix diff --git a/users/grfn/system/home/modules/tmux.nix b/users/aspen/system/home/modules/tmux.nix similarity index 100% rename from users/grfn/system/home/modules/tmux.nix rename to users/aspen/system/home/modules/tmux.nix diff --git a/users/grfn/system/home/modules/twitter.nix b/users/aspen/system/home/modules/twitter.nix similarity index 100% rename from users/grfn/system/home/modules/twitter.nix rename to users/aspen/system/home/modules/twitter.nix diff --git a/users/grfn/system/home/modules/vim.nix b/users/aspen/system/home/modules/vim.nix similarity index 100% rename from users/grfn/system/home/modules/vim.nix rename to users/aspen/system/home/modules/vim.nix diff --git a/users/grfn/system/home/modules/vimrc b/users/aspen/system/home/modules/vimrc similarity index 100% rename from users/grfn/system/home/modules/vimrc rename to users/aspen/system/home/modules/vimrc diff --git a/users/grfn/system/home/modules/zshrc b/users/aspen/system/home/modules/zshrc similarity index 100% rename from users/grfn/system/home/modules/zshrc rename to users/aspen/system/home/modules/zshrc diff --git a/users/grfn/system/home/platforms/darwin.nix b/users/aspen/system/home/platforms/darwin.nix similarity index 100% rename from users/grfn/system/home/platforms/darwin.nix rename to users/aspen/system/home/platforms/darwin.nix diff --git a/users/grfn/system/home/platforms/linux.nix b/users/aspen/system/home/platforms/linux.nix similarity index 100% rename from users/grfn/system/home/platforms/linux.nix rename to users/aspen/system/home/platforms/linux.nix diff --git a/users/grfn/system/install b/users/aspen/system/install similarity index 100% rename from users/grfn/system/install rename to users/aspen/system/install diff --git a/users/grfn/system/system/.skip-subtree b/users/aspen/system/system/.skip-subtree similarity index 100% rename from users/grfn/system/system/.skip-subtree rename to users/aspen/system/system/.skip-subtree diff --git a/users/grfn/system/system/configuration.nix b/users/aspen/system/system/configuration.nix similarity index 100% rename from users/grfn/system/system/configuration.nix rename to users/aspen/system/system/configuration.nix diff --git a/users/grfn/system/system/default.nix b/users/aspen/system/system/default.nix similarity index 100% rename from users/grfn/system/system/default.nix rename to users/aspen/system/system/default.nix diff --git a/users/grfn/system/system/iso.nix b/users/aspen/system/system/iso.nix similarity index 100% rename from users/grfn/system/system/iso.nix rename to users/aspen/system/system/iso.nix diff --git a/users/grfn/system/system/machines/bumblebee.nix b/users/aspen/system/system/machines/bumblebee.nix similarity index 100% rename from users/grfn/system/system/machines/bumblebee.nix rename to users/aspen/system/system/machines/bumblebee.nix diff --git a/users/grfn/system/system/machines/mugwump.nix b/users/aspen/system/system/machines/mugwump.nix similarity index 97% rename from users/grfn/system/system/machines/mugwump.nix rename to users/aspen/system/system/machines/mugwump.nix index 3d4de5df1..446f7cd92 100644 --- a/users/grfn/system/system/machines/mugwump.nix +++ b/users/aspen/system/system/machines/mugwump.nix @@ -7,7 +7,7 @@ with lib; ../modules/common.nix (modulesPath + "/installer/scan/not-detected.nix") (depot.path.origSrc + "/ops/modules/prometheus-fail2ban-exporter.nix") - (depot.path.origSrc + "/users/grfn/xanthous/server/module.nix") + (depot.path.origSrc + "/users/aspen/xanthous/server/module.nix") (depot.third_party.agenix.src + "/modules/age.nix") depot.third_party.ddclient.module ]; @@ -74,12 +74,12 @@ with lib; nix.gc.dates = "monthly"; users.users.grfn.openssh.authorizedKeys.keys = [ - depot.users.grfn.keys.whitby + depot.users.aspen.keys.whitby ]; age.secrets = let - secret = name: depot.users.grfn.secrets."${name}.age"; + secret = name: depot.users.aspen.secrets."${name}.age"; in { cloudflare.file = secret "cloudflare"; diff --git a/users/grfn/system/system/machines/ogopogo.nix b/users/aspen/system/system/machines/ogopogo.nix similarity index 98% rename from users/grfn/system/system/machines/ogopogo.nix rename to users/aspen/system/system/machines/ogopogo.nix index af7075a97..d64d5931e 100644 --- a/users/grfn/system/system/machines/ogopogo.nix +++ b/users/aspen/system/system/machines/ogopogo.nix @@ -122,7 +122,7 @@ age.secrets = let - secret = name: depot.users.grfn.secrets."${name}.age"; + secret = name: depot.users.aspen.secrets."${name}.age"; in { buildkite-ssh-key = { diff --git a/users/grfn/system/system/machines/roswell.nix b/users/aspen/system/system/machines/roswell.nix similarity index 95% rename from users/grfn/system/system/machines/roswell.nix rename to users/aspen/system/system/machines/roswell.nix index 8287c9542..e7529542a 100644 --- a/users/grfn/system/system/machines/roswell.nix +++ b/users/aspen/system/system/machines/roswell.nix @@ -13,7 +13,7 @@ networking.hostName = "roswell"; users.users.grfn.openssh.authorizedKeys.keys = [ - depot.users.grfn.keys.main + depot.users.aspen.keys.main ]; boot.loader.systemd-boot.enable = lib.mkForce false; diff --git a/users/grfn/system/system/machines/yeren.nix b/users/aspen/system/system/machines/yeren.nix similarity index 100% rename from users/grfn/system/system/machines/yeren.nix rename to users/aspen/system/system/machines/yeren.nix diff --git a/users/grfn/system/system/modules/common.nix b/users/aspen/system/system/modules/common.nix similarity index 100% rename from users/grfn/system/system/modules/common.nix rename to users/aspen/system/system/modules/common.nix diff --git a/users/grfn/system/system/modules/desktop.nix b/users/aspen/system/system/modules/desktop.nix similarity index 100% rename from users/grfn/system/system/modules/desktop.nix rename to users/aspen/system/system/modules/desktop.nix diff --git a/users/grfn/system/system/modules/development.nix b/users/aspen/system/system/modules/development.nix similarity index 100% rename from users/grfn/system/system/modules/development.nix rename to users/aspen/system/system/modules/development.nix diff --git a/users/grfn/system/system/modules/fcitx.nix b/users/aspen/system/system/modules/fcitx.nix similarity index 100% rename from users/grfn/system/system/modules/fcitx.nix rename to users/aspen/system/system/modules/fcitx.nix diff --git a/users/grfn/system/system/modules/fonts.nix b/users/aspen/system/system/modules/fonts.nix similarity index 100% rename from users/grfn/system/system/modules/fonts.nix rename to users/aspen/system/system/modules/fonts.nix diff --git a/users/grfn/system/system/modules/laptop.nix b/users/aspen/system/system/modules/laptop.nix similarity index 100% rename from users/grfn/system/system/modules/laptop.nix rename to users/aspen/system/system/modules/laptop.nix diff --git a/users/grfn/system/system/modules/reusable/README.org b/users/aspen/system/system/modules/reusable/README.org similarity index 100% rename from users/grfn/system/system/modules/reusable/README.org rename to users/aspen/system/system/modules/reusable/README.org diff --git a/users/grfn/system/system/modules/reusable/battery.nix b/users/aspen/system/system/modules/reusable/battery.nix similarity index 100% rename from users/grfn/system/system/modules/reusable/battery.nix rename to users/aspen/system/system/modules/reusable/battery.nix diff --git a/users/grfn/system/system/modules/rtlsdr.nix b/users/aspen/system/system/modules/rtlsdr.nix similarity index 100% rename from users/grfn/system/system/modules/rtlsdr.nix rename to users/aspen/system/system/modules/rtlsdr.nix diff --git a/users/grfn/system/system/modules/sound.nix b/users/aspen/system/system/modules/sound.nix similarity index 100% rename from users/grfn/system/system/modules/sound.nix rename to users/aspen/system/system/modules/sound.nix diff --git a/users/grfn/system/system/modules/tvl.nix b/users/aspen/system/system/modules/tvl.nix similarity index 100% rename from users/grfn/system/system/modules/tvl.nix rename to users/aspen/system/system/modules/tvl.nix diff --git a/users/grfn/system/system/modules/wireshark.nix b/users/aspen/system/system/modules/wireshark.nix similarity index 100% rename from users/grfn/system/system/modules/wireshark.nix rename to users/aspen/system/system/modules/wireshark.nix diff --git a/users/grfn/system/system/modules/xserver.nix b/users/aspen/system/system/modules/xserver.nix similarity index 100% rename from users/grfn/system/system/modules/xserver.nix rename to users/aspen/system/system/modules/xserver.nix diff --git a/users/grfn/terraform/globals.nix b/users/aspen/terraform/globals.nix similarity index 100% rename from users/grfn/terraform/globals.nix rename to users/aspen/terraform/globals.nix diff --git a/users/grfn/terraform/nixosMachine.nix b/users/aspen/terraform/nixosMachine.nix similarity index 100% rename from users/grfn/terraform/nixosMachine.nix rename to users/aspen/terraform/nixosMachine.nix diff --git a/users/grfn/terraform/workspace.nix b/users/aspen/terraform/workspace.nix similarity index 97% rename from users/grfn/terraform/workspace.nix rename to users/aspen/terraform/workspace.nix index 114105642..f1563d2a8 100644 --- a/users/grfn/terraform/workspace.nix +++ b/users/aspen/terraform/workspace.nix @@ -34,7 +34,7 @@ let module_tf' = module_tf // { - inherit (depot.users.grfn.terraform) globals; + inherit (depot.users.aspen.terraform) globals; plugins = plugins_tf; }; diff --git a/users/grfn/web/.envrc b/users/aspen/web/.envrc similarity index 100% rename from users/grfn/web/.envrc rename to users/aspen/web/.envrc diff --git a/users/grfn/web/.gitignore b/users/aspen/web/.gitignore similarity index 100% rename from users/grfn/web/.gitignore rename to users/aspen/web/.gitignore diff --git a/users/grfn/web/Makefile b/users/aspen/web/Makefile similarity index 84% rename from users/grfn/web/Makefile rename to users/aspen/web/Makefile index 024868538..cf3da73c9 100644 --- a/users/grfn/web/Makefile +++ b/users/aspen/web/Makefile @@ -3,10 +3,10 @@ deploy: do_deploy purge_cf purge_cf: - @$(shell nix-build `git rev-parse --show-toplevel` -A 'users.grfn.web.purge-cf')/bin/purge-cf.sh + @$(shell nix-build `git rev-parse --show-toplevel` -A 'users.aspen.web.purge-cf')/bin/purge-cf.sh do_deploy: - @$(shell nix-build `git rev-parse --show-toplevel` -A 'users.grfn.web')/bin/deploy.sh + @$(shell nix-build `git rev-parse --show-toplevel` -A 'users.aspen.web')/bin/deploy.sh renew: diff --git a/users/grfn/web/config.el b/users/aspen/web/config.el similarity index 100% rename from users/grfn/web/config.el rename to users/aspen/web/config.el diff --git a/users/grfn/web/default.nix b/users/aspen/web/default.nix similarity index 96% rename from users/grfn/web/default.nix rename to users/aspen/web/default.nix index b59548fcd..a16cd16c0 100644 --- a/users/grfn/web/default.nix +++ b/users/aspen/web/default.nix @@ -15,7 +15,7 @@ let keys = runCommand "ssh-keys" { } '' touch $out - echo "${depot.users.grfn.keys.main}" >> $out + echo "${depot.users.aspen.keys.main}" >> $out ''; website = diff --git a/users/grfn/web/index.org b/users/aspen/web/index.org similarity index 83% rename from users/grfn/web/index.org rename to users/aspen/web/index.org index 784d4c46b..14d214df1 100644 --- a/users/grfn/web/index.org +++ b/users/aspen/web/index.org @@ -7,7 +7,7 @@ my name is aspen smith and i'm a software engineer and musician. * code - [[https://github.com/glittershark/][github]] -- [[https://cs.tvl.fyi/depot/-/tree/users/grfn][my directory in the tvl monorepo]] +- [[https://cs.tvl.fyi/depot/-/tree/users/aspen][my directory in the tvl monorepo]] * work @@ -25,9 +25,9 @@ that's wire-compatible with postgresql and mysql, based on [[https://github.com/ * projects - [[https://windtunnel.ci/][windtunnel]], a continuous benchmarking software-as-a-service currently accepting early alpha users (send me an email if you want to try it out!) -- [[https://cs.tvl.fyi/depot/-/tree/users/grfn/achilles][achilles]], a compiler for (what I plan to become) a dependently typed, low-level functional programming language targeting LLVM +- [[https://cs.tvl.fyi/depot/-/tree/users/aspen/achilles][achilles]], a compiler for (what I plan to become) a dependently typed, low-level functional programming language targeting LLVM - [[https://github.com/glittershark/org-clubhouse][org-clubhouse]], an emacs package for lightweight integration between [[https://orgmode.org/][org-mode]] and [[https://clubhouse.io/][the clubhouse project management tool]] -- [[https://cs.tvl.fyi/depot/-/tree/users/grfn/xanthous][xanthous]], a terminal roguelike in haskell that I work on intermittently and exclusively for fun +- [[https://cs.tvl.fyi/depot/-/tree/users/aspen/xanthous][xanthous]], a terminal roguelike in haskell that I work on intermittently and exclusively for fun * music diff --git a/users/grfn/web/main.css b/users/aspen/web/main.css similarity index 100% rename from users/grfn/web/main.css rename to users/aspen/web/main.css diff --git a/users/grfn/web/orgExportHTML.nix b/users/aspen/web/orgExportHTML.nix similarity index 100% rename from users/grfn/web/orgExportHTML.nix rename to users/aspen/web/orgExportHTML.nix diff --git a/users/grfn/web/pubkey.gpg b/users/aspen/web/pubkey.gpg similarity index 100% rename from users/grfn/web/pubkey.gpg rename to users/aspen/web/pubkey.gpg diff --git a/users/grfn/web/recipes/tomato-sauce.org b/users/aspen/web/recipes/tomato-sauce.org similarity index 100% rename from users/grfn/web/recipes/tomato-sauce.org rename to users/aspen/web/recipes/tomato-sauce.org diff --git a/users/grfn/web/shell.nix b/users/aspen/web/shell.nix similarity index 100% rename from users/grfn/web/shell.nix rename to users/aspen/web/shell.nix diff --git a/users/grfn/web/site.nix b/users/aspen/web/site.nix similarity index 100% rename from users/grfn/web/site.nix rename to users/aspen/web/site.nix diff --git a/users/grfn/wigglydonke.rs/.well-known/cf-2fa-verify.txt b/users/aspen/wigglydonke.rs/.well-known/cf-2fa-verify.txt similarity index 100% rename from users/grfn/wigglydonke.rs/.well-known/cf-2fa-verify.txt rename to users/aspen/wigglydonke.rs/.well-known/cf-2fa-verify.txt diff --git a/users/grfn/wigglydonke.rs/index.html b/users/aspen/wigglydonke.rs/index.html similarity index 100% rename from users/grfn/wigglydonke.rs/index.html rename to users/aspen/wigglydonke.rs/index.html diff --git a/users/grfn/wigglydonke.rs/wd.png b/users/aspen/wigglydonke.rs/wd.png similarity index 100% rename from users/grfn/wigglydonke.rs/wd.png rename to users/aspen/wigglydonke.rs/wd.png diff --git a/users/grfn/xanthous/.envrc b/users/aspen/xanthous/.envrc similarity index 100% rename from users/grfn/xanthous/.envrc rename to users/aspen/xanthous/.envrc diff --git a/users/grfn/xanthous/.github/actions/nix-build/Dockerfile b/users/aspen/xanthous/.github/actions/nix-build/Dockerfile similarity index 100% rename from users/grfn/xanthous/.github/actions/nix-build/Dockerfile rename to users/aspen/xanthous/.github/actions/nix-build/Dockerfile diff --git a/users/grfn/xanthous/.github/actions/nix-build/entrypoint.sh b/users/aspen/xanthous/.github/actions/nix-build/entrypoint.sh similarity index 100% rename from users/grfn/xanthous/.github/actions/nix-build/entrypoint.sh rename to users/aspen/xanthous/.github/actions/nix-build/entrypoint.sh diff --git a/users/grfn/xanthous/.github/workflows/haskell.yml b/users/aspen/xanthous/.github/workflows/haskell.yml similarity index 100% rename from users/grfn/xanthous/.github/workflows/haskell.yml rename to users/aspen/xanthous/.github/workflows/haskell.yml diff --git a/users/grfn/xanthous/.gitignore b/users/aspen/xanthous/.gitignore similarity index 100% rename from users/grfn/xanthous/.gitignore rename to users/aspen/xanthous/.gitignore diff --git a/users/grfn/xanthous/LICENSE b/users/aspen/xanthous/LICENSE similarity index 100% rename from users/grfn/xanthous/LICENSE rename to users/aspen/xanthous/LICENSE diff --git a/users/grfn/xanthous/README.org b/users/aspen/xanthous/README.org similarity index 100% rename from users/grfn/xanthous/README.org rename to users/aspen/xanthous/README.org diff --git a/users/grfn/xanthous/Setup.hs b/users/aspen/xanthous/Setup.hs similarity index 100% rename from users/grfn/xanthous/Setup.hs rename to users/aspen/xanthous/Setup.hs diff --git a/users/grfn/xanthous/app/Main.hs b/users/aspen/xanthous/app/Main.hs similarity index 100% rename from users/grfn/xanthous/app/Main.hs rename to users/aspen/xanthous/app/Main.hs diff --git a/users/grfn/xanthous/bench/Bench.hs b/users/aspen/xanthous/bench/Bench.hs similarity index 100% rename from users/grfn/xanthous/bench/Bench.hs rename to users/aspen/xanthous/bench/Bench.hs diff --git a/users/grfn/xanthous/bench/Bench/Prelude.hs b/users/aspen/xanthous/bench/Bench/Prelude.hs similarity index 100% rename from users/grfn/xanthous/bench/Bench/Prelude.hs rename to users/aspen/xanthous/bench/Bench/Prelude.hs diff --git a/users/grfn/xanthous/bench/Xanthous/Generators/UtilBench.hs b/users/aspen/xanthous/bench/Xanthous/Generators/UtilBench.hs similarity index 100% rename from users/grfn/xanthous/bench/Xanthous/Generators/UtilBench.hs rename to users/aspen/xanthous/bench/Xanthous/Generators/UtilBench.hs diff --git a/users/grfn/xanthous/bench/Xanthous/RandomBench.hs b/users/aspen/xanthous/bench/Xanthous/RandomBench.hs similarity index 100% rename from users/grfn/xanthous/bench/Xanthous/RandomBench.hs rename to users/aspen/xanthous/bench/Xanthous/RandomBench.hs diff --git a/users/grfn/xanthous/build/generic-arbitrary-export-garbitrary.patch b/users/aspen/xanthous/build/generic-arbitrary-export-garbitrary.patch similarity index 100% rename from users/grfn/xanthous/build/generic-arbitrary-export-garbitrary.patch rename to users/aspen/xanthous/build/generic-arbitrary-export-garbitrary.patch diff --git a/users/grfn/xanthous/build/hgeometry-fix-haddock.patch b/users/aspen/xanthous/build/hgeometry-fix-haddock.patch similarity index 100% rename from users/grfn/xanthous/build/hgeometry-fix-haddock.patch rename to users/aspen/xanthous/build/hgeometry-fix-haddock.patch diff --git a/users/grfn/xanthous/build/update-comonad-extras.patch b/users/aspen/xanthous/build/update-comonad-extras.patch similarity index 100% rename from users/grfn/xanthous/build/update-comonad-extras.patch rename to users/aspen/xanthous/build/update-comonad-extras.patch diff --git a/users/grfn/xanthous/default.nix b/users/aspen/xanthous/default.nix similarity index 100% rename from users/grfn/xanthous/default.nix rename to users/aspen/xanthous/default.nix diff --git a/users/grfn/xanthous/docs/raw-types.org b/users/aspen/xanthous/docs/raw-types.org similarity index 100% rename from users/grfn/xanthous/docs/raw-types.org rename to users/aspen/xanthous/docs/raw-types.org diff --git a/users/grfn/xanthous/hie.yaml b/users/aspen/xanthous/hie.yaml similarity index 100% rename from users/grfn/xanthous/hie.yaml rename to users/aspen/xanthous/hie.yaml diff --git a/users/grfn/xanthous/nixpkgs.nix b/users/aspen/xanthous/nixpkgs.nix similarity index 100% rename from users/grfn/xanthous/nixpkgs.nix rename to users/aspen/xanthous/nixpkgs.nix diff --git a/users/grfn/xanthous/package.yaml b/users/aspen/xanthous/package.yaml similarity index 100% rename from users/grfn/xanthous/package.yaml rename to users/aspen/xanthous/package.yaml diff --git a/users/grfn/xanthous/pkg.nix b/users/aspen/xanthous/pkg.nix similarity index 100% rename from users/grfn/xanthous/pkg.nix rename to users/aspen/xanthous/pkg.nix diff --git a/users/grfn/xanthous/server/.envrc b/users/aspen/xanthous/server/.envrc similarity index 100% rename from users/grfn/xanthous/server/.envrc rename to users/aspen/xanthous/server/.envrc diff --git a/users/grfn/xanthous/server/.gitignore b/users/aspen/xanthous/server/.gitignore similarity index 100% rename from users/grfn/xanthous/server/.gitignore rename to users/aspen/xanthous/server/.gitignore diff --git a/users/grfn/xanthous/server/Cargo.lock b/users/aspen/xanthous/server/Cargo.lock similarity index 100% rename from users/grfn/xanthous/server/Cargo.lock rename to users/aspen/xanthous/server/Cargo.lock diff --git a/users/grfn/xanthous/server/Cargo.toml b/users/aspen/xanthous/server/Cargo.toml similarity index 100% rename from users/grfn/xanthous/server/Cargo.toml rename to users/aspen/xanthous/server/Cargo.toml diff --git a/users/grfn/xanthous/server/default.nix b/users/aspen/xanthous/server/default.nix similarity index 100% rename from users/grfn/xanthous/server/default.nix rename to users/aspen/xanthous/server/default.nix diff --git a/users/grfn/xanthous/server/docker.nix b/users/aspen/xanthous/server/docker.nix similarity index 90% rename from users/grfn/xanthous/server/docker.nix rename to users/aspen/xanthous/server/docker.nix index 09054cb00..5eaef4553 100644 --- a/users/grfn/xanthous/server/docker.nix +++ b/users/aspen/xanthous/server/docker.nix @@ -4,7 +4,7 @@ }: let - inherit (depot.users.grfn) xanthous; + inherit (depot.users.aspen) xanthous; xanthous-server = xanthous.server; in pkgs.dockerTools.buildLayeredImage { diff --git a/users/grfn/xanthous/server/module.nix b/users/aspen/xanthous/server/module.nix similarity index 95% rename from users/grfn/xanthous/server/module.nix rename to users/aspen/xanthous/server/module.nix index 82de6e38e..6d1bdc687 100644 --- a/users/grfn/xanthous/server/module.nix +++ b/users/aspen/xanthous/server/module.nix @@ -22,7 +22,7 @@ in image = mkOption { type = types.package; - default = depot.users.grfn.xanthous.server.docker; + default = depot.users.aspen.xanthous.server.docker; description = "OCI image file to run"; }; diff --git a/users/grfn/xanthous/server/shell.nix b/users/aspen/xanthous/server/shell.nix similarity index 100% rename from users/grfn/xanthous/server/shell.nix rename to users/aspen/xanthous/server/shell.nix diff --git a/users/grfn/xanthous/server/src/main.rs b/users/aspen/xanthous/server/src/main.rs similarity index 100% rename from users/grfn/xanthous/server/src/main.rs rename to users/aspen/xanthous/server/src/main.rs diff --git a/users/grfn/xanthous/server/src/metrics.rs b/users/aspen/xanthous/server/src/metrics.rs similarity index 100% rename from users/grfn/xanthous/server/src/metrics.rs rename to users/aspen/xanthous/server/src/metrics.rs diff --git a/users/grfn/xanthous/server/src/pty.rs b/users/aspen/xanthous/server/src/pty.rs similarity index 100% rename from users/grfn/xanthous/server/src/pty.rs rename to users/aspen/xanthous/server/src/pty.rs diff --git a/users/grfn/xanthous/shell.nix b/users/aspen/xanthous/shell.nix similarity index 100% rename from users/grfn/xanthous/shell.nix rename to users/aspen/xanthous/shell.nix diff --git a/users/grfn/xanthous/src/Data/Aeson/Generic/DerivingVia.hs b/users/aspen/xanthous/src/Data/Aeson/Generic/DerivingVia.hs similarity index 100% rename from users/grfn/xanthous/src/Data/Aeson/Generic/DerivingVia.hs rename to users/aspen/xanthous/src/Data/Aeson/Generic/DerivingVia.hs diff --git a/users/grfn/xanthous/src/Xanthous/AI/Gormlak.hs b/users/aspen/xanthous/src/Xanthous/AI/Gormlak.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/AI/Gormlak.hs rename to users/aspen/xanthous/src/Xanthous/AI/Gormlak.hs diff --git a/users/grfn/xanthous/src/Xanthous/App.hs b/users/aspen/xanthous/src/Xanthous/App.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/App.hs rename to users/aspen/xanthous/src/Xanthous/App.hs diff --git a/users/grfn/xanthous/src/Xanthous/App/Autocommands.hs b/users/aspen/xanthous/src/Xanthous/App/Autocommands.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/App/Autocommands.hs rename to users/aspen/xanthous/src/Xanthous/App/Autocommands.hs diff --git a/users/grfn/xanthous/src/Xanthous/App/Common.hs b/users/aspen/xanthous/src/Xanthous/App/Common.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/App/Common.hs rename to users/aspen/xanthous/src/Xanthous/App/Common.hs diff --git a/users/grfn/xanthous/src/Xanthous/App/Prompt.hs b/users/aspen/xanthous/src/Xanthous/App/Prompt.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/App/Prompt.hs rename to users/aspen/xanthous/src/Xanthous/App/Prompt.hs diff --git a/users/grfn/xanthous/src/Xanthous/App/Time.hs b/users/aspen/xanthous/src/Xanthous/App/Time.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/App/Time.hs rename to users/aspen/xanthous/src/Xanthous/App/Time.hs diff --git a/users/grfn/xanthous/src/Xanthous/Command.hs b/users/aspen/xanthous/src/Xanthous/Command.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Command.hs rename to users/aspen/xanthous/src/Xanthous/Command.hs diff --git a/users/grfn/xanthous/src/Xanthous/Data.hs b/users/aspen/xanthous/src/Xanthous/Data.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Data.hs rename to users/aspen/xanthous/src/Xanthous/Data.hs diff --git a/users/grfn/xanthous/src/Xanthous/Data/App.hs b/users/aspen/xanthous/src/Xanthous/Data/App.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Data/App.hs rename to users/aspen/xanthous/src/Xanthous/Data/App.hs diff --git a/users/grfn/xanthous/src/Xanthous/Data/Entities.hs b/users/aspen/xanthous/src/Xanthous/Data/Entities.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Data/Entities.hs rename to users/aspen/xanthous/src/Xanthous/Data/Entities.hs diff --git a/users/grfn/xanthous/src/Xanthous/Data/EntityChar.hs b/users/aspen/xanthous/src/Xanthous/Data/EntityChar.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Data/EntityChar.hs rename to users/aspen/xanthous/src/Xanthous/Data/EntityChar.hs diff --git a/users/grfn/xanthous/src/Xanthous/Data/EntityMap.hs b/users/aspen/xanthous/src/Xanthous/Data/EntityMap.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Data/EntityMap.hs rename to users/aspen/xanthous/src/Xanthous/Data/EntityMap.hs diff --git a/users/grfn/xanthous/src/Xanthous/Data/EntityMap/Graphics.hs b/users/aspen/xanthous/src/Xanthous/Data/EntityMap/Graphics.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Data/EntityMap/Graphics.hs rename to users/aspen/xanthous/src/Xanthous/Data/EntityMap/Graphics.hs diff --git a/users/grfn/xanthous/src/Xanthous/Data/Levels.hs b/users/aspen/xanthous/src/Xanthous/Data/Levels.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Data/Levels.hs rename to users/aspen/xanthous/src/Xanthous/Data/Levels.hs diff --git a/users/grfn/xanthous/src/Xanthous/Data/Memo.hs b/users/aspen/xanthous/src/Xanthous/Data/Memo.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Data/Memo.hs rename to users/aspen/xanthous/src/Xanthous/Data/Memo.hs diff --git a/users/grfn/xanthous/src/Xanthous/Data/NestedMap.hs b/users/aspen/xanthous/src/Xanthous/Data/NestedMap.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Data/NestedMap.hs rename to users/aspen/xanthous/src/Xanthous/Data/NestedMap.hs diff --git a/users/grfn/xanthous/src/Xanthous/Data/VectorBag.hs b/users/aspen/xanthous/src/Xanthous/Data/VectorBag.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Data/VectorBag.hs rename to users/aspen/xanthous/src/Xanthous/Data/VectorBag.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Character.hs b/users/aspen/xanthous/src/Xanthous/Entities/Character.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Character.hs rename to users/aspen/xanthous/src/Xanthous/Entities/Character.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Common.hs b/users/aspen/xanthous/src/Xanthous/Entities/Common.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Common.hs rename to users/aspen/xanthous/src/Xanthous/Entities/Common.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Creature.hs b/users/aspen/xanthous/src/Xanthous/Entities/Creature.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Creature.hs rename to users/aspen/xanthous/src/Xanthous/Entities/Creature.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs b/users/aspen/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs rename to users/aspen/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Draw/Util.hs b/users/aspen/xanthous/src/Xanthous/Entities/Draw/Util.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Draw/Util.hs rename to users/aspen/xanthous/src/Xanthous/Entities/Draw/Util.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Entities.hs b/users/aspen/xanthous/src/Xanthous/Entities/Entities.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Entities.hs rename to users/aspen/xanthous/src/Xanthous/Entities/Entities.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Entities.hs-boot b/users/aspen/xanthous/src/Xanthous/Entities/Entities.hs-boot similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Entities.hs-boot rename to users/aspen/xanthous/src/Xanthous/Entities/Entities.hs-boot diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Environment.hs b/users/aspen/xanthous/src/Xanthous/Entities/Environment.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Environment.hs rename to users/aspen/xanthous/src/Xanthous/Entities/Environment.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Item.hs b/users/aspen/xanthous/src/Xanthous/Entities/Item.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Item.hs rename to users/aspen/xanthous/src/Xanthous/Entities/Item.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Marker.hs b/users/aspen/xanthous/src/Xanthous/Entities/Marker.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Marker.hs rename to users/aspen/xanthous/src/Xanthous/Entities/Marker.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/RawTypes.hs b/users/aspen/xanthous/src/Xanthous/Entities/RawTypes.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/RawTypes.hs rename to users/aspen/xanthous/src/Xanthous/Entities/RawTypes.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Raws.hs b/users/aspen/xanthous/src/Xanthous/Entities/Raws.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Raws.hs rename to users/aspen/xanthous/src/Xanthous/Entities/Raws.hs diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Raws/broken-dagger.yaml b/users/aspen/xanthous/src/Xanthous/Entities/Raws/broken-dagger.yaml similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Raws/broken-dagger.yaml rename to users/aspen/xanthous/src/Xanthous/Entities/Raws/broken-dagger.yaml diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Raws/gormlak.yaml b/users/aspen/xanthous/src/Xanthous/Entities/Raws/gormlak.yaml similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Raws/gormlak.yaml rename to users/aspen/xanthous/src/Xanthous/Entities/Raws/gormlak.yaml diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Raws/husk.yaml b/users/aspen/xanthous/src/Xanthous/Entities/Raws/husk.yaml similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Raws/husk.yaml rename to users/aspen/xanthous/src/Xanthous/Entities/Raws/husk.yaml diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Raws/noodles.yaml b/users/aspen/xanthous/src/Xanthous/Entities/Raws/noodles.yaml similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Raws/noodles.yaml rename to users/aspen/xanthous/src/Xanthous/Entities/Raws/noodles.yaml diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Raws/ooze.yaml b/users/aspen/xanthous/src/Xanthous/Entities/Raws/ooze.yaml similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Raws/ooze.yaml rename to users/aspen/xanthous/src/Xanthous/Entities/Raws/ooze.yaml diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Raws/rock.yaml b/users/aspen/xanthous/src/Xanthous/Entities/Raws/rock.yaml similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Raws/rock.yaml rename to users/aspen/xanthous/src/Xanthous/Entities/Raws/rock.yaml diff --git a/users/grfn/xanthous/src/Xanthous/Entities/Raws/stick.yaml b/users/aspen/xanthous/src/Xanthous/Entities/Raws/stick.yaml similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Entities/Raws/stick.yaml rename to users/aspen/xanthous/src/Xanthous/Entities/Raws/stick.yaml diff --git a/users/grfn/xanthous/src/Xanthous/Game.hs b/users/aspen/xanthous/src/Xanthous/Game.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Game.hs rename to users/aspen/xanthous/src/Xanthous/Game.hs diff --git a/users/grfn/xanthous/src/Xanthous/Game/Arbitrary.hs b/users/aspen/xanthous/src/Xanthous/Game/Arbitrary.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Game/Arbitrary.hs rename to users/aspen/xanthous/src/Xanthous/Game/Arbitrary.hs diff --git a/users/grfn/xanthous/src/Xanthous/Game/Draw.hs b/users/aspen/xanthous/src/Xanthous/Game/Draw.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Game/Draw.hs rename to users/aspen/xanthous/src/Xanthous/Game/Draw.hs diff --git a/users/grfn/xanthous/src/Xanthous/Game/Env.hs b/users/aspen/xanthous/src/Xanthous/Game/Env.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Game/Env.hs rename to users/aspen/xanthous/src/Xanthous/Game/Env.hs diff --git a/users/grfn/xanthous/src/Xanthous/Game/Lenses.hs b/users/aspen/xanthous/src/Xanthous/Game/Lenses.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Game/Lenses.hs rename to users/aspen/xanthous/src/Xanthous/Game/Lenses.hs diff --git a/users/grfn/xanthous/src/Xanthous/Game/Memo.hs b/users/aspen/xanthous/src/Xanthous/Game/Memo.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Game/Memo.hs rename to users/aspen/xanthous/src/Xanthous/Game/Memo.hs diff --git a/users/grfn/xanthous/src/Xanthous/Game/Prompt.hs b/users/aspen/xanthous/src/Xanthous/Game/Prompt.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Game/Prompt.hs rename to users/aspen/xanthous/src/Xanthous/Game/Prompt.hs diff --git a/users/grfn/xanthous/src/Xanthous/Game/State.hs b/users/aspen/xanthous/src/Xanthous/Game/State.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Game/State.hs rename to users/aspen/xanthous/src/Xanthous/Game/State.hs diff --git a/users/grfn/xanthous/src/Xanthous/Generators/Level.hs b/users/aspen/xanthous/src/Xanthous/Generators/Level.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Generators/Level.hs rename to users/aspen/xanthous/src/Xanthous/Generators/Level.hs diff --git a/users/grfn/xanthous/src/Xanthous/Generators/Level/CaveAutomata.hs b/users/aspen/xanthous/src/Xanthous/Generators/Level/CaveAutomata.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Generators/Level/CaveAutomata.hs rename to users/aspen/xanthous/src/Xanthous/Generators/Level/CaveAutomata.hs diff --git a/users/grfn/xanthous/src/Xanthous/Generators/Level/Dungeon.hs b/users/aspen/xanthous/src/Xanthous/Generators/Level/Dungeon.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Generators/Level/Dungeon.hs rename to users/aspen/xanthous/src/Xanthous/Generators/Level/Dungeon.hs diff --git a/users/grfn/xanthous/src/Xanthous/Generators/Level/LevelContents.hs b/users/aspen/xanthous/src/Xanthous/Generators/Level/LevelContents.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Generators/Level/LevelContents.hs rename to users/aspen/xanthous/src/Xanthous/Generators/Level/LevelContents.hs diff --git a/users/grfn/xanthous/src/Xanthous/Generators/Level/Util.hs b/users/aspen/xanthous/src/Xanthous/Generators/Level/Util.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Generators/Level/Util.hs rename to users/aspen/xanthous/src/Xanthous/Generators/Level/Util.hs diff --git a/users/grfn/xanthous/src/Xanthous/Generators/Level/Village.hs b/users/aspen/xanthous/src/Xanthous/Generators/Level/Village.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Generators/Level/Village.hs rename to users/aspen/xanthous/src/Xanthous/Generators/Level/Village.hs diff --git a/users/grfn/xanthous/src/Xanthous/Generators/Speech.hs b/users/aspen/xanthous/src/Xanthous/Generators/Speech.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Generators/Speech.hs rename to users/aspen/xanthous/src/Xanthous/Generators/Speech.hs diff --git a/users/grfn/xanthous/src/Xanthous/Messages.hs b/users/aspen/xanthous/src/Xanthous/Messages.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Messages.hs rename to users/aspen/xanthous/src/Xanthous/Messages.hs diff --git a/users/grfn/xanthous/src/Xanthous/Messages/Template.hs b/users/aspen/xanthous/src/Xanthous/Messages/Template.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Messages/Template.hs rename to users/aspen/xanthous/src/Xanthous/Messages/Template.hs diff --git a/users/grfn/xanthous/src/Xanthous/Monad.hs b/users/aspen/xanthous/src/Xanthous/Monad.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Monad.hs rename to users/aspen/xanthous/src/Xanthous/Monad.hs diff --git a/users/grfn/xanthous/src/Xanthous/Orphans.hs b/users/aspen/xanthous/src/Xanthous/Orphans.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Orphans.hs rename to users/aspen/xanthous/src/Xanthous/Orphans.hs diff --git a/users/grfn/xanthous/src/Xanthous/Physics.hs b/users/aspen/xanthous/src/Xanthous/Physics.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Physics.hs rename to users/aspen/xanthous/src/Xanthous/Physics.hs diff --git a/users/grfn/xanthous/src/Xanthous/Prelude.hs b/users/aspen/xanthous/src/Xanthous/Prelude.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Prelude.hs rename to users/aspen/xanthous/src/Xanthous/Prelude.hs diff --git a/users/grfn/xanthous/src/Xanthous/Random.hs b/users/aspen/xanthous/src/Xanthous/Random.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Random.hs rename to users/aspen/xanthous/src/Xanthous/Random.hs diff --git a/users/grfn/xanthous/src/Xanthous/Util.hs b/users/aspen/xanthous/src/Xanthous/Util.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Util.hs rename to users/aspen/xanthous/src/Xanthous/Util.hs diff --git a/users/grfn/xanthous/src/Xanthous/Util/Comonad.hs b/users/aspen/xanthous/src/Xanthous/Util/Comonad.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Util/Comonad.hs rename to users/aspen/xanthous/src/Xanthous/Util/Comonad.hs diff --git a/users/grfn/xanthous/src/Xanthous/Util/Graph.hs b/users/aspen/xanthous/src/Xanthous/Util/Graph.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Util/Graph.hs rename to users/aspen/xanthous/src/Xanthous/Util/Graph.hs diff --git a/users/grfn/xanthous/src/Xanthous/Util/Graphics.hs b/users/aspen/xanthous/src/Xanthous/Util/Graphics.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Util/Graphics.hs rename to users/aspen/xanthous/src/Xanthous/Util/Graphics.hs diff --git a/users/grfn/xanthous/src/Xanthous/Util/Inflection.hs b/users/aspen/xanthous/src/Xanthous/Util/Inflection.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Util/Inflection.hs rename to users/aspen/xanthous/src/Xanthous/Util/Inflection.hs diff --git a/users/grfn/xanthous/src/Xanthous/Util/JSON.hs b/users/aspen/xanthous/src/Xanthous/Util/JSON.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Util/JSON.hs rename to users/aspen/xanthous/src/Xanthous/Util/JSON.hs diff --git a/users/grfn/xanthous/src/Xanthous/Util/Optparse.hs b/users/aspen/xanthous/src/Xanthous/Util/Optparse.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Util/Optparse.hs rename to users/aspen/xanthous/src/Xanthous/Util/Optparse.hs diff --git a/users/grfn/xanthous/src/Xanthous/Util/QuickCheck.hs b/users/aspen/xanthous/src/Xanthous/Util/QuickCheck.hs similarity index 100% rename from users/grfn/xanthous/src/Xanthous/Util/QuickCheck.hs rename to users/aspen/xanthous/src/Xanthous/Util/QuickCheck.hs diff --git a/users/grfn/xanthous/src/Xanthous/keybindings.yaml b/users/aspen/xanthous/src/Xanthous/keybindings.yaml similarity index 100% rename from users/grfn/xanthous/src/Xanthous/keybindings.yaml rename to users/aspen/xanthous/src/Xanthous/keybindings.yaml diff --git a/users/grfn/xanthous/src/Xanthous/messages.yaml b/users/aspen/xanthous/src/Xanthous/messages.yaml similarity index 100% rename from users/grfn/xanthous/src/Xanthous/messages.yaml rename to users/aspen/xanthous/src/Xanthous/messages.yaml diff --git a/users/grfn/xanthous/test/Spec.hs b/users/aspen/xanthous/test/Spec.hs similarity index 100% rename from users/grfn/xanthous/test/Spec.hs rename to users/aspen/xanthous/test/Spec.hs diff --git a/users/grfn/xanthous/test/Test/Prelude.hs b/users/aspen/xanthous/test/Test/Prelude.hs similarity index 100% rename from users/grfn/xanthous/test/Test/Prelude.hs rename to users/aspen/xanthous/test/Test/Prelude.hs diff --git a/users/grfn/xanthous/test/Xanthous/CommandSpec.hs b/users/aspen/xanthous/test/Xanthous/CommandSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/CommandSpec.hs rename to users/aspen/xanthous/test/Xanthous/CommandSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Data/EntitiesSpec.hs b/users/aspen/xanthous/test/Xanthous/Data/EntitiesSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Data/EntitiesSpec.hs rename to users/aspen/xanthous/test/Xanthous/Data/EntitiesSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Data/EntityCharSpec.hs b/users/aspen/xanthous/test/Xanthous/Data/EntityCharSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Data/EntityCharSpec.hs rename to users/aspen/xanthous/test/Xanthous/Data/EntityCharSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Data/EntityMap/GraphicsSpec.hs b/users/aspen/xanthous/test/Xanthous/Data/EntityMap/GraphicsSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Data/EntityMap/GraphicsSpec.hs rename to users/aspen/xanthous/test/Xanthous/Data/EntityMap/GraphicsSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Data/EntityMapSpec.hs b/users/aspen/xanthous/test/Xanthous/Data/EntityMapSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Data/EntityMapSpec.hs rename to users/aspen/xanthous/test/Xanthous/Data/EntityMapSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Data/LevelsSpec.hs b/users/aspen/xanthous/test/Xanthous/Data/LevelsSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Data/LevelsSpec.hs rename to users/aspen/xanthous/test/Xanthous/Data/LevelsSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Data/MemoSpec.hs b/users/aspen/xanthous/test/Xanthous/Data/MemoSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Data/MemoSpec.hs rename to users/aspen/xanthous/test/Xanthous/Data/MemoSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Data/NestedMapSpec.hs b/users/aspen/xanthous/test/Xanthous/Data/NestedMapSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Data/NestedMapSpec.hs rename to users/aspen/xanthous/test/Xanthous/Data/NestedMapSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/DataSpec.hs b/users/aspen/xanthous/test/Xanthous/DataSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/DataSpec.hs rename to users/aspen/xanthous/test/Xanthous/DataSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Entities/CharacterSpec.hs b/users/aspen/xanthous/test/Xanthous/Entities/CharacterSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Entities/CharacterSpec.hs rename to users/aspen/xanthous/test/Xanthous/Entities/CharacterSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Entities/CommonSpec.hs b/users/aspen/xanthous/test/Xanthous/Entities/CommonSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Entities/CommonSpec.hs rename to users/aspen/xanthous/test/Xanthous/Entities/CommonSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Entities/RawTypesSpec.hs b/users/aspen/xanthous/test/Xanthous/Entities/RawTypesSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Entities/RawTypesSpec.hs rename to users/aspen/xanthous/test/Xanthous/Entities/RawTypesSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Entities/RawsSpec.hs b/users/aspen/xanthous/test/Xanthous/Entities/RawsSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Entities/RawsSpec.hs rename to users/aspen/xanthous/test/Xanthous/Entities/RawsSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Game/PromptSpec.hs b/users/aspen/xanthous/test/Xanthous/Game/PromptSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Game/PromptSpec.hs rename to users/aspen/xanthous/test/Xanthous/Game/PromptSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Game/StateSpec.hs b/users/aspen/xanthous/test/Xanthous/Game/StateSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Game/StateSpec.hs rename to users/aspen/xanthous/test/Xanthous/Game/StateSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/GameSpec.hs b/users/aspen/xanthous/test/Xanthous/GameSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/GameSpec.hs rename to users/aspen/xanthous/test/Xanthous/GameSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Generators/Level/UtilSpec.hs b/users/aspen/xanthous/test/Xanthous/Generators/Level/UtilSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Generators/Level/UtilSpec.hs rename to users/aspen/xanthous/test/Xanthous/Generators/Level/UtilSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/MessageSpec.hs b/users/aspen/xanthous/test/Xanthous/MessageSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/MessageSpec.hs rename to users/aspen/xanthous/test/Xanthous/MessageSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Messages/TemplateSpec.hs b/users/aspen/xanthous/test/Xanthous/Messages/TemplateSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Messages/TemplateSpec.hs rename to users/aspen/xanthous/test/Xanthous/Messages/TemplateSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/OrphansSpec.hs b/users/aspen/xanthous/test/Xanthous/OrphansSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/OrphansSpec.hs rename to users/aspen/xanthous/test/Xanthous/OrphansSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/RandomSpec.hs b/users/aspen/xanthous/test/Xanthous/RandomSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/RandomSpec.hs rename to users/aspen/xanthous/test/Xanthous/RandomSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Util/GraphSpec.hs b/users/aspen/xanthous/test/Xanthous/Util/GraphSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Util/GraphSpec.hs rename to users/aspen/xanthous/test/Xanthous/Util/GraphSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Util/GraphicsSpec.hs b/users/aspen/xanthous/test/Xanthous/Util/GraphicsSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Util/GraphicsSpec.hs rename to users/aspen/xanthous/test/Xanthous/Util/GraphicsSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/Util/InflectionSpec.hs b/users/aspen/xanthous/test/Xanthous/Util/InflectionSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/Util/InflectionSpec.hs rename to users/aspen/xanthous/test/Xanthous/Util/InflectionSpec.hs diff --git a/users/grfn/xanthous/test/Xanthous/UtilSpec.hs b/users/aspen/xanthous/test/Xanthous/UtilSpec.hs similarity index 100% rename from users/grfn/xanthous/test/Xanthous/UtilSpec.hs rename to users/aspen/xanthous/test/Xanthous/UtilSpec.hs diff --git a/users/grfn/xanthous/xanthous.cabal b/users/aspen/xanthous/xanthous.cabal similarity index 100% rename from users/grfn/xanthous/xanthous.cabal rename to users/aspen/xanthous/xanthous.cabal diff --git a/users/grfn/keyboard/flash b/users/grfn/keyboard/flash deleted file mode 100755 index 76def36f9..000000000 --- a/users/grfn/keyboard/flash +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -exec "$(nix-build --no-out-link ../../.. -A users.grfn.keyboard.flash)"