diff options
author | Aspen Smith <grfn@gws.fyi> | 2024-02-12T03·00-0500 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-02-14T19·37+0000 |
commit | 82ecd61f5c699cf3af6c4eadf47a1c52b1d696c6 (patch) | |
tree | 429c5e078528000591742ec3211bc768ae913a78 /users | |
parent | 0ba476a4266015f278f18d74094299de74a5a111 (diff) |
chore(users): grfn -> aspen r/7511
Change-Id: I6c6847fac56f0a9a1a2209792e00a3aec5e672b9 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10809 Autosubmit: aspen <root@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: lukegb <lukegb@tvl.fyi>
Diffstat (limited to 'users')
-rw-r--r-- | users/aspen/OWNERS (renamed from users/grfn/OWNERS) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/.envrc (renamed from users/grfn/achilles/.envrc) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/.gitignore (renamed from users/grfn/achilles/.gitignore) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/Cargo.lock (renamed from users/grfn/achilles/Cargo.lock) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/Cargo.toml (renamed from users/grfn/achilles/Cargo.toml) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/ach/.gitignore (renamed from users/grfn/achilles/ach/.gitignore) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/ach/Makefile (renamed from users/grfn/achilles/ach/Makefile) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/ach/externs.ach (renamed from users/grfn/achilles/ach/externs.ach) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/ach/functions.ach (renamed from users/grfn/achilles/ach/functions.ach) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/ach/simple.ach (renamed from users/grfn/achilles/ach/simple.ach) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/ach/units.ach (renamed from users/grfn/achilles/ach/units.ach) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/default.nix (renamed from users/grfn/achilles/default.nix) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/shell.nix (renamed from users/grfn/achilles/shell.nix) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/ast/hir.rs (renamed from users/grfn/achilles/src/ast/hir.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/ast/mod.rs (renamed from users/grfn/achilles/src/ast/mod.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/codegen/llvm.rs (renamed from users/grfn/achilles/src/codegen/llvm.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/codegen/mod.rs (renamed from users/grfn/achilles/src/codegen/mod.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/commands/check.rs (renamed from users/grfn/achilles/src/commands/check.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/commands/compile.rs (renamed from users/grfn/achilles/src/commands/compile.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/commands/eval.rs (renamed from users/grfn/achilles/src/commands/eval.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/commands/mod.rs (renamed from users/grfn/achilles/src/commands/mod.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/common/env.rs (renamed from users/grfn/achilles/src/common/env.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/common/error.rs (renamed from users/grfn/achilles/src/common/error.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/common/mod.rs (renamed from users/grfn/achilles/src/common/mod.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/common/namer.rs (renamed from users/grfn/achilles/src/common/namer.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/compiler.rs (renamed from users/grfn/achilles/src/compiler.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/interpreter/error.rs (renamed from users/grfn/achilles/src/interpreter/error.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/interpreter/mod.rs (renamed from users/grfn/achilles/src/interpreter/mod.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/interpreter/value.rs (renamed from users/grfn/achilles/src/interpreter/value.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/main.rs (renamed from users/grfn/achilles/src/main.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/parser/expr.rs (renamed from users/grfn/achilles/src/parser/expr.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/parser/macros.rs (renamed from users/grfn/achilles/src/parser/macros.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/parser/mod.rs (renamed from users/grfn/achilles/src/parser/mod.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/parser/type_.rs (renamed from users/grfn/achilles/src/parser/type_.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/parser/util.rs (renamed from users/grfn/achilles/src/parser/util.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/passes/hir/mod.rs (renamed from users/grfn/achilles/src/passes/hir/mod.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/passes/hir/monomorphize.rs (renamed from users/grfn/achilles/src/passes/hir/monomorphize.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/passes/hir/strip_positive_units.rs (renamed from users/grfn/achilles/src/passes/hir/strip_positive_units.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/passes/mod.rs (renamed from users/grfn/achilles/src/passes/mod.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/src/tc/mod.rs (renamed from users/grfn/achilles/src/tc/mod.rs) | 0 | ||||
-rw-r--r-- | users/aspen/achilles/tests/compile.rs (renamed from users/grfn/achilles/tests/compile.rs) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/.clj-kondo/config.edn (renamed from users/grfn/bbbg/.clj-kondo/config.edn) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/.envrc (renamed from users/grfn/bbbg/.envrc) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/.gitignore (renamed from users/grfn/bbbg/.gitignore) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/Makefile (renamed from users/grfn/bbbg/Makefile) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/README.md (renamed from users/grfn/bbbg/README.md) | 8 | ||||
-rw-r--r-- | users/aspen/bbbg/arion-compose.nix (renamed from users/grfn/bbbg/arion-compose.nix) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/arion-pkgs.nix (renamed from users/grfn/bbbg/arion-pkgs.nix) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/default.nix (renamed from users/grfn/bbbg/default.nix) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/deps.edn (renamed from users/grfn/bbbg/deps.edn) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/deps.nix (renamed from users/grfn/bbbg/deps.nix) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/env/dev/bbbg-signup/env.clj (renamed from users/grfn/bbbg/env/dev/bbbg-signup/env.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/env/dev/logback.xml (renamed from users/grfn/bbbg/env/dev/logback.xml) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/env/prod/bbbg-signup/env.clj (renamed from users/grfn/bbbg/env/prod/bbbg-signup/env.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/env/prod/logback.xml (renamed from users/grfn/bbbg/env/prod/logback.xml) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/env/test/bbbg-signup/env.clj (renamed from users/grfn/bbbg/env/test/bbbg-signup/env.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/env/test/logback.xml (renamed from users/grfn/bbbg/env/test/logback.xml) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/module.nix (renamed from users/grfn/bbbg/module.nix) | 2 | ||||
-rw-r--r-- | users/aspen/bbbg/pom.xml (renamed from users/grfn/bbbg/pom.xml) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/resources/base.css (renamed from users/grfn/bbbg/resources/base.css) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/resources/migrations/20211212165646-init-schema.down.sql (renamed from users/grfn/bbbg/resources/migrations/20211212165646-init-schema.down.sql) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/resources/migrations/20211212165646-init-schema.up.sql (renamed from users/grfn/bbbg/resources/migrations/20211212165646-init-schema.up.sql) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/resources/migrations/20211220002229-add-attendee-checks.down.sql (renamed from users/grfn/bbbg/resources/migrations/20211220002229-add-attendee-checks.down.sql) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/resources/migrations/20211220002229-add-attendee-checks.up.sql (renamed from users/grfn/bbbg/resources/migrations/20211220002229-add-attendee-checks.up.sql) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.down.sql (renamed from users/grfn/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.down.sql) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.up.sql (renamed from users/grfn/bbbg/resources/migrations/20211224161028-add-attendee-unique-meetup-id.up.sql) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff) | bin | 23576 -> 23576 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff2 (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff2) | bin | 19272 -> 19272 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff) | bin | 24056 -> 24056 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff2 (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff2) | bin | 19624 -> 19624 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff) | bin | 23628 -> 23628 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff2 (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff2) | bin | 19264 -> 19264 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff) | bin | 23872 -> 23872 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff2 (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff2) | bin | 19440 -> 19440 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff) | bin | 24404 -> 24404 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff2 (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff2) | bin | 19836 -> 19836 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff) | bin | 24012 -> 24012 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff2 (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff2) | bin | 19660 -> 19660 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff) | bin | 23480 -> 23480 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff2 (renamed from users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff2) | bin | 19172 -> 19172 bytes | |||
-rw-r--r-- | users/aspen/bbbg/resources/public/main.js (renamed from users/grfn/bbbg/resources/public/main.js) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/resources/public/robots.txt (renamed from users/grfn/bbbg/resources/public/robots.txt) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/shell.nix (renamed from users/grfn/bbbg/shell.nix) | 2 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/attendee.clj (renamed from users/grfn/bbbg/src/bbbg/attendee.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/attendee_check.clj (renamed from users/grfn/bbbg/src/bbbg/attendee_check.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/core.clj (renamed from users/grfn/bbbg/src/bbbg/core.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/db.clj (renamed from users/grfn/bbbg/src/bbbg/db.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/db/attendee.clj (renamed from users/grfn/bbbg/src/bbbg/db/attendee.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/db/attendee_check.clj (renamed from users/grfn/bbbg/src/bbbg/db/attendee_check.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/db/event.clj (renamed from users/grfn/bbbg/src/bbbg/db/event.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/db/event_attendee.clj (renamed from users/grfn/bbbg/src/bbbg/db/event_attendee.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/db/user.clj (renamed from users/grfn/bbbg/src/bbbg/db/user.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/discord.clj (renamed from users/grfn/bbbg/src/bbbg/discord.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/discord/auth.clj (renamed from users/grfn/bbbg/src/bbbg/discord/auth.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/event.clj (renamed from users/grfn/bbbg/src/bbbg/event.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/event_attendee.clj (renamed from users/grfn/bbbg/src/bbbg/event_attendee.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/handlers/attendee_checks.clj (renamed from users/grfn/bbbg/src/bbbg/handlers/attendee_checks.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/handlers/attendees.clj (renamed from users/grfn/bbbg/src/bbbg/handlers/attendees.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/handlers/core.clj (renamed from users/grfn/bbbg/src/bbbg/handlers/core.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/handlers/events.clj (renamed from users/grfn/bbbg/src/bbbg/handlers/events.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/handlers/home.clj (renamed from users/grfn/bbbg/src/bbbg/handlers/home.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/handlers/signup_form.clj (renamed from users/grfn/bbbg/src/bbbg/handlers/signup_form.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/meetup/import.clj (renamed from users/grfn/bbbg/src/bbbg/meetup/import.clj) | 2 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/meetup_user.clj (renamed from users/grfn/bbbg/src/bbbg/meetup_user.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/styles.clj (renamed from users/grfn/bbbg/src/bbbg/styles.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/user.clj (renamed from users/grfn/bbbg/src/bbbg/user.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/util/core.clj (renamed from users/grfn/bbbg/src/bbbg/util/core.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/util/dev_secrets.clj (renamed from users/grfn/bbbg/src/bbbg/util/dev_secrets.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/util/display.clj (renamed from users/grfn/bbbg/src/bbbg/util/display.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/util/spec.clj (renamed from users/grfn/bbbg/src/bbbg/util/spec.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/util/sql.clj (renamed from users/grfn/bbbg/src/bbbg/util/sql.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/util/time.clj (renamed from users/grfn/bbbg/src/bbbg/util/time.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/views/flash.clj (renamed from users/grfn/bbbg/src/bbbg/views/flash.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/src/bbbg/web.clj (renamed from users/grfn/bbbg/src/bbbg/web.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/test/bbbg/meetup/import_test.clj (renamed from users/grfn/bbbg/test/bbbg/meetup/import_test.clj) | 0 | ||||
-rw-r--r-- | users/aspen/bbbg/tf.nix (renamed from users/grfn/bbbg/tf.nix) | 6 | ||||
-rw-r--r-- | users/aspen/emacs.d/+bindings.el (renamed from users/grfn/emacs.d/+bindings.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/+commands.el (renamed from users/grfn/emacs.d/+commands.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/+private.el.gpg (renamed from users/grfn/emacs.d/+private.el.gpg) | bin | 1115 -> 1115 bytes | |||
-rw-r--r-- | users/aspen/emacs.d/.gitignore (renamed from users/grfn/emacs.d/.gitignore) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/autoload/evil.el (renamed from users/grfn/emacs.d/autoload/evil.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/autoload/hlissner.el (renamed from users/grfn/emacs.d/autoload/hlissner.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/clocked-in-elt.el (renamed from users/grfn/emacs.d/clocked-in-elt.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/clojure.el (renamed from users/grfn/emacs.d/clojure.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/company-sql.el (renamed from users/grfn/emacs.d/company-sql.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/config.el (renamed from users/grfn/emacs.d/config.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/cpp.el (renamed from users/grfn/emacs.d/cpp.el) | 10 | ||||
-rw-r--r-- | users/aspen/emacs.d/email.el (renamed from users/grfn/emacs.d/email.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/github-org.el (renamed from users/grfn/emacs.d/github-org.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/google-c-style.el (renamed from users/grfn/emacs.d/google-c-style.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/grid.el (renamed from users/grfn/emacs.d/grid.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/init.el (renamed from users/grfn/emacs.d/init.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/irc.el (renamed from users/grfn/emacs.d/irc.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/lisp.el (renamed from users/grfn/emacs.d/lisp.el) | 0 | ||||
-rwxr-xr-x | users/aspen/emacs.d/nix-clangd.sh (renamed from users/grfn/emacs.d/nix-clangd.sh) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/nix.el (renamed from users/grfn/emacs.d/nix.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/org-alerts.el (renamed from users/grfn/emacs.d/org-alerts.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/org-config.el (renamed from users/grfn/emacs.d/org-config.el) | 38 | ||||
-rw-r--r-- | users/aspen/emacs.d/org-gcal.el (renamed from users/grfn/emacs.d/org-gcal.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/org-query.el (renamed from users/grfn/emacs.d/org-query.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/packages.el (renamed from users/grfn/emacs.d/packages.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/rust.el (renamed from users/grfn/emacs.d/rust.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/show-matching-paren.el (renamed from users/grfn/emacs.d/show-matching-paren.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/slack-snippets.el (renamed from users/grfn/emacs.d/slack-snippets.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/slack.el (renamed from users/grfn/emacs.d/slack.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/annotation (renamed from users/grfn/emacs.d/snippets/haskell-mode/annotation) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/benchmark-module (renamed from users/grfn/emacs.d/snippets/haskell-mode/benchmark-module) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/header (renamed from users/grfn/emacs.d/snippets/haskell-mode/header) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/hedgehog-generator (renamed from users/grfn/emacs.d/snippets/haskell-mode/hedgehog-generator) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/hedgehog-property (renamed from users/grfn/emacs.d/snippets/haskell-mode/hedgehog-property) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/hlint (renamed from users/grfn/emacs.d/snippets/haskell-mode/hlint) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/import-i (renamed from users/grfn/emacs.d/snippets/haskell-mode/import-i) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/inl (renamed from users/grfn/emacs.d/snippets/haskell-mode/inl) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/inline (renamed from users/grfn/emacs.d/snippets/haskell-mode/inline) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/language pragma (renamed from users/grfn/emacs.d/snippets/haskell-mode/language pragma) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/lens.field (renamed from users/grfn/emacs.d/snippets/haskell-mode/lens.field) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/module (renamed from users/grfn/emacs.d/snippets/haskell-mode/module) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/shut up, hlint (renamed from users/grfn/emacs.d/snippets/haskell-mode/shut up, hlint) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/test-group (renamed from users/grfn/emacs.d/snippets/haskell-mode/test-group) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/test-module (renamed from users/grfn/emacs.d/snippets/haskell-mode/test-module) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/haskell-mode/undefined (renamed from users/grfn/emacs.d/snippets/haskell-mode/undefined) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/action-type (renamed from users/grfn/emacs.d/snippets/js2-mode/action-type) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/before (renamed from users/grfn/emacs.d/snippets/js2-mode/before) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/context (renamed from users/grfn/emacs.d/snippets/js2-mode/context) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/describe (renamed from users/grfn/emacs.d/snippets/js2-mode/describe) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/expect (renamed from users/grfn/emacs.d/snippets/js2-mode/expect) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/function (renamed from users/grfn/emacs.d/snippets/js2-mode/function) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/header (renamed from users/grfn/emacs.d/snippets/js2-mode/header) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/it (renamed from users/grfn/emacs.d/snippets/js2-mode/it) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/it-pending (renamed from users/grfn/emacs.d/snippets/js2-mode/it-pending) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/module (renamed from users/grfn/emacs.d/snippets/js2-mode/module) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/record (renamed from users/grfn/emacs.d/snippets/js2-mode/record) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/js2-mode/test (renamed from users/grfn/emacs.d/snippets/js2-mode/test) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/nix-mode/fetchFromGitHub (renamed from users/grfn/emacs.d/snippets/nix-mode/fetchFromGitHub) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/nix-mode/pythonPackage (renamed from users/grfn/emacs.d/snippets/nix-mode/pythonPackage) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/nix-mode/sha256 (renamed from users/grfn/emacs.d/snippets/nix-mode/sha256) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/org-mode/SQL source block (renamed from users/grfn/emacs.d/snippets/org-mode/SQL source block) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/org-mode/combat (renamed from users/grfn/emacs.d/snippets/org-mode/combat) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/org-mode/date (renamed from users/grfn/emacs.d/snippets/org-mode/date) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/org-mode/date-time (renamed from users/grfn/emacs.d/snippets/org-mode/date-time) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/org-mode/description (renamed from users/grfn/emacs.d/snippets/org-mode/description) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/org-mode/nologdone (renamed from users/grfn/emacs.d/snippets/org-mode/nologdone) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/org-mode/python source block (renamed from users/grfn/emacs.d/snippets/org-mode/python source block) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/org-mode/reveal (renamed from users/grfn/emacs.d/snippets/org-mode/reveal) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/org-mode/transaction (renamed from users/grfn/emacs.d/snippets/org-mode/transaction) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/prolog-mode/use-module (renamed from users/grfn/emacs.d/snippets/prolog-mode/use-module) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/python-mode/add_column (renamed from users/grfn/emacs.d/snippets/python-mode/add_column) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/python-mode/decorate (renamed from users/grfn/emacs.d/snippets/python-mode/decorate) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/python-mode/dunder (renamed from users/grfn/emacs.d/snippets/python-mode/dunder) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/python-mode/name (renamed from users/grfn/emacs.d/snippets/python-mode/name) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/python-mode/op.get_bind.execute (renamed from users/grfn/emacs.d/snippets/python-mode/op.get_bind.execute) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/python-mode/pdb (renamed from users/grfn/emacs.d/snippets/python-mode/pdb) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/rust-mode/#[macro_use] (renamed from users/grfn/emacs.d/snippets/rust-mode/#[macro_use]) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/rust-mode/async test (renamed from users/grfn/emacs.d/snippets/rust-mode/async test) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/rust-mode/benchmark (renamed from users/grfn/emacs.d/snippets/rust-mode/benchmark) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/rust-mode/proptest (renamed from users/grfn/emacs.d/snippets/rust-mode/proptest) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/rust-mode/test-module (renamed from users/grfn/emacs.d/snippets/rust-mode/test-module) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/rust-mode/tests (renamed from users/grfn/emacs.d/snippets/rust-mode/tests) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/snippet-mode/indent (renamed from users/grfn/emacs.d/snippets/snippet-mode/indent) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/sql-mode/count(*) group by (renamed from users/grfn/emacs.d/snippets/sql-mode/count(*) group by) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/terraform-mode/variable (renamed from users/grfn/emacs.d/snippets/terraform-mode/variable) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/snippets/text-mode/date (renamed from users/grfn/emacs.d/snippets/text-mode/date) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/splitjoin.el (renamed from users/grfn/emacs.d/splitjoin.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/sql-strings.el (renamed from users/grfn/emacs.d/sql-strings.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/terraform.el (renamed from users/grfn/emacs.d/terraform.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/tests/splitjoin_test.el (renamed from users/grfn/emacs.d/tests/splitjoin_test.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/themes/grfn-solarized-light-theme.el (renamed from users/grfn/emacs.d/themes/grfn-solarized-light-theme.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/utils.el (renamed from users/grfn/emacs.d/utils.el) | 0 | ||||
-rw-r--r-- | users/aspen/emacs.d/vterm.el (renamed from users/grfn/emacs.d/vterm.el) | 0 | ||||
-rw-r--r-- | users/aspen/keyboard/.gitignore (renamed from users/grfn/keyboard/.gitignore) | 0 | ||||
-rw-r--r-- | users/aspen/keyboard/README.org (renamed from users/grfn/keyboard/README.org) | 0 | ||||
-rw-r--r-- | users/aspen/keyboard/default.nix (renamed from users/grfn/keyboard/default.nix) | 0 | ||||
-rwxr-xr-x | users/aspen/keyboard/flash | 2 | ||||
-rw-r--r-- | users/aspen/keyboard/increase-tapping-delay.patch (renamed from users/grfn/keyboard/increase-tapping-delay.patch) | 0 | ||||
-rw-r--r-- | users/aspen/keyboard/keymap.c (renamed from users/grfn/keyboard/keymap.c) | 0 | ||||
-rw-r--r-- | users/aspen/keys.nix (renamed from users/grfn/keys.nix) | 0 | ||||
-rw-r--r-- | users/aspen/org-clubhouse/.gitignore (renamed from users/grfn/org-clubhouse/.gitignore) | 0 | ||||
-rw-r--r-- | users/aspen/org-clubhouse/CODE_OF_CONDUCT.org (renamed from users/grfn/org-clubhouse/CODE_OF_CONDUCT.org) | 0 | ||||
-rw-r--r-- | users/aspen/org-clubhouse/LICENSE (renamed from users/grfn/org-clubhouse/LICENSE) | 0 | ||||
-rw-r--r-- | users/aspen/org-clubhouse/README.org (renamed from users/grfn/org-clubhouse/README.org) | 0 | ||||
-rw-r--r-- | users/aspen/org-clubhouse/org-clubhouse.el (renamed from users/grfn/org-clubhouse/org-clubhouse.el) | 0 | ||||
-rw-r--r-- | users/aspen/pkgs/cargo-hakari.nix (renamed from users/grfn/pkgs/cargo-hakari.nix) | 0 | ||||
-rw-r--r-- | users/aspen/pkgs/cargo-nextest.nix (renamed from users/grfn/pkgs/cargo-nextest.nix) | 0 | ||||
-rw-r--r-- | users/aspen/pkgs/notmuch-extract-patch.nix (renamed from users/grfn/pkgs/notmuch-extract-patch.nix) | 0 | ||||
-rw-r--r-- | users/aspen/resume/chimera.png (renamed from users/grfn/resume/chimera.png) | bin | 40602 -> 40602 bytes | |||
-rw-r--r-- | users/aspen/resume/collection.sty (renamed from users/grfn/resume/collection.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/default.nix (renamed from users/grfn/resume/default.nix) | 0 | ||||
-rw-r--r-- | users/aspen/resume/helvetica.sty (renamed from users/grfn/resume/helvetica.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncv.cls (renamed from users/grfn/resume/moderncv.cls) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvcolorblack.sty (renamed from users/grfn/resume/moderncvcolorblack.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvcolorblue.sty (renamed from users/grfn/resume/moderncvcolorblue.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvcolorgreen.sty (renamed from users/grfn/resume/moderncvcolorgreen.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvcolorgrey.sty (renamed from users/grfn/resume/moderncvcolorgrey.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvcolororange.sty (renamed from users/grfn/resume/moderncvcolororange.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvcolorpurple.sty (renamed from users/grfn/resume/moderncvcolorpurple.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvcolorred.sty (renamed from users/grfn/resume/moderncvcolorred.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvcompatibility.sty (renamed from users/grfn/resume/moderncvcompatibility.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncviconsletters.sty (renamed from users/grfn/resume/moderncviconsletters.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncviconsmarvosym.sty (renamed from users/grfn/resume/moderncviconsmarvosym.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvstylebanking.sty (renamed from users/grfn/resume/moderncvstylebanking.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvstylecasual.sty (renamed from users/grfn/resume/moderncvstylecasual.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvstyleclassic.sty (renamed from users/grfn/resume/moderncvstyleclassic.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvstyleempty.sty (renamed from users/grfn/resume/moderncvstyleempty.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/moderncvstyleoldstyle.sty (renamed from users/grfn/resume/moderncvstyleoldstyle.sty) | 0 | ||||
-rw-r--r-- | users/aspen/resume/picture.png (renamed from users/grfn/resume/picture.png) | bin | 14848 -> 14848 bytes | |||
-rw-r--r-- | users/aspen/resume/resume.tex (renamed from users/grfn/resume/resume.tex) | 0 | ||||
-rw-r--r-- | users/aspen/resume/tweaklist.sty (renamed from users/grfn/resume/tweaklist.sty) | 0 | ||||
-rw-r--r-- | users/aspen/secrets/.envrc (renamed from users/grfn/secrets/.envrc) | 0 | ||||
-rw-r--r-- | users/aspen/secrets/bbbg.age (renamed from users/grfn/secrets/bbbg.age) | bin | 733 -> 733 bytes | |||
-rw-r--r-- | users/aspen/secrets/buildkite-ssh-key.age (renamed from users/grfn/secrets/buildkite-ssh-key.age) | bin | 3883 -> 3883 bytes | |||
-rw-r--r-- | users/aspen/secrets/buildkite-token.age (renamed from users/grfn/secrets/buildkite-token.age) | bin | 623 -> 623 bytes | |||
-rw-r--r-- | users/aspen/secrets/cloudflare.age (renamed from users/grfn/secrets/cloudflare.age) | 0 | ||||
-rw-r--r-- | users/aspen/secrets/ddclient-password.age (renamed from users/grfn/secrets/ddclient-password.age) | bin | 429 -> 429 bytes | |||
-rw-r--r-- | users/aspen/secrets/default.nix (renamed from users/grfn/secrets/default.nix) | 0 | ||||
-rw-r--r-- | users/aspen/secrets/secrets.nix (renamed from users/grfn/secrets/secrets.nix) | 0 | ||||
-rw-r--r-- | users/aspen/secrets/shell.nix (renamed from users/grfn/secrets/shell.nix) | 0 | ||||
-rw-r--r-- | users/aspen/secrets/windtunnel-bot-github-token.age (renamed from users/grfn/secrets/windtunnel-bot-github-token.age) | 0 | ||||
-rw-r--r-- | users/aspen/system/.gitignore (renamed from users/grfn/system/.gitignore) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/.skip-subtree (renamed from users/grfn/system/home/.skip-subtree) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/common/solarized.nix (renamed from users/grfn/system/home/common/solarized.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/default.nix (renamed from users/grfn/system/home/default.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/home.nix (renamed from users/grfn/system/home/home.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/machines/dobharchu.nix (renamed from users/grfn/system/home/machines/dobharchu.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/machines/ogopogo.nix (renamed from users/grfn/system/home/machines/ogopogo.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/machines/roswell.nix (renamed from users/grfn/system/home/machines/roswell.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/machines/yeren.nix (renamed from users/grfn/system/home/machines/yeren.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/.gitignore (renamed from users/grfn/system/home/modules/.gitignore) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/alacritty.nix (renamed from users/grfn/system/home/modules/alacritty.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/alsi.nix (renamed from users/grfn/system/home/modules/alsi.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/common.nix (renamed from users/grfn/system/home/modules/common.nix) | 10 | ||||
-rw-r--r-- | users/aspen/system/home/modules/desktop.nix (renamed from users/grfn/system/home/modules/desktop.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/development.nix (renamed from users/grfn/system/home/modules/development.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/development/agda.nix (renamed from users/grfn/system/home/modules/development/agda.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/development/kube.nix (renamed from users/grfn/system/home/modules/development/kube.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/development/ocaml.nix (renamed from users/grfn/system/home/modules/development/ocaml.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/development/readyset.nix (renamed from users/grfn/system/home/modules/development/readyset.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/development/rust.nix (renamed from users/grfn/system/home/modules/development/rust.nix) | 4 | ||||
-rw-r--r-- | users/aspen/system/home/modules/emacs.nix (renamed from users/grfn/system/home/modules/emacs.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/email.nix (renamed from users/grfn/system/home/modules/email.nix) | 2 | ||||
-rw-r--r-- | users/aspen/system/home/modules/firefox.nix (renamed from users/grfn/system/home/modules/firefox.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/games.nix (renamed from users/grfn/system/home/modules/games.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/i3.nix (renamed from users/grfn/system/home/modules/i3.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/lib/cloneRepo.nix (renamed from users/grfn/system/home/modules/lib/cloneRepo.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/lib/zshFunctions.nix (renamed from users/grfn/system/home/modules/lib/zshFunctions.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/nixos-logo.txt (renamed from users/grfn/system/home/modules/nixos-logo.txt) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/obs.nix (renamed from users/grfn/system/home/modules/obs.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/ptt.nix (renamed from users/grfn/system/home/modules/ptt.nix) | 0 | ||||
-rwxr-xr-x | users/aspen/system/home/modules/pure.zsh-theme (renamed from users/grfn/system/home/modules/pure.zsh-theme) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/rtlsdr.nix (renamed from users/grfn/system/home/modules/rtlsdr.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/shell.nix (renamed from users/grfn/system/home/modules/shell.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/tarsnap.nix (renamed from users/grfn/system/home/modules/tarsnap.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/tmux.nix (renamed from users/grfn/system/home/modules/tmux.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/twitter.nix (renamed from users/grfn/system/home/modules/twitter.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/vim.nix (renamed from users/grfn/system/home/modules/vim.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/vimrc (renamed from users/grfn/system/home/modules/vimrc) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/modules/zshrc (renamed from users/grfn/system/home/modules/zshrc) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/platforms/darwin.nix (renamed from users/grfn/system/home/platforms/darwin.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/home/platforms/linux.nix (renamed from users/grfn/system/home/platforms/linux.nix) | 0 | ||||
-rwxr-xr-x | users/aspen/system/install (renamed from users/grfn/system/install) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/.skip-subtree (renamed from users/grfn/system/system/.skip-subtree) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/configuration.nix (renamed from users/grfn/system/system/configuration.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/default.nix (renamed from users/grfn/system/system/default.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/iso.nix (renamed from users/grfn/system/system/iso.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/machines/bumblebee.nix (renamed from users/grfn/system/system/machines/bumblebee.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/machines/mugwump.nix (renamed from users/grfn/system/system/machines/mugwump.nix) | 6 | ||||
-rw-r--r-- | users/aspen/system/system/machines/ogopogo.nix (renamed from users/grfn/system/system/machines/ogopogo.nix) | 2 | ||||
-rw-r--r-- | users/aspen/system/system/machines/roswell.nix (renamed from users/grfn/system/system/machines/roswell.nix) | 2 | ||||
-rw-r--r-- | users/aspen/system/system/machines/yeren.nix (renamed from users/grfn/system/system/machines/yeren.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/common.nix (renamed from users/grfn/system/system/modules/common.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/desktop.nix (renamed from users/grfn/system/system/modules/desktop.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/development.nix (renamed from users/grfn/system/system/modules/development.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/fcitx.nix (renamed from users/grfn/system/system/modules/fcitx.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/fonts.nix (renamed from users/grfn/system/system/modules/fonts.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/laptop.nix (renamed from users/grfn/system/system/modules/laptop.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/reusable/README.org (renamed from users/grfn/system/system/modules/reusable/README.org) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/reusable/battery.nix (renamed from users/grfn/system/system/modules/reusable/battery.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/rtlsdr.nix (renamed from users/grfn/system/system/modules/rtlsdr.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/sound.nix (renamed from users/grfn/system/system/modules/sound.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/tvl.nix (renamed from users/grfn/system/system/modules/tvl.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/wireshark.nix (renamed from users/grfn/system/system/modules/wireshark.nix) | 0 | ||||
-rw-r--r-- | users/aspen/system/system/modules/xserver.nix (renamed from users/grfn/system/system/modules/xserver.nix) | 0 | ||||
-rw-r--r-- | users/aspen/terraform/globals.nix (renamed from users/grfn/terraform/globals.nix) | 0 | ||||
-rw-r--r-- | users/aspen/terraform/nixosMachine.nix (renamed from users/grfn/terraform/nixosMachine.nix) | 0 | ||||
-rw-r--r-- | users/aspen/terraform/workspace.nix (renamed from users/grfn/terraform/workspace.nix) | 2 | ||||
-rw-r--r-- | users/aspen/web/.envrc (renamed from users/grfn/web/.envrc) | 0 | ||||
-rw-r--r-- | users/aspen/web/.gitignore (renamed from users/grfn/web/.gitignore) | 0 | ||||
-rw-r--r-- | users/aspen/web/Makefile (renamed from users/grfn/web/Makefile) | 4 | ||||
-rw-r--r-- | users/aspen/web/config.el (renamed from users/grfn/web/config.el) | 0 | ||||
-rw-r--r-- | users/aspen/web/default.nix (renamed from users/grfn/web/default.nix) | 2 | ||||
-rw-r--r-- | users/aspen/web/index.org (renamed from users/grfn/web/index.org) | 6 | ||||
-rw-r--r-- | users/aspen/web/main.css (renamed from users/grfn/web/main.css) | 0 | ||||
-rw-r--r-- | users/aspen/web/orgExportHTML.nix (renamed from users/grfn/web/orgExportHTML.nix) | 0 | ||||
-rw-r--r-- | users/aspen/web/pubkey.gpg (renamed from users/grfn/web/pubkey.gpg) | 0 | ||||
-rw-r--r-- | users/aspen/web/recipes/tomato-sauce.org (renamed from users/grfn/web/recipes/tomato-sauce.org) | 0 | ||||
-rw-r--r-- | users/aspen/web/shell.nix (renamed from users/grfn/web/shell.nix) | 0 | ||||
-rw-r--r-- | users/aspen/web/site.nix (renamed from users/grfn/web/site.nix) | 0 | ||||
-rw-r--r-- | users/aspen/wigglydonke.rs/.well-known/cf-2fa-verify.txt (renamed from users/grfn/wigglydonke.rs/.well-known/cf-2fa-verify.txt) | 0 | ||||
-rw-r--r-- | users/aspen/wigglydonke.rs/index.html (renamed from users/grfn/wigglydonke.rs/index.html) | 0 | ||||
-rw-r--r-- | users/aspen/wigglydonke.rs/wd.png (renamed from users/grfn/wigglydonke.rs/wd.png) | bin | 1624030 -> 1624030 bytes | |||
-rw-r--r-- | users/aspen/xanthous/.envrc (renamed from users/grfn/xanthous/.envrc) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/.github/actions/nix-build/Dockerfile (renamed from users/grfn/xanthous/.github/actions/nix-build/Dockerfile) | 0 | ||||
-rwxr-xr-x | users/aspen/xanthous/.github/actions/nix-build/entrypoint.sh (renamed from users/grfn/xanthous/.github/actions/nix-build/entrypoint.sh) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/.github/workflows/haskell.yml (renamed from users/grfn/xanthous/.github/workflows/haskell.yml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/.gitignore (renamed from users/grfn/xanthous/.gitignore) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/LICENSE (renamed from users/grfn/xanthous/LICENSE) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/README.org (renamed from users/grfn/xanthous/README.org) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/Setup.hs (renamed from users/grfn/xanthous/Setup.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/app/Main.hs (renamed from users/grfn/xanthous/app/Main.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/bench/Bench.hs (renamed from users/grfn/xanthous/bench/Bench.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/bench/Bench/Prelude.hs (renamed from users/grfn/xanthous/bench/Bench/Prelude.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/bench/Xanthous/Generators/UtilBench.hs (renamed from users/grfn/xanthous/bench/Xanthous/Generators/UtilBench.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/bench/Xanthous/RandomBench.hs (renamed from users/grfn/xanthous/bench/Xanthous/RandomBench.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/build/generic-arbitrary-export-garbitrary.patch (renamed from users/grfn/xanthous/build/generic-arbitrary-export-garbitrary.patch) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/build/hgeometry-fix-haddock.patch (renamed from users/grfn/xanthous/build/hgeometry-fix-haddock.patch) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/build/update-comonad-extras.patch (renamed from users/grfn/xanthous/build/update-comonad-extras.patch) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/default.nix (renamed from users/grfn/xanthous/default.nix) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/docs/raw-types.org (renamed from users/grfn/xanthous/docs/raw-types.org) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/hie.yaml (renamed from users/grfn/xanthous/hie.yaml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/nixpkgs.nix (renamed from users/grfn/xanthous/nixpkgs.nix) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/package.yaml (renamed from users/grfn/xanthous/package.yaml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/pkg.nix (renamed from users/grfn/xanthous/pkg.nix) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/server/.envrc (renamed from users/grfn/xanthous/server/.envrc) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/server/.gitignore (renamed from users/grfn/xanthous/server/.gitignore) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/server/Cargo.lock (renamed from users/grfn/xanthous/server/Cargo.lock) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/server/Cargo.toml (renamed from users/grfn/xanthous/server/Cargo.toml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/server/default.nix (renamed from users/grfn/xanthous/server/default.nix) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/server/docker.nix (renamed from users/grfn/xanthous/server/docker.nix) | 2 | ||||
-rw-r--r-- | users/aspen/xanthous/server/module.nix (renamed from users/grfn/xanthous/server/module.nix) | 2 | ||||
-rw-r--r-- | users/aspen/xanthous/server/shell.nix (renamed from users/grfn/xanthous/server/shell.nix) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/server/src/main.rs (renamed from users/grfn/xanthous/server/src/main.rs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/server/src/metrics.rs (renamed from users/grfn/xanthous/server/src/metrics.rs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/server/src/pty.rs (renamed from users/grfn/xanthous/server/src/pty.rs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/shell.nix (renamed from users/grfn/xanthous/shell.nix) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Data/Aeson/Generic/DerivingVia.hs (renamed from users/grfn/xanthous/src/Data/Aeson/Generic/DerivingVia.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/AI/Gormlak.hs (renamed from users/grfn/xanthous/src/Xanthous/AI/Gormlak.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/App.hs (renamed from users/grfn/xanthous/src/Xanthous/App.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/App/Autocommands.hs (renamed from users/grfn/xanthous/src/Xanthous/App/Autocommands.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/App/Common.hs (renamed from users/grfn/xanthous/src/Xanthous/App/Common.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/App/Prompt.hs (renamed from users/grfn/xanthous/src/Xanthous/App/Prompt.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/App/Time.hs (renamed from users/grfn/xanthous/src/Xanthous/App/Time.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Command.hs (renamed from users/grfn/xanthous/src/Xanthous/Command.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Data.hs (renamed from users/grfn/xanthous/src/Xanthous/Data.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Data/App.hs (renamed from users/grfn/xanthous/src/Xanthous/Data/App.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Data/Entities.hs (renamed from users/grfn/xanthous/src/Xanthous/Data/Entities.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Data/EntityChar.hs (renamed from users/grfn/xanthous/src/Xanthous/Data/EntityChar.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Data/EntityMap.hs (renamed from users/grfn/xanthous/src/Xanthous/Data/EntityMap.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Data/EntityMap/Graphics.hs (renamed from users/grfn/xanthous/src/Xanthous/Data/EntityMap/Graphics.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Data/Levels.hs (renamed from users/grfn/xanthous/src/Xanthous/Data/Levels.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Data/Memo.hs (renamed from users/grfn/xanthous/src/Xanthous/Data/Memo.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Data/NestedMap.hs (renamed from users/grfn/xanthous/src/Xanthous/Data/NestedMap.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Data/VectorBag.hs (renamed from users/grfn/xanthous/src/Xanthous/Data/VectorBag.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Character.hs (renamed from users/grfn/xanthous/src/Xanthous/Entities/Character.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Common.hs (renamed from users/grfn/xanthous/src/Xanthous/Entities/Common.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Creature.hs (renamed from users/grfn/xanthous/src/Xanthous/Entities/Creature.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs (renamed from users/grfn/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Draw/Util.hs (renamed from users/grfn/xanthous/src/Xanthous/Entities/Draw/Util.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Entities.hs (renamed from users/grfn/xanthous/src/Xanthous/Entities/Entities.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Entities.hs-boot (renamed from users/grfn/xanthous/src/Xanthous/Entities/Entities.hs-boot) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Environment.hs (renamed from users/grfn/xanthous/src/Xanthous/Entities/Environment.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Item.hs (renamed from users/grfn/xanthous/src/Xanthous/Entities/Item.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Marker.hs (renamed from users/grfn/xanthous/src/Xanthous/Entities/Marker.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/RawTypes.hs (renamed from users/grfn/xanthous/src/Xanthous/Entities/RawTypes.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Raws.hs (renamed from users/grfn/xanthous/src/Xanthous/Entities/Raws.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Raws/broken-dagger.yaml (renamed from users/grfn/xanthous/src/Xanthous/Entities/Raws/broken-dagger.yaml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Raws/gormlak.yaml (renamed from users/grfn/xanthous/src/Xanthous/Entities/Raws/gormlak.yaml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Raws/husk.yaml (renamed from users/grfn/xanthous/src/Xanthous/Entities/Raws/husk.yaml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Raws/noodles.yaml (renamed from users/grfn/xanthous/src/Xanthous/Entities/Raws/noodles.yaml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Raws/ooze.yaml (renamed from users/grfn/xanthous/src/Xanthous/Entities/Raws/ooze.yaml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Raws/rock.yaml (renamed from users/grfn/xanthous/src/Xanthous/Entities/Raws/rock.yaml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Entities/Raws/stick.yaml (renamed from users/grfn/xanthous/src/Xanthous/Entities/Raws/stick.yaml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Game.hs (renamed from users/grfn/xanthous/src/Xanthous/Game.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Game/Arbitrary.hs (renamed from users/grfn/xanthous/src/Xanthous/Game/Arbitrary.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Game/Draw.hs (renamed from users/grfn/xanthous/src/Xanthous/Game/Draw.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Game/Env.hs (renamed from users/grfn/xanthous/src/Xanthous/Game/Env.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Game/Lenses.hs (renamed from users/grfn/xanthous/src/Xanthous/Game/Lenses.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Game/Memo.hs (renamed from users/grfn/xanthous/src/Xanthous/Game/Memo.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Game/Prompt.hs (renamed from users/grfn/xanthous/src/Xanthous/Game/Prompt.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Game/State.hs (renamed from users/grfn/xanthous/src/Xanthous/Game/State.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Generators/Level.hs (renamed from users/grfn/xanthous/src/Xanthous/Generators/Level.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Generators/Level/CaveAutomata.hs (renamed from users/grfn/xanthous/src/Xanthous/Generators/Level/CaveAutomata.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Generators/Level/Dungeon.hs (renamed from users/grfn/xanthous/src/Xanthous/Generators/Level/Dungeon.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Generators/Level/LevelContents.hs (renamed from users/grfn/xanthous/src/Xanthous/Generators/Level/LevelContents.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Generators/Level/Util.hs (renamed from users/grfn/xanthous/src/Xanthous/Generators/Level/Util.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Generators/Level/Village.hs (renamed from users/grfn/xanthous/src/Xanthous/Generators/Level/Village.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Generators/Speech.hs (renamed from users/grfn/xanthous/src/Xanthous/Generators/Speech.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Messages.hs (renamed from users/grfn/xanthous/src/Xanthous/Messages.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Messages/Template.hs (renamed from users/grfn/xanthous/src/Xanthous/Messages/Template.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Monad.hs (renamed from users/grfn/xanthous/src/Xanthous/Monad.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Orphans.hs (renamed from users/grfn/xanthous/src/Xanthous/Orphans.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Physics.hs (renamed from users/grfn/xanthous/src/Xanthous/Physics.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Prelude.hs (renamed from users/grfn/xanthous/src/Xanthous/Prelude.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Random.hs (renamed from users/grfn/xanthous/src/Xanthous/Random.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Util.hs (renamed from users/grfn/xanthous/src/Xanthous/Util.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Util/Comonad.hs (renamed from users/grfn/xanthous/src/Xanthous/Util/Comonad.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Util/Graph.hs (renamed from users/grfn/xanthous/src/Xanthous/Util/Graph.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Util/Graphics.hs (renamed from users/grfn/xanthous/src/Xanthous/Util/Graphics.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Util/Inflection.hs (renamed from users/grfn/xanthous/src/Xanthous/Util/Inflection.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Util/JSON.hs (renamed from users/grfn/xanthous/src/Xanthous/Util/JSON.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Util/Optparse.hs (renamed from users/grfn/xanthous/src/Xanthous/Util/Optparse.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/Util/QuickCheck.hs (renamed from users/grfn/xanthous/src/Xanthous/Util/QuickCheck.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/keybindings.yaml (renamed from users/grfn/xanthous/src/Xanthous/keybindings.yaml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/src/Xanthous/messages.yaml (renamed from users/grfn/xanthous/src/Xanthous/messages.yaml) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Spec.hs (renamed from users/grfn/xanthous/test/Spec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Test/Prelude.hs (renamed from users/grfn/xanthous/test/Test/Prelude.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/CommandSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/CommandSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Data/EntitiesSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Data/EntitiesSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Data/EntityCharSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Data/EntityCharSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Data/EntityMap/GraphicsSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Data/EntityMap/GraphicsSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Data/EntityMapSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Data/EntityMapSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Data/LevelsSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Data/LevelsSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Data/MemoSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Data/MemoSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Data/NestedMapSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Data/NestedMapSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/DataSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/DataSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Entities/CharacterSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Entities/CharacterSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Entities/CommonSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Entities/CommonSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Entities/RawTypesSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Entities/RawTypesSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Entities/RawsSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Entities/RawsSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Game/PromptSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Game/PromptSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Game/StateSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Game/StateSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/GameSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/GameSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Generators/Level/UtilSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Generators/Level/UtilSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/MessageSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/MessageSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Messages/TemplateSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Messages/TemplateSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/OrphansSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/OrphansSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/RandomSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/RandomSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Util/GraphSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Util/GraphSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Util/GraphicsSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Util/GraphicsSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/Util/InflectionSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/Util/InflectionSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/test/Xanthous/UtilSpec.hs (renamed from users/grfn/xanthous/test/Xanthous/UtilSpec.hs) | 0 | ||||
-rw-r--r-- | users/aspen/xanthous/xanthous.cabal (renamed from users/grfn/xanthous/xanthous.cabal) | 0 | ||||
-rwxr-xr-x | users/grfn/keyboard/flash | 2 |
471 files changed, 58 insertions, 58 deletions
diff --git a/users/grfn/OWNERS b/users/aspen/OWNERS index 3dff20d574..3dff20d574 100644 --- a/users/grfn/OWNERS +++ b/users/aspen/OWNERS diff --git a/users/grfn/achilles/.envrc b/users/aspen/achilles/.envrc index b80e28b4b8..b80e28b4b8 100644 --- a/users/grfn/achilles/.envrc +++ b/users/aspen/achilles/.envrc diff --git a/users/grfn/achilles/.gitignore b/users/aspen/achilles/.gitignore index ea8c4bf7f3..ea8c4bf7f3 100644 --- a/users/grfn/achilles/.gitignore +++ b/users/aspen/achilles/.gitignore diff --git a/users/grfn/achilles/Cargo.lock b/users/aspen/achilles/Cargo.lock index 3c767db1e4..3c767db1e4 100644 --- a/users/grfn/achilles/Cargo.lock +++ b/users/aspen/achilles/Cargo.lock diff --git a/users/grfn/achilles/Cargo.toml b/users/aspen/achilles/Cargo.toml index f091399a0d..f091399a0d 100644 --- a/users/grfn/achilles/Cargo.toml +++ b/users/aspen/achilles/Cargo.toml diff --git a/users/grfn/achilles/ach/.gitignore b/users/aspen/achilles/ach/.gitignore index ac5296ebbd..ac5296ebbd 100644 --- a/users/grfn/achilles/ach/.gitignore +++ b/users/aspen/achilles/ach/.gitignore diff --git a/users/grfn/achilles/ach/Makefile b/users/aspen/achilles/ach/Makefile index 3a8cd2865e..3a8cd2865e 100644 --- a/users/grfn/achilles/ach/Makefile +++ b/users/aspen/achilles/ach/Makefile diff --git a/users/grfn/achilles/ach/externs.ach b/users/aspen/achilles/ach/externs.ach index faf8ce90e3..faf8ce90e3 100644 --- a/users/grfn/achilles/ach/externs.ach +++ b/users/aspen/achilles/ach/externs.ach diff --git a/users/grfn/achilles/ach/functions.ach b/users/aspen/achilles/ach/functions.ach index dc6e7a1f3e..dc6e7a1f3e 100644 --- a/users/grfn/achilles/ach/functions.ach +++ b/users/aspen/achilles/ach/functions.ach diff --git a/users/grfn/achilles/ach/simple.ach b/users/aspen/achilles/ach/simple.ach index 20f1677235..20f1677235 100644 --- a/users/grfn/achilles/ach/simple.ach +++ b/users/aspen/achilles/ach/simple.ach diff --git a/users/grfn/achilles/ach/units.ach b/users/aspen/achilles/ach/units.ach index 70635d978c..70635d978c 100644 --- a/users/grfn/achilles/ach/units.ach +++ b/users/aspen/achilles/ach/units.ach diff --git a/users/grfn/achilles/default.nix b/users/aspen/achilles/default.nix index 714be60728..714be60728 100644 --- a/users/grfn/achilles/default.nix +++ b/users/aspen/achilles/default.nix diff --git a/users/grfn/achilles/shell.nix b/users/aspen/achilles/shell.nix index 1434cf8a32..1434cf8a32 100644 --- a/users/grfn/achilles/shell.nix +++ b/users/aspen/achilles/shell.nix diff --git a/users/grfn/achilles/src/ast/hir.rs b/users/aspen/achilles/src/ast/hir.rs index cdfaef567d..cdfaef567d 100644 --- a/users/grfn/achilles/src/ast/hir.rs +++ b/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 index 5438d29d2c..5438d29d2c 100644 --- a/users/grfn/achilles/src/ast/mod.rs +++ b/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 index 9a71ac954e..9a71ac954e 100644 --- a/users/grfn/achilles/src/codegen/llvm.rs +++ b/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 index 8ef057dba0..8ef057dba0 100644 --- a/users/grfn/achilles/src/codegen/mod.rs +++ b/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 index 0bea482c14..0bea482c14 100644 --- a/users/grfn/achilles/src/commands/check.rs +++ b/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 index be8767575a..be8767575a 100644 --- a/users/grfn/achilles/src/commands/compile.rs +++ b/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 index efd7399ed1..efd7399ed1 100644 --- a/users/grfn/achilles/src/commands/eval.rs +++ b/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 index fd0a822708..fd0a822708 100644 --- a/users/grfn/achilles/src/commands/mod.rs +++ b/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 index 59a5e46c46..59a5e46c46 100644 --- a/users/grfn/achilles/src/common/env.rs +++ b/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 index 51575a895e..51575a895e 100644 --- a/users/grfn/achilles/src/common/error.rs +++ b/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 index 8368a6dd18..8368a6dd18 100644 --- a/users/grfn/achilles/src/common/mod.rs +++ b/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 index 016e9f6ed9..016e9f6ed9 100644 --- a/users/grfn/achilles/src/common/namer.rs +++ b/users/aspen/achilles/src/common/namer.rs diff --git a/users/grfn/achilles/src/compiler.rs b/users/aspen/achilles/src/compiler.rs index 45b215473d..45b215473d 100644 --- a/users/grfn/achilles/src/compiler.rs +++ b/users/aspen/achilles/src/compiler.rs diff --git a/users/grfn/achilles/src/interpreter/error.rs b/users/aspen/achilles/src/interpreter/error.rs index 268d6f479a..268d6f479a 100644 --- a/users/grfn/achilles/src/interpreter/error.rs +++ b/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 index 70df7a0724..70df7a0724 100644 --- a/users/grfn/achilles/src/interpreter/mod.rs +++ b/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 index 272d1167a3..272d1167a3 100644 --- a/users/grfn/achilles/src/interpreter/value.rs +++ b/users/aspen/achilles/src/interpreter/value.rs diff --git a/users/grfn/achilles/src/main.rs b/users/aspen/achilles/src/main.rs index 5ae1b59b3a..5ae1b59b3a 100644 --- a/users/grfn/achilles/src/main.rs +++ b/users/aspen/achilles/src/main.rs diff --git a/users/grfn/achilles/src/parser/expr.rs b/users/aspen/achilles/src/parser/expr.rs index b18ce4a0dc..b18ce4a0dc 100644 --- a/users/grfn/achilles/src/parser/expr.rs +++ b/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 index 406e5c0e69..406e5c0e69 100644 --- a/users/grfn/achilles/src/parser/macros.rs +++ b/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 index e088cbca10..e088cbca10 100644 --- a/users/grfn/achilles/src/parser/mod.rs +++ b/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 index b80f0e0860..b80f0e0860 100644 --- a/users/grfn/achilles/src/parser/type_.rs +++ b/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 index bb53fb7fff..bb53fb7fff 100644 --- a/users/grfn/achilles/src/parser/util.rs +++ b/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 index 872c449eb0..872c449eb0 100644 --- a/users/grfn/achilles/src/passes/hir/mod.rs +++ b/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 index 251a988f4f..251a988f4f 100644 --- a/users/grfn/achilles/src/passes/hir/monomorphize.rs +++ b/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 index 85ee1cce48..85ee1cce48 100644 --- a/users/grfn/achilles/src/passes/hir/strip_positive_units.rs +++ b/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 index 306869bef1..306869bef1 100644 --- a/users/grfn/achilles/src/passes/mod.rs +++ b/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 index 5825bab1fb..5825bab1fb 100644 --- a/users/grfn/achilles/src/tc/mod.rs +++ b/users/aspen/achilles/src/tc/mod.rs diff --git a/users/grfn/achilles/tests/compile.rs b/users/aspen/achilles/tests/compile.rs index 0f1086bfd8..0f1086bfd8 100644 --- a/users/grfn/achilles/tests/compile.rs +++ b/users/aspen/achilles/tests/compile.rs diff --git a/users/grfn/bbbg/.clj-kondo/config.edn b/users/aspen/bbbg/.clj-kondo/config.edn index 8faddb77ec..8faddb77ec 100644 --- a/users/grfn/bbbg/.clj-kondo/config.edn +++ b/users/aspen/bbbg/.clj-kondo/config.edn diff --git a/users/grfn/bbbg/.envrc b/users/aspen/bbbg/.envrc index 051d09d292..051d09d292 100644 --- a/users/grfn/bbbg/.envrc +++ b/users/aspen/bbbg/.envrc diff --git a/users/grfn/bbbg/.gitignore b/users/aspen/bbbg/.gitignore index 99dbfc4436..99dbfc4436 100644 --- a/users/grfn/bbbg/.gitignore +++ b/users/aspen/bbbg/.gitignore diff --git a/users/grfn/bbbg/Makefile b/users/aspen/bbbg/Makefile index fc45477984..fc45477984 100644 --- a/users/grfn/bbbg/Makefile +++ b/users/aspen/bbbg/Makefile diff --git a/users/grfn/bbbg/README.md b/users/aspen/bbbg/README.md index a7181333b9..41f59319cb 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 index c8a6dd156d..c8a6dd156d 100644 --- a/users/grfn/bbbg/arion-compose.nix +++ b/users/aspen/bbbg/arion-compose.nix diff --git a/users/grfn/bbbg/arion-pkgs.nix b/users/aspen/bbbg/arion-pkgs.nix index c6d603be2a..c6d603be2a 100644 --- a/users/grfn/bbbg/arion-pkgs.nix +++ b/users/aspen/bbbg/arion-pkgs.nix diff --git a/users/grfn/bbbg/default.nix b/users/aspen/bbbg/default.nix index 6afb68353c..6afb68353c 100644 --- a/users/grfn/bbbg/default.nix +++ b/users/aspen/bbbg/default.nix diff --git a/users/grfn/bbbg/deps.edn b/users/aspen/bbbg/deps.edn index 39ce843c22..39ce843c22 100644 --- a/users/grfn/bbbg/deps.edn +++ b/users/aspen/bbbg/deps.edn diff --git a/users/grfn/bbbg/deps.nix b/users/aspen/bbbg/deps.nix index 02f5ecb468..02f5ecb468 100644 --- a/users/grfn/bbbg/deps.nix +++ b/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 index c30e328ffa..c30e328ffa 100644 --- a/users/grfn/bbbg/env/dev/bbbg-signup/env.clj +++ b/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 index 7aa21978bb..7aa21978bb 100644 --- a/users/grfn/bbbg/env/dev/logback.xml +++ b/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 index 46e8cd67e3..46e8cd67e3 100644 --- a/users/grfn/bbbg/env/prod/bbbg-signup/env.clj +++ b/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 index b81118ed6b..b81118ed6b 100644 --- a/users/grfn/bbbg/env/prod/logback.xml +++ b/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 index 352147a6d0..352147a6d0 100644 --- a/users/grfn/bbbg/env/test/bbbg-signup/env.clj +++ b/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 index 8554f3d0ed..8554f3d0ed 100644 --- a/users/grfn/bbbg/env/test/logback.xml +++ b/users/aspen/bbbg/env/test/logback.xml diff --git a/users/grfn/bbbg/module.nix b/users/aspen/bbbg/module.nix index 70bb2c77e4..c5bacdf4d7 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 index 012c0985f1..012c0985f1 100644 --- a/users/grfn/bbbg/pom.xml +++ b/users/aspen/bbbg/pom.xml diff --git a/users/grfn/bbbg/resources/base.css b/users/aspen/bbbg/resources/base.css index c86c3f24f0..c86c3f24f0 100644 --- a/users/grfn/bbbg/resources/base.css +++ b/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 index 69b818a4f4..69b818a4f4 100644 --- a/users/grfn/bbbg/resources/migrations/20211212165646-init-schema.down.sql +++ b/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 index 9718d84748..9718d84748 100644 --- a/users/grfn/bbbg/resources/migrations/20211212165646-init-schema.up.sql +++ b/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 index 936abf6c7d..936abf6c7d 100644 --- a/users/grfn/bbbg/resources/migrations/20211220002229-add-attendee-checks.down.sql +++ b/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 index 5e82dcb171..5e82dcb171 100644 --- a/users/grfn/bbbg/resources/migrations/20211220002229-add-attendee-checks.up.sql +++ b/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 index cbee0c00ac..cbee0c00ac 100644 --- 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 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 index 5895cad56b..5895cad56b 100644 --- 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 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 index 1c83d8518d..1c83d8518d 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff Binary files differdiff --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 index 9dc5c7f158..9dc5c7f158 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff2 +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500.woff2 Binary files differdiff --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 index 71476d858f..71476d858f 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff Binary files differdiff --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 index 0fb9838c9d..0fb9838c9d 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff2 +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-500italic.woff2 Binary files differdiff --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 index e7f8a31ba3..e7f8a31ba3 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff Binary files differdiff --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 index 29cc1a9734..29cc1a9734 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff2 +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-600.woff2 Binary files differdiff --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 index 79203dd780..79203dd780 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff Binary files differdiff --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 index 0abb707aed..0abb707aed 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff2 +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800.woff2 Binary files differdiff --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 index 65415571a7..65415571a7 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff Binary files differdiff --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 index 674e6eabe7..674e6eabe7 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff2 +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-800italic.woff2 Binary files differdiff --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 index 67f1e85379..67f1e85379 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff Binary files differdiff --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 index 469aede09c..469aede09c 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff2 +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-italic.woff2 Binary files differdiff --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 index 676a065e24..676a065e24 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff Binary files differdiff --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 index 70788c2732..70788c2732 100644 --- a/users/grfn/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff2 +++ b/users/aspen/bbbg/resources/public/fonts/montserrat-v15-latin-regular.woff2 Binary files differdiff --git a/users/grfn/bbbg/resources/public/main.js b/users/aspen/bbbg/resources/public/main.js index 87c0b64d0a..87c0b64d0a 100644 --- a/users/grfn/bbbg/resources/public/main.js +++ b/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 index 1f53798bb4..1f53798bb4 100644 --- a/users/grfn/bbbg/resources/public/robots.txt +++ b/users/aspen/bbbg/resources/public/robots.txt diff --git a/users/grfn/bbbg/shell.nix b/users/aspen/bbbg/shell.nix index e26569657f..c253a2b9ba 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 index 49a6d621de..49a6d621de 100644 --- a/users/grfn/bbbg/src/bbbg/attendee.clj +++ b/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 index f34c41198e..f34c41198e 100644 --- a/users/grfn/bbbg/src/bbbg/attendee_check.clj +++ b/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 index 632774d5cd..632774d5cd 100644 --- a/users/grfn/bbbg/src/bbbg/core.clj +++ b/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 index 5bbf88925a..5bbf88925a 100644 --- a/users/grfn/bbbg/src/bbbg/db.clj +++ b/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 index da5ee29321..da5ee29321 100644 --- a/users/grfn/bbbg/src/bbbg/db/attendee.clj +++ b/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 index 492f786bd6..492f786bd6 100644 --- a/users/grfn/bbbg/src/bbbg/db/attendee_check.clj +++ b/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 index 1b5a4e11ec..1b5a4e11ec 100644 --- a/users/grfn/bbbg/src/bbbg/db/event.clj +++ b/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 index 31411e5d45..31411e5d45 100644 --- a/users/grfn/bbbg/src/bbbg/db/event_attendee.clj +++ b/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 index 700105ef63..700105ef63 100644 --- a/users/grfn/bbbg/src/bbbg/db/user.clj +++ b/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 index e854ec1d14..e854ec1d14 100644 --- a/users/grfn/bbbg/src/bbbg/discord.clj +++ b/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 index 35bc580e39..35bc580e39 100644 --- a/users/grfn/bbbg/src/bbbg/discord/auth.clj +++ b/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 index aa0578f354..aa0578f354 100644 --- a/users/grfn/bbbg/src/bbbg/event.clj +++ b/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 index 7b6b4c2764..7b6b4c2764 100644 --- a/users/grfn/bbbg/src/bbbg/event_attendee.clj +++ b/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 index d7307c4067..d7307c4067 100644 --- a/users/grfn/bbbg/src/bbbg/handlers/attendee_checks.clj +++ b/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 index ce84b88e97..ce84b88e97 100644 --- a/users/grfn/bbbg/src/bbbg/handlers/attendees.clj +++ b/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 index caa679ee87..caa679ee87 100644 --- a/users/grfn/bbbg/src/bbbg/handlers/core.clj +++ b/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 index 6f6d6f3585..6f6d6f3585 100644 --- a/users/grfn/bbbg/src/bbbg/handlers/events.clj +++ b/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 index 17d4875536..17d4875536 100644 --- a/users/grfn/bbbg/src/bbbg/handlers/home.clj +++ b/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 index ed1d7644f5..ed1d7644f5 100644 --- a/users/grfn/bbbg/src/bbbg/handlers/signup_form.clj +++ b/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 index d13d63e16c..bbf8678976 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 index 945d681c6f..945d681c6f 100644 --- a/users/grfn/bbbg/src/bbbg/meetup_user.clj +++ b/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 index a860ae6076..a860ae6076 100644 --- a/users/grfn/bbbg/src/bbbg/styles.clj +++ b/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 index f48c8d7338..f48c8d7338 100644 --- a/users/grfn/bbbg/src/bbbg/user.clj +++ b/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 index d458aa5592..d458aa5592 100644 --- a/users/grfn/bbbg/src/bbbg/util/core.clj +++ b/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 index 88f1b50caa..88f1b50caa 100644 --- a/users/grfn/bbbg/src/bbbg/util/dev_secrets.clj +++ b/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 index 40716632a3..40716632a3 100644 --- a/users/grfn/bbbg/src/bbbg/util/display.clj +++ b/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 index 89ac926699..89ac926699 100644 --- a/users/grfn/bbbg/src/bbbg/util/spec.clj +++ b/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 index 988959fd06..988959fd06 100644 --- a/users/grfn/bbbg/src/bbbg/util/sql.clj +++ b/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 index 0278f89f5e..0278f89f5e 100644 --- a/users/grfn/bbbg/src/bbbg/util/time.clj +++ b/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 index a44b21d4cb..a44b21d4cb 100644 --- a/users/grfn/bbbg/src/bbbg/views/flash.clj +++ b/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 index f9755577a5..f9755577a5 100644 --- a/users/grfn/bbbg/src/bbbg/web.clj +++ b/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 index d7d698a58c..d7d698a58c 100644 --- a/users/grfn/bbbg/test/bbbg/meetup/import_test.clj +++ b/users/aspen/bbbg/test/bbbg/meetup/import_test.clj diff --git a/users/grfn/bbbg/tf.nix b/users/aspen/bbbg/tf.nix index d5b19d9ebc..e6ea69dfd0 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 index 0bcc922635..0bcc922635 100644 --- a/users/grfn/emacs.d/+bindings.el +++ b/users/aspen/emacs.d/+bindings.el diff --git a/users/grfn/emacs.d/+commands.el b/users/aspen/emacs.d/+commands.el index 518f185cb9..518f185cb9 100644 --- a/users/grfn/emacs.d/+commands.el +++ b/users/aspen/emacs.d/+commands.el diff --git a/users/grfn/emacs.d/+private.el.gpg b/users/aspen/emacs.d/+private.el.gpg index 6273c67d6e..6273c67d6e 100644 --- a/users/grfn/emacs.d/+private.el.gpg +++ b/users/aspen/emacs.d/+private.el.gpg Binary files differdiff --git a/users/grfn/emacs.d/.gitignore b/users/aspen/emacs.d/.gitignore index 1fd0e39887..1fd0e39887 100644 --- a/users/grfn/emacs.d/.gitignore +++ b/users/aspen/emacs.d/.gitignore diff --git a/users/grfn/emacs.d/autoload/evil.el b/users/aspen/emacs.d/autoload/evil.el index 319c93c05e..319c93c05e 100644 --- a/users/grfn/emacs.d/autoload/evil.el +++ b/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 index 87b2236d12..87b2236d12 100644 --- a/users/grfn/emacs.d/autoload/hlissner.el +++ b/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 index be4161441d..be4161441d 100644 --- a/users/grfn/emacs.d/clocked-in-elt.el +++ b/users/aspen/emacs.d/clocked-in-elt.el diff --git a/users/grfn/emacs.d/clojure.el b/users/aspen/emacs.d/clojure.el index f001a3e12b..f001a3e12b 100644 --- a/users/grfn/emacs.d/clojure.el +++ b/users/aspen/emacs.d/clojure.el diff --git a/users/grfn/emacs.d/company-sql.el b/users/aspen/emacs.d/company-sql.el index e623aa2de1..e623aa2de1 100644 --- a/users/grfn/emacs.d/company-sql.el +++ b/users/aspen/emacs.d/company-sql.el diff --git a/users/grfn/emacs.d/config.el b/users/aspen/emacs.d/config.el index 6398feace8..6398feace8 100644 --- a/users/grfn/emacs.d/config.el +++ b/users/aspen/emacs.d/config.el diff --git a/users/grfn/emacs.d/cpp.el b/users/aspen/emacs.d/cpp.el index 5b5dc8ead6..6068736eca 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 index 70360d0072..70360d0072 100644 --- a/users/grfn/emacs.d/email.el +++ b/users/aspen/emacs.d/email.el diff --git a/users/grfn/emacs.d/github-org.el b/users/aspen/emacs.d/github-org.el index f4f9d2e370..f4f9d2e370 100644 --- a/users/grfn/emacs.d/github-org.el +++ b/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 index 9bb12c61aa..9bb12c61aa 100644 --- a/users/grfn/emacs.d/google-c-style.el +++ b/users/aspen/emacs.d/google-c-style.el diff --git a/users/grfn/emacs.d/grid.el b/users/aspen/emacs.d/grid.el index 75776a38cd..75776a38cd 100644 --- a/users/grfn/emacs.d/grid.el +++ b/users/aspen/emacs.d/grid.el diff --git a/users/grfn/emacs.d/init.el b/users/aspen/emacs.d/init.el index 46530ab950..46530ab950 100644 --- a/users/grfn/emacs.d/init.el +++ b/users/aspen/emacs.d/init.el diff --git a/users/grfn/emacs.d/irc.el b/users/aspen/emacs.d/irc.el index 117869599d..117869599d 100644 --- a/users/grfn/emacs.d/irc.el +++ b/users/aspen/emacs.d/irc.el diff --git a/users/grfn/emacs.d/lisp.el b/users/aspen/emacs.d/lisp.el index c45cc7e6e3..c45cc7e6e3 100644 --- a/users/grfn/emacs.d/lisp.el +++ b/users/aspen/emacs.d/lisp.el diff --git a/users/grfn/emacs.d/nix-clangd.sh b/users/aspen/emacs.d/nix-clangd.sh index 16f6252d8b..16f6252d8b 100755 --- a/users/grfn/emacs.d/nix-clangd.sh +++ b/users/aspen/emacs.d/nix-clangd.sh diff --git a/users/grfn/emacs.d/nix.el b/users/aspen/emacs.d/nix.el index ec5b474af2..ec5b474af2 100644 --- a/users/grfn/emacs.d/nix.el +++ b/users/aspen/emacs.d/nix.el diff --git a/users/grfn/emacs.d/org-alerts.el b/users/aspen/emacs.d/org-alerts.el index 8e6c3e0417..8e6c3e0417 100644 --- a/users/grfn/emacs.d/org-alerts.el +++ b/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 index c26207ad09..b8d88d3195 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 index 3e315c5e60..3e315c5e60 100644 --- a/users/grfn/emacs.d/org-gcal.el +++ b/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 index 9d3b3358a9..9d3b3358a9 100644 --- a/users/grfn/emacs.d/org-query.el +++ b/users/aspen/emacs.d/org-query.el diff --git a/users/grfn/emacs.d/packages.el b/users/aspen/emacs.d/packages.el index 15a3843f4d..15a3843f4d 100644 --- a/users/grfn/emacs.d/packages.el +++ b/users/aspen/emacs.d/packages.el diff --git a/users/grfn/emacs.d/rust.el b/users/aspen/emacs.d/rust.el index 9988d16a53..9988d16a53 100644 --- a/users/grfn/emacs.d/rust.el +++ b/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 index ab65a912a8..ab65a912a8 100644 --- a/users/grfn/emacs.d/show-matching-paren.el +++ b/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 index b5bd4db748..b5bd4db748 100644 --- a/users/grfn/emacs.d/slack-snippets.el +++ b/users/aspen/emacs.d/slack-snippets.el diff --git a/users/grfn/emacs.d/slack.el b/users/aspen/emacs.d/slack.el index 54d3b40b09..54d3b40b09 100644 --- a/users/grfn/emacs.d/slack.el +++ b/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 index 8a2854d759..8a2854d759 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/annotation +++ b/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 index cbb1646e41..cbb1646e41 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/benchmark-module +++ b/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 index fdd8250d86..fdd8250d86 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/header +++ b/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 index 68863f7054..68863f7054 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/hedgehog-generator +++ b/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 index bf39a2a3ee..bf39a2a3ee 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/hedgehog-property +++ b/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 index f25a9b8d40..f25a9b8d40 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/hlint +++ b/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 index 4a7fca2c2f..4a7fca2c2f 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/import-i +++ b/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 index 6e17b83d71..6e17b83d71 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/inl +++ b/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 index 1beafbe50b..1beafbe50b 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/inline +++ b/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 index 6f84720f45..6f84720f45 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/language pragma +++ b/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 index b22ea3d2e8..b22ea3d2e8 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/lens.field +++ b/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 index 4554d33f9b..4554d33f9b 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/module +++ b/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 index fccff1d66f..fccff1d66f 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/shut up, hlint +++ b/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 index bf6a66f8a3..bf6a66f8a3 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/test-group +++ b/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 index 036b0ae998..036b0ae998 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/test-module +++ b/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 index 7bcd99b571..7bcd99b571 100644 --- a/users/grfn/emacs.d/snippets/haskell-mode/undefined +++ b/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 index ef8d1a3863..ef8d1a3863 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/action-type +++ b/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 index 4569b65831..4569b65831 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/before +++ b/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 index d83809f3c3..d83809f3c3 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/context +++ b/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 index bd0198181d..bd0198181d 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/describe +++ b/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 index eba41ef330..eba41ef330 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/expect +++ b/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 index b423044b44..b423044b44 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/function +++ b/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 index 3e303764cb..3e303764cb 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/header +++ b/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 index a451cfc08a..a451cfc08a 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/it +++ b/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 index 00da312e10..00da312e10 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/it-pending +++ b/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 index dc79819d89..dc79819d89 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/module +++ b/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 index 0bb0f02436..0bb0f02436 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/record +++ b/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 index 938d490a74..938d490a74 100644 --- a/users/grfn/emacs.d/snippets/js2-mode/test +++ b/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 index d2447e4b5a..d2447e4b5a 100644 --- a/users/grfn/emacs.d/snippets/nix-mode/fetchFromGitHub +++ b/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 index 0a74c21e18..0a74c21e18 100644 --- a/users/grfn/emacs.d/snippets/nix-mode/pythonPackage +++ b/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 index bc640e5ab0..bc640e5ab0 100644 --- a/users/grfn/emacs.d/snippets/nix-mode/sha256 +++ b/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 index b5d43fd6bc..b5d43fd6bc 100644 --- a/users/grfn/emacs.d/snippets/org-mode/SQL source block +++ b/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 index b4db0f433a..b4db0f433a 100644 --- a/users/grfn/emacs.d/snippets/org-mode/combat +++ b/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 index 297529cdac..297529cdac 100644 --- a/users/grfn/emacs.d/snippets/org-mode/date +++ b/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 index fde469276c..fde469276c 100644 --- a/users/grfn/emacs.d/snippets/org-mode/date-time +++ b/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 index a43bc95cc3..a43bc95cc3 100644 --- a/users/grfn/emacs.d/snippets/org-mode/description +++ b/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 index e5be85d6b3..e5be85d6b3 100644 --- a/users/grfn/emacs.d/snippets/org-mode/nologdone +++ b/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 index 247ae51b0b..247ae51b0b 100644 --- a/users/grfn/emacs.d/snippets/org-mode/python source block +++ b/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 index 1bdbdfa5dc..1bdbdfa5dc 100644 --- a/users/grfn/emacs.d/snippets/org-mode/reveal +++ b/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 index 37f2dd31ca..37f2dd31ca 100644 --- a/users/grfn/emacs.d/snippets/org-mode/transaction +++ b/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 index 75fd19b641..75fd19b641 100644 --- a/users/grfn/emacs.d/snippets/prolog-mode/use-module +++ b/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 index 47e83850d5..47e83850d5 100644 --- a/users/grfn/emacs.d/snippets/python-mode/add_column +++ b/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 index 4f96748572..4f96748572 100644 --- a/users/grfn/emacs.d/snippets/python-mode/decorate +++ b/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 index 71d99dddc6..71d99dddc6 100644 --- a/users/grfn/emacs.d/snippets/python-mode/dunder +++ b/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 index 1495cc91d9..1495cc91d9 100644 --- a/users/grfn/emacs.d/snippets/python-mode/name +++ b/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 index aba801c6ba..aba801c6ba 100644 --- a/users/grfn/emacs.d/snippets/python-mode/op.get_bind.execute +++ b/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 index 41c6f87cbf..41c6f87cbf 100644 --- a/users/grfn/emacs.d/snippets/python-mode/pdb +++ b/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] index fea942a337..fea942a337 100644 --- a/users/grfn/emacs.d/snippets/rust-mode/#[macro_use] +++ b/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 index 2352d7b56b..2352d7b56b 100644 --- a/users/grfn/emacs.d/snippets/rust-mode/async test +++ b/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 index 9ec4307538..9ec4307538 100644 --- a/users/grfn/emacs.d/snippets/rust-mode/benchmark +++ b/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 index be12af4911..be12af4911 100644 --- a/users/grfn/emacs.d/snippets/rust-mode/proptest +++ b/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 index bfa2ca2d18..bfa2ca2d18 100644 --- a/users/grfn/emacs.d/snippets/rust-mode/test-module +++ b/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 index 0a476ab586..0a476ab586 100644 --- a/users/grfn/emacs.d/snippets/rust-mode/tests +++ b/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 index d38ffceafb..d38ffceafb 100644 --- a/users/grfn/emacs.d/snippets/snippet-mode/indent +++ b/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 index 6acc46ff39..6acc46ff39 100644 --- a/users/grfn/emacs.d/snippets/sql-mode/count(*) group by +++ b/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 index 14822f1a05..14822f1a05 100644 --- a/users/grfn/emacs.d/snippets/terraform-mode/variable +++ b/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 index 7b94311470..7b94311470 100644 --- a/users/grfn/emacs.d/snippets/text-mode/date +++ b/users/aspen/emacs.d/snippets/text-mode/date diff --git a/users/grfn/emacs.d/splitjoin.el b/users/aspen/emacs.d/splitjoin.el index dbc9704d79..dbc9704d79 100644 --- a/users/grfn/emacs.d/splitjoin.el +++ b/users/aspen/emacs.d/splitjoin.el diff --git a/users/grfn/emacs.d/sql-strings.el b/users/aspen/emacs.d/sql-strings.el index eef397a24e..eef397a24e 100644 --- a/users/grfn/emacs.d/sql-strings.el +++ b/users/aspen/emacs.d/sql-strings.el diff --git a/users/grfn/emacs.d/terraform.el b/users/aspen/emacs.d/terraform.el index 2d69c9bad9..2d69c9bad9 100644 --- a/users/grfn/emacs.d/terraform.el +++ b/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 index 6495a1a595..6495a1a595 100644 --- a/users/grfn/emacs.d/tests/splitjoin_test.el +++ b/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 index ae00b6b5fc..ae00b6b5fc 100644 --- a/users/grfn/emacs.d/themes/grfn-solarized-light-theme.el +++ b/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 index 21192753a2..21192753a2 100644 --- a/users/grfn/emacs.d/utils.el +++ b/users/aspen/emacs.d/utils.el diff --git a/users/grfn/emacs.d/vterm.el b/users/aspen/emacs.d/vterm.el index a7fdea46da..a7fdea46da 100644 --- a/users/grfn/emacs.d/vterm.el +++ b/users/aspen/emacs.d/vterm.el diff --git a/users/grfn/keyboard/.gitignore b/users/aspen/keyboard/.gitignore index b2be92b7db..b2be92b7db 100644 --- a/users/grfn/keyboard/.gitignore +++ b/users/aspen/keyboard/.gitignore diff --git a/users/grfn/keyboard/README.org b/users/aspen/keyboard/README.org index b085883a10..b085883a10 100644 --- a/users/grfn/keyboard/README.org +++ b/users/aspen/keyboard/README.org diff --git a/users/grfn/keyboard/default.nix b/users/aspen/keyboard/default.nix index 929ec7d628..929ec7d628 100644 --- a/users/grfn/keyboard/default.nix +++ b/users/aspen/keyboard/default.nix diff --git a/users/aspen/keyboard/flash b/users/aspen/keyboard/flash new file mode 100755 index 0000000000..ab6557a44c --- /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 index 316c435fed..316c435fed 100644 --- a/users/grfn/keyboard/increase-tapping-delay.patch +++ b/users/aspen/keyboard/increase-tapping-delay.patch diff --git a/users/grfn/keyboard/keymap.c b/users/aspen/keyboard/keymap.c index 741b7b2cfd..741b7b2cfd 100644 --- a/users/grfn/keyboard/keymap.c +++ b/users/aspen/keyboard/keymap.c diff --git a/users/grfn/keys.nix b/users/aspen/keys.nix index 29d5a3fa63..29d5a3fa63 100644 --- a/users/grfn/keys.nix +++ b/users/aspen/keys.nix diff --git a/users/grfn/org-clubhouse/.gitignore b/users/aspen/org-clubhouse/.gitignore index 2a7dd97deb..2a7dd97deb 100644 --- a/users/grfn/org-clubhouse/.gitignore +++ b/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 index f15e387d54..f15e387d54 100644 --- a/users/grfn/org-clubhouse/CODE_OF_CONDUCT.org +++ b/users/aspen/org-clubhouse/CODE_OF_CONDUCT.org diff --git a/users/grfn/org-clubhouse/LICENSE b/users/aspen/org-clubhouse/LICENSE index 1777f0fac3..1777f0fac3 100644 --- a/users/grfn/org-clubhouse/LICENSE +++ b/users/aspen/org-clubhouse/LICENSE diff --git a/users/grfn/org-clubhouse/README.org b/users/aspen/org-clubhouse/README.org index 9cd8fbe892..9cd8fbe892 100644 --- a/users/grfn/org-clubhouse/README.org +++ b/users/aspen/org-clubhouse/README.org diff --git a/users/grfn/org-clubhouse/org-clubhouse.el b/users/aspen/org-clubhouse/org-clubhouse.el index e6e29b5751..e6e29b5751 100644 --- a/users/grfn/org-clubhouse/org-clubhouse.el +++ b/users/aspen/org-clubhouse/org-clubhouse.el diff --git a/users/grfn/pkgs/cargo-hakari.nix b/users/aspen/pkgs/cargo-hakari.nix index b6f4e7e400..b6f4e7e400 100644 --- a/users/grfn/pkgs/cargo-hakari.nix +++ b/users/aspen/pkgs/cargo-hakari.nix diff --git a/users/grfn/pkgs/cargo-nextest.nix b/users/aspen/pkgs/cargo-nextest.nix index dbf3bd7eef..dbf3bd7eef 100644 --- a/users/grfn/pkgs/cargo-nextest.nix +++ b/users/aspen/pkgs/cargo-nextest.nix diff --git a/users/grfn/pkgs/notmuch-extract-patch.nix b/users/aspen/pkgs/notmuch-extract-patch.nix index 7f00f925ec..7f00f925ec 100644 --- a/users/grfn/pkgs/notmuch-extract-patch.nix +++ b/users/aspen/pkgs/notmuch-extract-patch.nix diff --git a/users/grfn/resume/chimera.png b/users/aspen/resume/chimera.png index 6dde989c53..6dde989c53 100644 --- a/users/grfn/resume/chimera.png +++ b/users/aspen/resume/chimera.png Binary files differdiff --git a/users/grfn/resume/collection.sty b/users/aspen/resume/collection.sty index 4f1540a9d2..4f1540a9d2 100644 --- a/users/grfn/resume/collection.sty +++ b/users/aspen/resume/collection.sty diff --git a/users/grfn/resume/default.nix b/users/aspen/resume/default.nix index 4454e74c82..4454e74c82 100644 --- a/users/grfn/resume/default.nix +++ b/users/aspen/resume/default.nix diff --git a/users/grfn/resume/helvetica.sty b/users/aspen/resume/helvetica.sty index dacc129a10..dacc129a10 100644 --- a/users/grfn/resume/helvetica.sty +++ b/users/aspen/resume/helvetica.sty diff --git a/users/grfn/resume/moderncv.cls b/users/aspen/resume/moderncv.cls index 3248907133..3248907133 100644 --- a/users/grfn/resume/moderncv.cls +++ b/users/aspen/resume/moderncv.cls diff --git a/users/grfn/resume/moderncvcolorblack.sty b/users/aspen/resume/moderncvcolorblack.sty index 3a6e1477f3..3a6e1477f3 100644 --- a/users/grfn/resume/moderncvcolorblack.sty +++ b/users/aspen/resume/moderncvcolorblack.sty diff --git a/users/grfn/resume/moderncvcolorblue.sty b/users/aspen/resume/moderncvcolorblue.sty index 7b949c704a..7b949c704a 100644 --- a/users/grfn/resume/moderncvcolorblue.sty +++ b/users/aspen/resume/moderncvcolorblue.sty diff --git a/users/grfn/resume/moderncvcolorgreen.sty b/users/aspen/resume/moderncvcolorgreen.sty index 4de7f848a0..4de7f848a0 100644 --- a/users/grfn/resume/moderncvcolorgreen.sty +++ b/users/aspen/resume/moderncvcolorgreen.sty diff --git a/users/grfn/resume/moderncvcolorgrey.sty b/users/aspen/resume/moderncvcolorgrey.sty index 9018726a23..9018726a23 100644 --- a/users/grfn/resume/moderncvcolorgrey.sty +++ b/users/aspen/resume/moderncvcolorgrey.sty diff --git a/users/grfn/resume/moderncvcolororange.sty b/users/aspen/resume/moderncvcolororange.sty index 134ae24011..134ae24011 100644 --- a/users/grfn/resume/moderncvcolororange.sty +++ b/users/aspen/resume/moderncvcolororange.sty diff --git a/users/grfn/resume/moderncvcolorpurple.sty b/users/aspen/resume/moderncvcolorpurple.sty index d3dc5345b0..d3dc5345b0 100644 --- a/users/grfn/resume/moderncvcolorpurple.sty +++ b/users/aspen/resume/moderncvcolorpurple.sty diff --git a/users/grfn/resume/moderncvcolorred.sty b/users/aspen/resume/moderncvcolorred.sty index 681181997d..681181997d 100644 --- a/users/grfn/resume/moderncvcolorred.sty +++ b/users/aspen/resume/moderncvcolorred.sty diff --git a/users/grfn/resume/moderncvcompatibility.sty b/users/aspen/resume/moderncvcompatibility.sty index 1fc53f2180..1fc53f2180 100644 --- a/users/grfn/resume/moderncvcompatibility.sty +++ b/users/aspen/resume/moderncvcompatibility.sty diff --git a/users/grfn/resume/moderncviconsletters.sty b/users/aspen/resume/moderncviconsletters.sty index 0a4e2864be..0a4e2864be 100644 --- a/users/grfn/resume/moderncviconsletters.sty +++ b/users/aspen/resume/moderncviconsletters.sty diff --git a/users/grfn/resume/moderncviconsmarvosym.sty b/users/aspen/resume/moderncviconsmarvosym.sty index eb1b1ec727..eb1b1ec727 100644 --- a/users/grfn/resume/moderncviconsmarvosym.sty +++ b/users/aspen/resume/moderncviconsmarvosym.sty diff --git a/users/grfn/resume/moderncvstylebanking.sty b/users/aspen/resume/moderncvstylebanking.sty index fb0b70fdcd..fb0b70fdcd 100644 --- a/users/grfn/resume/moderncvstylebanking.sty +++ b/users/aspen/resume/moderncvstylebanking.sty diff --git a/users/grfn/resume/moderncvstylecasual.sty b/users/aspen/resume/moderncvstylecasual.sty index f8cf856d1a..f8cf856d1a 100644 --- a/users/grfn/resume/moderncvstylecasual.sty +++ b/users/aspen/resume/moderncvstylecasual.sty diff --git a/users/grfn/resume/moderncvstyleclassic.sty b/users/aspen/resume/moderncvstyleclassic.sty index 63cf97aa3b..63cf97aa3b 100644 --- a/users/grfn/resume/moderncvstyleclassic.sty +++ b/users/aspen/resume/moderncvstyleclassic.sty diff --git a/users/grfn/resume/moderncvstyleempty.sty b/users/aspen/resume/moderncvstyleempty.sty index 85932464d1..85932464d1 100644 --- a/users/grfn/resume/moderncvstyleempty.sty +++ b/users/aspen/resume/moderncvstyleempty.sty diff --git a/users/grfn/resume/moderncvstyleoldstyle.sty b/users/aspen/resume/moderncvstyleoldstyle.sty index ff732f4e2a..ff732f4e2a 100644 --- a/users/grfn/resume/moderncvstyleoldstyle.sty +++ b/users/aspen/resume/moderncvstyleoldstyle.sty diff --git a/users/grfn/resume/picture.png b/users/aspen/resume/picture.png index 63b21b5320..63b21b5320 100644 --- a/users/grfn/resume/picture.png +++ b/users/aspen/resume/picture.png Binary files differdiff --git a/users/grfn/resume/resume.tex b/users/aspen/resume/resume.tex index fb226c4ddf..fb226c4ddf 100644 --- a/users/grfn/resume/resume.tex +++ b/users/aspen/resume/resume.tex diff --git a/users/grfn/resume/tweaklist.sty b/users/aspen/resume/tweaklist.sty index adc9398932..adc9398932 100644 --- a/users/grfn/resume/tweaklist.sty +++ b/users/aspen/resume/tweaklist.sty diff --git a/users/grfn/secrets/.envrc b/users/aspen/secrets/.envrc index 051d09d292..051d09d292 100644 --- a/users/grfn/secrets/.envrc +++ b/users/aspen/secrets/.envrc diff --git a/users/grfn/secrets/bbbg.age b/users/aspen/secrets/bbbg.age index ebc0df2338..ebc0df2338 100644 --- a/users/grfn/secrets/bbbg.age +++ b/users/aspen/secrets/bbbg.age Binary files differdiff --git a/users/grfn/secrets/buildkite-ssh-key.age b/users/aspen/secrets/buildkite-ssh-key.age index d9587f11df..d9587f11df 100644 --- a/users/grfn/secrets/buildkite-ssh-key.age +++ b/users/aspen/secrets/buildkite-ssh-key.age Binary files differdiff --git a/users/grfn/secrets/buildkite-token.age b/users/aspen/secrets/buildkite-token.age index 320ee06c09..320ee06c09 100644 --- a/users/grfn/secrets/buildkite-token.age +++ b/users/aspen/secrets/buildkite-token.age Binary files differdiff --git a/users/grfn/secrets/cloudflare.age b/users/aspen/secrets/cloudflare.age index 4f42ee7821..4f42ee7821 100644 --- a/users/grfn/secrets/cloudflare.age +++ b/users/aspen/secrets/cloudflare.age diff --git a/users/grfn/secrets/ddclient-password.age b/users/aspen/secrets/ddclient-password.age index 8d25e3b539..8d25e3b539 100644 --- a/users/grfn/secrets/ddclient-password.age +++ b/users/aspen/secrets/ddclient-password.age Binary files differdiff --git a/users/grfn/secrets/default.nix b/users/aspen/secrets/default.nix index 26b1998f56..26b1998f56 100644 --- a/users/grfn/secrets/default.nix +++ b/users/aspen/secrets/default.nix diff --git a/users/grfn/secrets/secrets.nix b/users/aspen/secrets/secrets.nix index 5bfb1c3eb0..5bfb1c3eb0 100644 --- a/users/grfn/secrets/secrets.nix +++ b/users/aspen/secrets/secrets.nix diff --git a/users/grfn/secrets/shell.nix b/users/aspen/secrets/shell.nix index 6e70458d19..6e70458d19 100644 --- a/users/grfn/secrets/shell.nix +++ b/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 index daae999582..daae999582 100644 --- a/users/grfn/secrets/windtunnel-bot-github-token.age +++ b/users/aspen/secrets/windtunnel-bot-github-token.age diff --git a/users/grfn/system/.gitignore b/users/aspen/system/.gitignore index 41fbeb02c4..41fbeb02c4 100644 --- a/users/grfn/system/.gitignore +++ b/users/aspen/system/.gitignore diff --git a/users/grfn/system/home/.skip-subtree b/users/aspen/system/home/.skip-subtree index e69de29bb2..e69de29bb2 100644 --- a/users/grfn/system/home/.skip-subtree +++ b/users/aspen/system/home/.skip-subtree diff --git a/users/grfn/system/home/common/solarized.nix b/users/aspen/system/home/common/solarized.nix index 554ee0523e..554ee0523e 100644 --- a/users/grfn/system/home/common/solarized.nix +++ b/users/aspen/system/home/common/solarized.nix diff --git a/users/grfn/system/home/default.nix b/users/aspen/system/home/default.nix index f821999b99..f821999b99 100644 --- a/users/grfn/system/home/default.nix +++ b/users/aspen/system/home/default.nix diff --git a/users/grfn/system/home/home.nix b/users/aspen/system/home/home.nix index 39045c147d..39045c147d 100644 --- a/users/grfn/system/home/home.nix +++ b/users/aspen/system/home/home.nix diff --git a/users/grfn/system/home/machines/dobharchu.nix b/users/aspen/system/home/machines/dobharchu.nix index c26f3baef1..c26f3baef1 100644 --- a/users/grfn/system/home/machines/dobharchu.nix +++ b/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 index 22ef65bb73..22ef65bb73 100644 --- a/users/grfn/system/home/machines/ogopogo.nix +++ b/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 index 135477b12d..135477b12d 100644 --- a/users/grfn/system/home/machines/roswell.nix +++ b/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 index 9a7a561b5e..9a7a561b5e 100644 --- a/users/grfn/system/home/machines/yeren.nix +++ b/users/aspen/system/home/machines/yeren.nix diff --git a/users/grfn/system/home/modules/.gitignore b/users/aspen/system/home/modules/.gitignore index a211cae6c6..a211cae6c6 100644 --- a/users/grfn/system/home/modules/.gitignore +++ b/users/aspen/system/home/modules/.gitignore diff --git a/users/grfn/system/home/modules/alacritty.nix b/users/aspen/system/home/modules/alacritty.nix index 561cab4d79..561cab4d79 100644 --- a/users/grfn/system/home/modules/alacritty.nix +++ b/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 index 204f9c8e14..204f9c8e14 100644 --- a/users/grfn/system/home/modules/alsi.nix +++ b/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 index 17d58a36c5..b932d2ace1 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 index cab3b658e0..cab3b658e0 100644 --- a/users/grfn/system/home/modules/desktop.nix +++ b/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 index 26817af497..26817af497 100644 --- a/users/grfn/system/home/modules/development.nix +++ b/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 index afd22a306d..afd22a306d 100644 --- a/users/grfn/system/home/modules/development/agda.nix +++ b/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 index 876b0c08df..876b0c08df 100644 --- a/users/grfn/system/home/modules/development/kube.nix +++ b/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 index 5dcdd8980e..5dcdd8980e 100644 --- a/users/grfn/system/home/modules/development/ocaml.nix +++ b/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 index afe762468a..afe762468a 100644 --- a/users/grfn/system/home/modules/development/readyset.nix +++ b/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 index 105a23bc83..c4b20f2315 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 index 3db4e293f8..3db4e293f8 100644 --- a/users/grfn/system/home/modules/emacs.nix +++ b/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 index b452324078..231d048a6f 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 index c7e78685a5..c7e78685a5 100644 --- a/users/grfn/system/home/modules/firefox.nix +++ b/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 index 5e28003892..5e28003892 100644 --- a/users/grfn/system/home/modules/games.nix +++ b/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 index 1ce842af20..1ce842af20 100644 --- a/users/grfn/system/home/modules/i3.nix +++ b/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 index 806a8be03c..806a8be03c 100644 --- a/users/grfn/system/home/modules/lib/cloneRepo.nix +++ b/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 index 228dc6379f..228dc6379f 100644 --- a/users/grfn/system/home/modules/lib/zshFunctions.nix +++ b/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 index d4b16b44f0..d4b16b44f0 100644 --- a/users/grfn/system/home/modules/nixos-logo.txt +++ b/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 index 7962320f8a..7962320f8a 100644 --- a/users/grfn/system/home/modules/obs.nix +++ b/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 index 436c8f2617..436c8f2617 100644 --- a/users/grfn/system/home/modules/ptt.nix +++ b/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 index 666e28259c..666e28259c 100755 --- a/users/grfn/system/home/modules/pure.zsh-theme +++ b/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 index c8a404a1f4..c8a404a1f4 100644 --- a/users/grfn/system/home/modules/rtlsdr.nix +++ b/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 index 8d8d5884ce..8d8d5884ce 100644 --- a/users/grfn/system/home/modules/shell.nix +++ b/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 index 87002610cb..87002610cb 100644 --- a/users/grfn/system/home/modules/tarsnap.nix +++ b/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 index adbaa02f32..adbaa02f32 100644 --- a/users/grfn/system/home/modules/tmux.nix +++ b/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 index ab5647e418..ab5647e418 100644 --- a/users/grfn/system/home/modules/twitter.nix +++ b/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 index b87cb09ad1..b87cb09ad1 100644 --- a/users/grfn/system/home/modules/vim.nix +++ b/users/aspen/system/home/modules/vim.nix diff --git a/users/grfn/system/home/modules/vimrc b/users/aspen/system/home/modules/vimrc index 3e33b5e2be..3e33b5e2be 100644 --- a/users/grfn/system/home/modules/vimrc +++ b/users/aspen/system/home/modules/vimrc diff --git a/users/grfn/system/home/modules/zshrc b/users/aspen/system/home/modules/zshrc index a12173d684..a12173d684 100644 --- a/users/grfn/system/home/modules/zshrc +++ b/users/aspen/system/home/modules/zshrc diff --git a/users/grfn/system/home/platforms/darwin.nix b/users/aspen/system/home/platforms/darwin.nix index f98b80f269..f98b80f269 100644 --- a/users/grfn/system/home/platforms/darwin.nix +++ b/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 index 4e4e02b451..4e4e02b451 100644 --- a/users/grfn/system/home/platforms/linux.nix +++ b/users/aspen/system/home/platforms/linux.nix diff --git a/users/grfn/system/install b/users/aspen/system/install index a9a45953da..a9a45953da 100755 --- a/users/grfn/system/install +++ b/users/aspen/system/install diff --git a/users/grfn/system/system/.skip-subtree b/users/aspen/system/system/.skip-subtree index e69de29bb2..e69de29bb2 100644 --- a/users/grfn/system/system/.skip-subtree +++ b/users/aspen/system/system/.skip-subtree diff --git a/users/grfn/system/system/configuration.nix b/users/aspen/system/system/configuration.nix index eae567015b..eae567015b 100644 --- a/users/grfn/system/system/configuration.nix +++ b/users/aspen/system/system/configuration.nix diff --git a/users/grfn/system/system/default.nix b/users/aspen/system/system/default.nix index 98b0fcf18e..98b0fcf18e 100644 --- a/users/grfn/system/system/default.nix +++ b/users/aspen/system/system/default.nix diff --git a/users/grfn/system/system/iso.nix b/users/aspen/system/system/iso.nix index 398145f1cf..398145f1cf 100644 --- a/users/grfn/system/system/iso.nix +++ b/users/aspen/system/system/iso.nix diff --git a/users/grfn/system/system/machines/bumblebee.nix b/users/aspen/system/system/machines/bumblebee.nix index 0fec214092..0fec214092 100644 --- a/users/grfn/system/system/machines/bumblebee.nix +++ b/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 index 3d4de5df1d..446f7cd92d 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 index af7075a97f..d64d5931e3 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 index 8287c95425..e7529542a8 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 index 9208d76d58..9208d76d58 100644 --- a/users/grfn/system/system/machines/yeren.nix +++ b/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 index 4ed1f8d7b1..4ed1f8d7b1 100644 --- a/users/grfn/system/system/modules/common.nix +++ b/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 index 3adbd9d9b0..3adbd9d9b0 100644 --- a/users/grfn/system/system/modules/desktop.nix +++ b/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 index d17e9d424c..d17e9d424c 100644 --- a/users/grfn/system/system/modules/development.nix +++ b/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 index 812f598f9f..812f598f9f 100644 --- a/users/grfn/system/system/modules/fcitx.nix +++ b/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 index 46c7667538..46c7667538 100644 --- a/users/grfn/system/system/modules/fonts.nix +++ b/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 index 05c5333e51..05c5333e51 100644 --- a/users/grfn/system/system/modules/laptop.nix +++ b/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 index 34d9bfdcb7..34d9bfdcb7 100644 --- a/users/grfn/system/system/modules/reusable/README.org +++ b/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 index 151c2a246f..151c2a246f 100644 --- a/users/grfn/system/system/modules/reusable/battery.nix +++ b/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 index ce58ebb0dc..ce58ebb0dc 100644 --- a/users/grfn/system/system/modules/rtlsdr.nix +++ b/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 index 07a67a1ec4..07a67a1ec4 100644 --- a/users/grfn/system/system/modules/sound.nix +++ b/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 index 0d7fe5bb74..0d7fe5bb74 100644 --- a/users/grfn/system/system/modules/tvl.nix +++ b/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 index 30658419fc..30658419fc 100644 --- a/users/grfn/system/system/modules/wireshark.nix +++ b/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 index 35ee44112e..35ee44112e 100644 --- a/users/grfn/system/system/modules/xserver.nix +++ b/users/aspen/system/system/modules/xserver.nix diff --git a/users/grfn/terraform/globals.nix b/users/aspen/terraform/globals.nix index c6bc24c22b..c6bc24c22b 100644 --- a/users/grfn/terraform/globals.nix +++ b/users/aspen/terraform/globals.nix diff --git a/users/grfn/terraform/nixosMachine.nix b/users/aspen/terraform/nixosMachine.nix index 23cd838804..23cd838804 100644 --- a/users/grfn/terraform/nixosMachine.nix +++ b/users/aspen/terraform/nixosMachine.nix diff --git a/users/grfn/terraform/workspace.nix b/users/aspen/terraform/workspace.nix index 114105642a..f1563d2a84 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 index be81feddb1..be81feddb1 100644 --- a/users/grfn/web/.envrc +++ b/users/aspen/web/.envrc diff --git a/users/grfn/web/.gitignore b/users/aspen/web/.gitignore index 2b72eaed29..2b72eaed29 100644 --- a/users/grfn/web/.gitignore +++ b/users/aspen/web/.gitignore diff --git a/users/grfn/web/Makefile b/users/aspen/web/Makefile index 0248685386..cf3da73c91 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 index b05d897d3d..b05d897d3d 100644 --- a/users/grfn/web/config.el +++ b/users/aspen/web/config.el diff --git a/users/grfn/web/default.nix b/users/aspen/web/default.nix index b59548fcd8..a16cd16c06 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 index 784d4c46b3..14d214df16 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 index cdcd440766..cdcd440766 100644 --- a/users/grfn/web/main.css +++ b/users/aspen/web/main.css diff --git a/users/grfn/web/orgExportHTML.nix b/users/aspen/web/orgExportHTML.nix index aac4e32e7a..aac4e32e7a 100644 --- a/users/grfn/web/orgExportHTML.nix +++ b/users/aspen/web/orgExportHTML.nix diff --git a/users/grfn/web/pubkey.gpg b/users/aspen/web/pubkey.gpg index 2a7e744cc3..2a7e744cc3 100644 --- a/users/grfn/web/pubkey.gpg +++ b/users/aspen/web/pubkey.gpg diff --git a/users/grfn/web/recipes/tomato-sauce.org b/users/aspen/web/recipes/tomato-sauce.org index dec7468ac2..dec7468ac2 100644 --- a/users/grfn/web/recipes/tomato-sauce.org +++ b/users/aspen/web/recipes/tomato-sauce.org diff --git a/users/grfn/web/shell.nix b/users/aspen/web/shell.nix index 7e7fccdc93..7e7fccdc93 100644 --- a/users/grfn/web/shell.nix +++ b/users/aspen/web/shell.nix diff --git a/users/grfn/web/site.nix b/users/aspen/web/site.nix index 057c4d3ee6..057c4d3ee6 100644 --- a/users/grfn/web/site.nix +++ b/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 index 1012e8282d..1012e8282d 100644 --- a/users/grfn/wigglydonke.rs/.well-known/cf-2fa-verify.txt +++ b/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 index 4fd7f25fcf..4fd7f25fcf 100644 --- a/users/grfn/wigglydonke.rs/index.html +++ b/users/aspen/wigglydonke.rs/index.html diff --git a/users/grfn/wigglydonke.rs/wd.png b/users/aspen/wigglydonke.rs/wd.png index 217443e2df..217443e2df 100644 --- a/users/grfn/wigglydonke.rs/wd.png +++ b/users/aspen/wigglydonke.rs/wd.png Binary files differdiff --git a/users/grfn/xanthous/.envrc b/users/aspen/xanthous/.envrc index be81feddb1..be81feddb1 100644 --- a/users/grfn/xanthous/.envrc +++ b/users/aspen/xanthous/.envrc diff --git a/users/grfn/xanthous/.github/actions/nix-build/Dockerfile b/users/aspen/xanthous/.github/actions/nix-build/Dockerfile index cfe8e35df0..cfe8e35df0 100644 --- a/users/grfn/xanthous/.github/actions/nix-build/Dockerfile +++ b/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 index cb7aca541a..cb7aca541a 100755 --- a/users/grfn/xanthous/.github/actions/nix-build/entrypoint.sh +++ b/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 index df82de3e8c..df82de3e8c 100644 --- a/users/grfn/xanthous/.github/workflows/haskell.yml +++ b/users/aspen/xanthous/.github/workflows/haskell.yml diff --git a/users/grfn/xanthous/.gitignore b/users/aspen/xanthous/.gitignore index 2ad31c01d4..2ad31c01d4 100644 --- a/users/grfn/xanthous/.gitignore +++ b/users/aspen/xanthous/.gitignore diff --git a/users/grfn/xanthous/LICENSE b/users/aspen/xanthous/LICENSE index 45644ff764..45644ff764 100644 --- a/users/grfn/xanthous/LICENSE +++ b/users/aspen/xanthous/LICENSE diff --git a/users/grfn/xanthous/README.org b/users/aspen/xanthous/README.org index 7e1fedb069..7e1fedb069 100644 --- a/users/grfn/xanthous/README.org +++ b/users/aspen/xanthous/README.org diff --git a/users/grfn/xanthous/Setup.hs b/users/aspen/xanthous/Setup.hs index 9a994af677..9a994af677 100644 --- a/users/grfn/xanthous/Setup.hs +++ b/users/aspen/xanthous/Setup.hs diff --git a/users/grfn/xanthous/app/Main.hs b/users/aspen/xanthous/app/Main.hs index c771a0d932..c771a0d932 100644 --- a/users/grfn/xanthous/app/Main.hs +++ b/users/aspen/xanthous/app/Main.hs diff --git a/users/grfn/xanthous/bench/Bench.hs b/users/aspen/xanthous/bench/Bench.hs index 5889618ee4..5889618ee4 100644 --- a/users/grfn/xanthous/bench/Bench.hs +++ b/users/aspen/xanthous/bench/Bench.hs diff --git a/users/grfn/xanthous/bench/Bench/Prelude.hs b/users/aspen/xanthous/bench/Bench/Prelude.hs index c553abd6d5..c553abd6d5 100644 --- a/users/grfn/xanthous/bench/Bench/Prelude.hs +++ b/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 index 56310e691c..56310e691c 100644 --- a/users/grfn/xanthous/bench/Xanthous/Generators/UtilBench.hs +++ b/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 index fae4af92a7..fae4af92a7 100644 --- a/users/grfn/xanthous/bench/Xanthous/RandomBench.hs +++ b/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 index f0c936bfca..f0c936bfca 100644 --- a/users/grfn/xanthous/build/generic-arbitrary-export-garbitrary.patch +++ b/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 index 748c65b3e0..748c65b3e0 100644 --- a/users/grfn/xanthous/build/hgeometry-fix-haddock.patch +++ b/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 index cd1dbe24d3..cd1dbe24d3 100644 --- a/users/grfn/xanthous/build/update-comonad-extras.patch +++ b/users/aspen/xanthous/build/update-comonad-extras.patch diff --git a/users/grfn/xanthous/default.nix b/users/aspen/xanthous/default.nix index 049c92fb4c..049c92fb4c 100644 --- a/users/grfn/xanthous/default.nix +++ b/users/aspen/xanthous/default.nix diff --git a/users/grfn/xanthous/docs/raw-types.org b/users/aspen/xanthous/docs/raw-types.org index e5bcda0426..e5bcda0426 100644 --- a/users/grfn/xanthous/docs/raw-types.org +++ b/users/aspen/xanthous/docs/raw-types.org diff --git a/users/grfn/xanthous/hie.yaml b/users/aspen/xanthous/hie.yaml index e7cf01d158..e7cf01d158 100644 --- a/users/grfn/xanthous/hie.yaml +++ b/users/aspen/xanthous/hie.yaml diff --git a/users/grfn/xanthous/nixpkgs.nix b/users/aspen/xanthous/nixpkgs.nix index 7d7c164405..7d7c164405 100644 --- a/users/grfn/xanthous/nixpkgs.nix +++ b/users/aspen/xanthous/nixpkgs.nix diff --git a/users/grfn/xanthous/package.yaml b/users/aspen/xanthous/package.yaml index 15a36fe964..15a36fe964 100644 --- a/users/grfn/xanthous/package.yaml +++ b/users/aspen/xanthous/package.yaml diff --git a/users/grfn/xanthous/pkg.nix b/users/aspen/xanthous/pkg.nix index f8364c467a..f8364c467a 100644 --- a/users/grfn/xanthous/pkg.nix +++ b/users/aspen/xanthous/pkg.nix diff --git a/users/grfn/xanthous/server/.envrc b/users/aspen/xanthous/server/.envrc index 051d09d292..051d09d292 100644 --- a/users/grfn/xanthous/server/.envrc +++ b/users/aspen/xanthous/server/.envrc diff --git a/users/grfn/xanthous/server/.gitignore b/users/aspen/xanthous/server/.gitignore index 2f7896d1d1..2f7896d1d1 100644 --- a/users/grfn/xanthous/server/.gitignore +++ b/users/aspen/xanthous/server/.gitignore diff --git a/users/grfn/xanthous/server/Cargo.lock b/users/aspen/xanthous/server/Cargo.lock index 173298b158..173298b158 100644 --- a/users/grfn/xanthous/server/Cargo.lock +++ b/users/aspen/xanthous/server/Cargo.lock diff --git a/users/grfn/xanthous/server/Cargo.toml b/users/aspen/xanthous/server/Cargo.toml index d4a064beb6..d4a064beb6 100644 --- a/users/grfn/xanthous/server/Cargo.toml +++ b/users/aspen/xanthous/server/Cargo.toml diff --git a/users/grfn/xanthous/server/default.nix b/users/aspen/xanthous/server/default.nix index 572230a56c..572230a56c 100644 --- a/users/grfn/xanthous/server/default.nix +++ b/users/aspen/xanthous/server/default.nix diff --git a/users/grfn/xanthous/server/docker.nix b/users/aspen/xanthous/server/docker.nix index 09054cb00f..5eaef4553b 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 index 82de6e38e1..6d1bdc6873 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 index e01c0316a6..e01c0316a6 100644 --- a/users/grfn/xanthous/server/shell.nix +++ b/users/aspen/xanthous/server/shell.nix diff --git a/users/grfn/xanthous/server/src/main.rs b/users/aspen/xanthous/server/src/main.rs index 1b2c1c104b..1b2c1c104b 100644 --- a/users/grfn/xanthous/server/src/main.rs +++ b/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 index 6912cdd9c9..6912cdd9c9 100644 --- a/users/grfn/xanthous/server/src/metrics.rs +++ b/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 index 234ecd8f23..234ecd8f23 100644 --- a/users/grfn/xanthous/server/src/pty.rs +++ b/users/aspen/xanthous/server/src/pty.rs diff --git a/users/grfn/xanthous/shell.nix b/users/aspen/xanthous/shell.nix index 2c41cb4aa8..2c41cb4aa8 100644 --- a/users/grfn/xanthous/shell.nix +++ b/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 index e89fcd6211..e89fcd6211 100644 --- a/users/grfn/xanthous/src/Data/Aeson/Generic/DerivingVia.hs +++ b/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 index 1f2b513ffe..1f2b513ffe 100644 --- a/users/grfn/xanthous/src/Xanthous/AI/Gormlak.hs +++ b/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 index 426230cdc2..426230cdc2 100644 --- a/users/grfn/xanthous/src/Xanthous/App.hs +++ b/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 index 5d4db1a474..5d4db1a474 100644 --- a/users/grfn/xanthous/src/Xanthous/App/Autocommands.hs +++ b/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 index 69ba6f0e05..69ba6f0e05 100644 --- a/users/grfn/xanthous/src/Xanthous/App/Common.hs +++ b/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 index 799281a1c2..799281a1c2 100644 --- a/users/grfn/xanthous/src/Xanthous/App/Prompt.hs +++ b/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 index cca352858d..cca352858d 100644 --- a/users/grfn/xanthous/src/Xanthous/App/Time.hs +++ b/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 index 6e6274a02c..6e6274a02c 100644 --- a/users/grfn/xanthous/src/Xanthous/Command.hs +++ b/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 index 703955206a..703955206a 100644 --- a/users/grfn/xanthous/src/Xanthous/Data.hs +++ b/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 index 13c4b5d610..13c4b5d610 100644 --- a/users/grfn/xanthous/src/Xanthous/Data/App.hs +++ b/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 index 39953410f2..39953410f2 100644 --- a/users/grfn/xanthous/src/Xanthous/Data/Entities.hs +++ b/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 index 855a3462da..855a3462da 100644 --- a/users/grfn/xanthous/src/Xanthous/Data/EntityChar.hs +++ b/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 index 33a98f1ae5..33a98f1ae5 100644 --- a/users/grfn/xanthous/src/Xanthous/Data/EntityMap.hs +++ b/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 index 1398c611cf..1398c611cf 100644 --- a/users/grfn/xanthous/src/Xanthous/Data/EntityMap/Graphics.hs +++ b/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 index 13251d8afd..13251d8afd 100644 --- a/users/grfn/xanthous/src/Xanthous/Data/Levels.hs +++ b/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 index 2b2ee0f960..2b2ee0f960 100644 --- a/users/grfn/xanthous/src/Xanthous/Data/Memo.hs +++ b/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 index 1b875d4483..1b875d4483 100644 --- a/users/grfn/xanthous/src/Xanthous/Data/NestedMap.hs +++ b/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 index 2e6d48062a..2e6d48062a 100644 --- a/users/grfn/xanthous/src/Xanthous/Data/VectorBag.hs +++ b/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 index c8153086f1..c8153086f1 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Character.hs +++ b/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 index 368b03f25b..368b03f25b 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Common.hs +++ b/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 index 3ea610795e..3ea610795e 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Creature.hs +++ b/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 index d13ea8055c..d13ea8055c 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Creature/Hippocampus.hs +++ b/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 index aa6c5fa4fc..aa6c5fa4fc 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Draw/Util.hs +++ b/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 index a0c037a1b4..a0c037a1b4 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Entities.hs +++ b/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 index 519a862c6a..519a862c6a 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Entities.hs-boot +++ b/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 index b45a91eabe..b45a91eabe 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Environment.hs +++ b/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 index eadd625696..eadd625696 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Item.hs +++ b/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 index 14d02872ed..14d02872ed 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Marker.hs +++ b/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 index a7021d76cf..a7021d76cf 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/RawTypes.hs +++ b/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 index 10f0d83193..10f0d83193 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Raws.hs +++ b/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 index 12c76fc14b..12c76fc14b 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Raws/broken-dagger.yaml +++ b/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 index ad3d9cb147..ad3d9cb147 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Raws/gormlak.yaml +++ b/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 index cdfcde616d..cdfcde616d 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Raws/husk.yaml +++ b/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 index c0501a18a8..c0501a18a8 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Raws/noodles.yaml +++ b/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 index fe427c94ab..fe427c94ab 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Raws/ooze.yaml +++ b/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 index 3f4e133fe2..3f4e133fe2 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Raws/rock.yaml +++ b/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 index 7f9e1faffe..7f9e1faffe 100644 --- a/users/grfn/xanthous/src/Xanthous/Entities/Raws/stick.yaml +++ b/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 index 89c23f0de8..89c23f0de8 100644 --- a/users/grfn/xanthous/src/Xanthous/Game.hs +++ b/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 index 679bfe5459..679bfe5459 100644 --- a/users/grfn/xanthous/src/Xanthous/Game/Arbitrary.hs +++ b/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 index 291dfd8b5e..291dfd8b5e 100644 --- a/users/grfn/xanthous/src/Xanthous/Game/Draw.hs +++ b/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 index 5d7b275c8a..5d7b275c8a 100644 --- a/users/grfn/xanthous/src/Xanthous/Game/Env.hs +++ b/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 index c692a3b479..c692a3b479 100644 --- a/users/grfn/xanthous/src/Xanthous/Game/Lenses.hs +++ b/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 index 154063b5dd..154063b5dd 100644 --- a/users/grfn/xanthous/src/Xanthous/Game/Memo.hs +++ b/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 index 2d6c0a280f..2d6c0a280f 100644 --- a/users/grfn/xanthous/src/Xanthous/Game/Prompt.hs +++ b/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 index 13b1ba1588..13b1ba1588 100644 --- a/users/grfn/xanthous/src/Xanthous/Game/State.hs +++ b/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 index fc57402e7d..fc57402e7d 100644 --- a/users/grfn/xanthous/src/Xanthous/Generators/Level.hs +++ b/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 index 03d534ca39..03d534ca39 100644 --- a/users/grfn/xanthous/src/Xanthous/Generators/Level/CaveAutomata.hs +++ b/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 index 0be7c0435c..0be7c0435c 100644 --- a/users/grfn/xanthous/src/Xanthous/Generators/Level/Dungeon.hs +++ b/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 index 4f8a2f42ee..4f8a2f42ee 100644 --- a/users/grfn/xanthous/src/Xanthous/Generators/Level/LevelContents.hs +++ b/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 index 0008eb965c..0008eb965c 100644 --- a/users/grfn/xanthous/src/Xanthous/Generators/Level/Util.hs +++ b/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 index ab7de95e68..ab7de95e68 100644 --- a/users/grfn/xanthous/src/Xanthous/Generators/Level/Village.hs +++ b/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 index 8abc00b6a2..8abc00b6a2 100644 --- a/users/grfn/xanthous/src/Xanthous/Generators/Speech.hs +++ b/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 index c273d65082..c273d65082 100644 --- a/users/grfn/xanthous/src/Xanthous/Messages.hs +++ b/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 index 5176880355..5176880355 100644 --- a/users/grfn/xanthous/src/Xanthous/Messages/Template.hs +++ b/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 index db602de56f..db602de56f 100644 --- a/users/grfn/xanthous/src/Xanthous/Monad.hs +++ b/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 index 66004163f6..66004163f6 100644 --- a/users/grfn/xanthous/src/Xanthous/Orphans.hs +++ b/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 index 37530cbbc2..37530cbbc2 100644 --- a/users/grfn/xanthous/src/Xanthous/Physics.hs +++ b/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 index 2cb4299303..2cb4299303 100644 --- a/users/grfn/xanthous/src/Xanthous/Prelude.hs +++ b/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 index 329b321b8b..329b321b8b 100644 --- a/users/grfn/xanthous/src/Xanthous/Random.hs +++ b/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 index f918340f05..f918340f05 100644 --- a/users/grfn/xanthous/src/Xanthous/Util.hs +++ b/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 index 9e158cc8e2..9e158cc8e2 100644 --- a/users/grfn/xanthous/src/Xanthous/Util/Comonad.hs +++ b/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 index 8e5c04f4bf..8e5c04f4bf 100644 --- a/users/grfn/xanthous/src/Xanthous/Util/Graph.hs +++ b/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 index 0cb009f45a..0cb009f45a 100644 --- a/users/grfn/xanthous/src/Xanthous/Util/Graphics.hs +++ b/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 index 724f2339dd..724f2339dd 100644 --- a/users/grfn/xanthous/src/Xanthous/Util/Inflection.hs +++ b/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 index 91d1328e4a..91d1328e4a 100644 --- a/users/grfn/xanthous/src/Xanthous/Util/JSON.hs +++ b/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 index dfa6537235..dfa6537235 100644 --- a/users/grfn/xanthous/src/Xanthous/Util/Optparse.hs +++ b/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 index aa881b3227..aa881b3227 100644 --- a/users/grfn/xanthous/src/Xanthous/Util/QuickCheck.hs +++ b/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 index cffb27cb03..cffb27cb03 100644 --- a/users/grfn/xanthous/src/Xanthous/keybindings.yaml +++ b/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 index bc08ec1ad2..bc08ec1ad2 100644 --- a/users/grfn/xanthous/src/Xanthous/messages.yaml +++ b/users/aspen/xanthous/src/Xanthous/messages.yaml diff --git a/users/grfn/xanthous/test/Spec.hs b/users/aspen/xanthous/test/Spec.hs index 51758d6a25..51758d6a25 100644 --- a/users/grfn/xanthous/test/Spec.hs +++ b/users/aspen/xanthous/test/Spec.hs diff --git a/users/grfn/xanthous/test/Test/Prelude.hs b/users/aspen/xanthous/test/Test/Prelude.hs index 75c1ebf5e7..75c1ebf5e7 100644 --- a/users/grfn/xanthous/test/Test/Prelude.hs +++ b/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 index 13f69a808d..13f69a808d 100644 --- a/users/grfn/xanthous/test/Xanthous/CommandSpec.hs +++ b/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 index e403503743..e403503743 100644 --- a/users/grfn/xanthous/test/Xanthous/Data/EntitiesSpec.hs +++ b/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 index 9e8024c9d2..9e8024c9d2 100644 --- a/users/grfn/xanthous/test/Xanthous/Data/EntityCharSpec.hs +++ b/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 index fd37548ce8..fd37548ce8 100644 --- a/users/grfn/xanthous/test/Xanthous/Data/EntityMap/GraphicsSpec.hs +++ b/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 index 7c5cad0196..7c5cad0196 100644 --- a/users/grfn/xanthous/test/Xanthous/Data/EntityMapSpec.hs +++ b/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 index a752833162..a752833162 100644 --- a/users/grfn/xanthous/test/Xanthous/Data/LevelsSpec.hs +++ b/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 index ad81f1984d..ad81f1984d 100644 --- a/users/grfn/xanthous/test/Xanthous/Data/MemoSpec.hs +++ b/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 index acf7a67268..acf7a67268 100644 --- a/users/grfn/xanthous/test/Xanthous/Data/NestedMapSpec.hs +++ b/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 index 9e67505ba9..9e67505ba9 100644 --- a/users/grfn/xanthous/test/Xanthous/DataSpec.hs +++ b/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 index 734cce1efb..734cce1efb 100644 --- a/users/grfn/xanthous/test/Xanthous/Entities/CharacterSpec.hs +++ b/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 index a6f8401cf7..a6f8401cf7 100644 --- a/users/grfn/xanthous/test/Xanthous/Entities/CommonSpec.hs +++ b/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 index e23f7faba3..e23f7faba3 100644 --- a/users/grfn/xanthous/test/Xanthous/Entities/RawTypesSpec.hs +++ b/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 index b6c80be51b..b6c80be51b 100644 --- a/users/grfn/xanthous/test/Xanthous/Entities/RawsSpec.hs +++ b/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 index d7a3df4aca..d7a3df4aca 100644 --- a/users/grfn/xanthous/test/Xanthous/Game/PromptSpec.hs +++ b/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 index 34584f73b2..34584f73b2 100644 --- a/users/grfn/xanthous/test/Xanthous/Game/StateSpec.hs +++ b/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 index 2fa8527d0e..2fa8527d0e 100644 --- a/users/grfn/xanthous/test/Xanthous/GameSpec.hs +++ b/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 index b53c657f75..b53c657f75 100644 --- a/users/grfn/xanthous/test/Xanthous/Generators/Level/UtilSpec.hs +++ b/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 index 2068e338ba..2068e338ba 100644 --- a/users/grfn/xanthous/test/Xanthous/MessageSpec.hs +++ b/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 index 2a3873c3b0..2a3873c3b0 100644 --- a/users/grfn/xanthous/test/Xanthous/Messages/TemplateSpec.hs +++ b/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 index 0d800e8a91..0d800e8a91 100644 --- a/users/grfn/xanthous/test/Xanthous/OrphansSpec.hs +++ b/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 index c88bd95629..c88bd95629 100644 --- a/users/grfn/xanthous/test/Xanthous/RandomSpec.hs +++ b/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 index 35ff090b28..35ff090b28 100644 --- a/users/grfn/xanthous/test/Xanthous/Util/GraphSpec.hs +++ b/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 index 61e5892803..61e5892803 100644 --- a/users/grfn/xanthous/test/Xanthous/Util/GraphicsSpec.hs +++ b/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 index fad8410431..fad8410431 100644 --- a/users/grfn/xanthous/test/Xanthous/Util/InflectionSpec.hs +++ b/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 index 684a03b2c7..684a03b2c7 100644 --- a/users/grfn/xanthous/test/Xanthous/UtilSpec.hs +++ b/users/aspen/xanthous/test/Xanthous/UtilSpec.hs diff --git a/users/grfn/xanthous/xanthous.cabal b/users/aspen/xanthous/xanthous.cabal index 12222c2673..12222c2673 100644 --- a/users/grfn/xanthous/xanthous.cabal +++ b/users/aspen/xanthous/xanthous.cabal diff --git a/users/grfn/keyboard/flash b/users/grfn/keyboard/flash deleted file mode 100755 index 76def36f9c..0000000000 --- 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)" |