Commit graph

865 commits

Author SHA1 Message Date
Griffin Smith
d857d5ad68 refactor(gs/system): Remove chupacabra
This machine no longer exists

Change-Id: I8e549b8397777a01404bd84c10c195e80f281744
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3431
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
2021-08-26 19:41:42 +00:00
Griffin Smith
8201f0f3d8 refactor(gs/system): Remove rebuilder script
I no longer use this, I just use the rebuild-system that all nixos
systems get now.

Change-Id: I2272ff13b21b3194c06b51dbc340c19b8bb336a9
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3430
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
2021-08-26 19:10:19 +00:00
Vincent Ambo
da0b330756 chore(web/tvl): Move TVL static assets out of //users/tazjin
It's now more like my personal homepage depends on TVL assets, not the
other way around.

Change-Id: Ifb9d61aa8ec2cab549e25de3a3dfbbd08f3d336c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3435
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
2021-08-26 17:46:06 +00:00
sterni
094dfa2ed3 feat(users/sterni/emacs): add ariadne conill's blog to subscriptions
Change-Id: I6d5935279069c8af7e7a5f21f9d221c93a533d8e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3428
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
2021-08-26 15:34:58 +00:00
sterni
9ed439bfbd feat(users/sterni/nix): cursed nix html DSL
Couldn't sleep, so I made a surprisingly neat way to render HTML
documents in Nix using our favorite feature __findFile:

  let
    inherit (depot.users.sterni.nix.html) __findFile esc;

  in

  <html> {} [
    (<head> {} [
      (<meta> { charset = "utf-8"; } null)
      (<title> {} (esc "hello"))
    ])
    (<body> {} [
      (<h1> {} (esc "hello world"))
    ])
  ]

=> "<html><head><meta charset=\"utf-8\"/><title>hello</title></head><body><h1>hello world</h1></body></html>"

Change-Id: Id36808a56ae3da3b5263c06f29342fc22d105c21
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3410
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
2021-08-26 15:34:58 +00:00
Griffin Smith
aad7e7e74b fix(gs/emacs): Don't repeat flycheck nav with evil .
Prevent flycheck-next-error and flycheck-prev-error from being repeated
by evil, since they're movement commands rather than editing commands.
This lets me spam `]e.` if I have to do the same thing to all the errors
in a buffer, for example.

Change-Id: I5993f6d19b71b63e5f4be1f3ce9e0cfd0357cc6e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3425
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-08-26 13:45:27 +00:00
Griffin Smith
5ba19ec2a2 fix(grfn/system): Fix rust-analyzer target dir
This was missing a path segment, plus calling it rust-analyzer makes it
clearer what's going on

Change-Id: I8f71fe1b438d72f743472ab10ec939f686ad0da1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3424
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-08-26 13:45:27 +00:00
Griffin Smith
a1205f0565 feat(gs/home): Alias tf->terraform
Change-Id: Ic79fec6b19c185a6e094dfc9571ea783a1e07148
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3423
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-08-26 13:45:27 +00:00
Vincent Ambo
da5a5ab2e4 feat(tverskoy): Attempt #2 to install Steam
Change-Id: I79bcd37f498ec8a337b65b069d085c672b830ee9
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3247
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
2021-08-25 09:53:04 +00:00
sterni
02566cdcfb feat(nix/buildLisp): add ecl
Adds ECL as a second supported implementation, specifically a statically
linked ECL. This is interesting because we can create statically linked
binaries, but has a few drawbacks which doesn't make it generally
useful:

* Loading things is very slow: The statically linked ECL only has byte
  compilation available, so when we do load things or use the REPL it is
  significantly worse than with e. g. SBCL.

* We can't load shared objects via the FFI since ECL's dffi is not
  available when linked statically. This means that as it stands, we
  can't build a statically linked //web/panettone for example.

Since ECL is quite slow anyways, I think these drawbacks are worth it
since the biggest reason for using ECL would be to get a statically
linked binary. If we change our minds, it shouldn't be too hard to
provide ecl-static and ecl-dynamic as separate implementations.

ECL is LGPL and some libraries it uses as part of its runtime are as
well. I've outlined in the ecl-static overlay why this should be of no
concern in the context of depot even though we are statically linking.

Currently everything is building except projects that are using cffi to
load shared libaries which have gotten an appropriate
`badImplementations` entry. To get the rest building the following
changes were made:

* Anywhere a dependency on UIOP is expressed as `bundled "uiop"` we now
  use `bundled "asdf"` for all implementations except SBCL. From my
  testing, SBCL seems to be the only implementation to support using
  `(require 'uiop)` to only load the UIOP package. Where both a
  dependency on ASDF and UIOP exists, we just delete the UIOP one.
  `(require 'asdf)` always causes UIOP to be available.

* Where appropriate only conditionally compile SBCL-specific code and
  if any build the corresponding files for ECL.

* //lisp/klatre: Use the standard condition parse-error for all
  implementations except SBCL in try-parse-integer.

* //3p/lisp/ironclad: disable SBCL assembly optimization hack for all
  other platforms as it may interfere with compilation.

* //3p/lisp/trivial-mimes: prevent call to asdf function by substituting
  it out of the source since it always errors out in ECL and we hardcode
  the correct path elsewhere anyways.

As it stands ECL still suffers from a very weird problem which happens
when compiling postmodern and moptilities:
https://gitlab.com/embeddable-common-lisp/ecl/-/issues/651

Change-Id: I0285924f92ac154126b4c42145073c3fb33702ed
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3297
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: eta <tvl@eta.st>
2021-08-24 22:00:15 +00:00
Vincent Ambo
a4c8e8da92 chore(tazjin/emacs): Remove dash-functional
This has been folded into dash itself.

Change-Id: I19e7a9fbc4d6206e3624b7c226de2225153689c6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3407
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
2021-08-24 17:11:49 +00:00
Vincent Ambo
42074da865 refactor(tazjin/emacs): Simplify package selection
Lets trust that the Emacs overlay is using the right packages from the
right sources by default. I'm not overly attached to any specific
versions.

Change-Id: Id53a4587f680965f13b5cd329a10f0384ff97c13
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3406
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
2021-08-24 17:11:49 +00:00
Vincent Ambo
592aab54b2 fix(tazjin/emacs): Reenable shortcut for telega
Change-Id: I96dd768b89273d748c3a865cf8605877716c26be
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3405
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
2021-08-24 17:11:49 +00:00
Vincent Ambo
94e8e06c6c fix(tazjin/emacs): Remove temporary override for telega
The channel has caught up with this fix.

Change-Id: I86287a6808e6936e50e5d43cbafc74b9362e0bd8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3404
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
2021-08-24 17:11:49 +00:00
sterni
77be4dfe37 chore(users/sterni/emacs): fix typo
Thanks tazjin!

Change-Id: I3c742e832bbc98fbf4112a7bea367d013a2ef722
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3401
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
2021-08-24 12:33:23 +00:00
sterni
58b9a53d5c feat(users/sterni): add emacs configuration
Change-Id: Icbdb52ba5ea51e8594eb46c5f0740e4f7c353be4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3381
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
2021-08-24 12:13:06 +00:00
sterni
559ee9467b chore(3p): bump NixOS channels to 2020-08-18
Wanted to port my emacs config to depot, but missing a dependency from
the channel. Adjustments:

* Downgrade grfn's Kernel to 5.10: The ck1 patch is not yet available
  for 5.13 unfortunately and the 5.12 set has been removed upstream.

Change-Id: Ifaf315427bda2af590549ca0abec02a79f19a3ec
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3375
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
2021-08-24 12:13:06 +00:00
sterni
32de4cbd93 refactor(users/grfn/gws.fyi): implement isDirectory in pure nix
Another day, another import from derivation avoided by
builtins.unsafeDiscardStringContext!

Change-Id: I67274b1ba13ba980bb3346b22f2955c702aa3151
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3372
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
2021-08-24 12:13:06 +00:00
Griffin Smith
5627c67bed fix(gws.fyi): eg -> ie
Thanks sterni!

Change-Id: I7a6ee7586fac45fe62e1d4016e1520e66381caf1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3373
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-08-18 14:27:51 +00:00
Griffin Smith
15163fdc16 feat(gws.fyi): Add a recipe for tomato paste
Someone asked for this, so here it is.

Change-Id: I00c52deb8c3f4e8f786cf4763b39d862ad041f6d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3371
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
2021-08-18 03:23:04 +00:00
Griffin Smith
8dd5ee26d7 feat(gws.fyi): Allow building whole org directories
Allow building entire directories containing org files as html
directories with org-export-html

Change-Id: I805da6b2da7e8ea67da13c858f962f36ed120972
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3370
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
2021-08-18 03:22:46 +00:00
Vincent Ambo
206f96fbed fix(tazjin/emacs): Temporarily unbind key for telega
Telega keeps getting loaded with old sources, the origin of which I
can not figure out, and which are not compatible with my Emacs
anymore. This means that opening Telega essentially breaks the active
Emacs until the telega process is killed.

Until I have time to properly sit down and debug where Nix decides to
get an old version of telega from (building the package directly from
a Nix REPL yields the expected one), I'll disable it to avoid
accidentally breaking my Emacs via muscle-memory.

Change-Id: I937ac3a2b208c08fa0ef0b6e3e201526baa3a522
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3367
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
2021-08-16 15:27:52 +00:00
Griffin Smith
b43366ed50 feat(gs/home): Install cargo-rr
Change-Id: If32e485f7ee8f4ae1e4b68be33aa1261c5cf2dbd
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3290
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-08-09 19:58:28 +00:00
Griffin Smith
387425744d feat(gs/emacs): Set popup rules for gud buffers
Change-Id: I74730a924b7cf6652dd64704aa36f850160d8bae
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3289
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-08-09 19:58:28 +00:00
Griffin Smith
2d6e4cda13 feat(gs/emacs): Put rust-analyzer in a different target dir
This stops it from interfering with command line invocations of things
like cargo test

Change-Id: Icc24a27ac5e17bb88ed539c13fc33204ef55ce82
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3288
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-08-09 19:58:28 +00:00
Griffin Smith
3d5c10f7b1 feat(gs/emacs): Bind g RET to lsp-rust-analyzer-run
Change-Id: I667f9033824d4a32abedfb275ea35a06a371ab12
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3287
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-08-09 19:58:28 +00:00
Vincent Ambo
56c9fa9722 fix(tazjin/emacs): Temporary fixes to use unstable telega
The latest Emacs versions removed some (private) functions that telega
depends on, and this is fixed in HEAD of telega.el.

However, without these fixes, the unstable version of telega doesn't
build because the patch Nix tries to apply doesn't match the source
anymore.

The patch itself doesn't seem to do anything relevant for me.

Change-Id: Ib9a042c636cb438b2b15d231a07afd5c02be72ee
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3294
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
2021-08-08 13:18:17 +00:00
Vincent Ambo
e7de89e06a chore(3p/nixpkgs): Bump nixpkgs channels to 2021-08-04
I used //tools/depot-nixpkgs-update for this - thanks again, sterni!

Included fixes:

* temporary workaround for building notmuch python package, fixed in
  upstream already (but channel hasn't advanced there)
* Disable fprintd in grfn.system.yeren, as the fprintd-tod package
  currently has a version mismatch in nixpkgs

Co-authored-by: Griffin Smith <grfn@gws.fyi>
Change-Id: If6d71b08ace9db57daadfe3b69b9cd4aec6a5a4e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3274
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
2021-08-08 01:28:36 +00:00
Vincent Ambo
242f63fdd6 feat(tazjin/emacs): Add another window title pattern
Change-Id: Ia14fa72e896a9cfc9fab828bead9f7f33763c89b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3276
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
2021-08-06 11:32:41 +00:00
Vincent Ambo
35ce86d4a8 feat(tverskoy): Install picom compositor
... for the rare cases where I am watching a movie on this laptop.

Change-Id: I9f6a5a4079b32a67d46e744c024c2accf09b3d6d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3273
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
2021-08-04 14:49:55 +00:00
Vincent Ambo
3e14a78e8c fix(tverskoy): Ensure gtk-launch is installed
This is required for launching desktop applications from XDG shortcuts
via counsel.

Change-Id: I147fb0d6568e359c23655230b2a56214715827f6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3267
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
2021-08-04 14:41:12 +00:00
Griffin Smith
93b2518b1c fix(gs/emacs): Explicitly bind g d to lsp-find-definition in rust
Change-Id: I1d3cbccf1e976df1c08a6e34b736392208351a26
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3272
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-08-02 21:09:54 +00:00
Vincent Ambo
04ecf9cbbb fix(tverskoy): Set timezone to Europe/Moscow
Change-Id: Ibcf9322086d96847aa9c629c5535965db32ba4fe
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3266
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
2021-08-01 22:14:58 +00:00
Profpatsch
f25e930ec7 feat(users/Profpatsch): add reverse-haskell-deps
Dis is dumb

Change-Id: If09300eedff7227ed452dcec7a8e80c7ffb24757
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3231
Tested-by: BuildkiteCI
Reviewed-by: Profpatsch <mail@profpatsch.de>
2021-08-01 16:40:35 +00:00
Griffin Smith
e22bd20e27 feat(gs/emacs): Switch org-ellipsis character
The old one's displaying as an emoji, upsettingly

Change-Id: I50980e4b9f2a58463e749a8adcc32f0f9ca1d154
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3261
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-07-30 16:37:23 +00:00
Vincent Ambo
f693f935a7 fix(tverskoy): Persist Mullvad VPN settings
Change-Id: Icd33a613e613b48038c193c85721d9dd061549c1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3254
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
2021-07-20 12:34:18 +00:00
sterni
02aaed54f6 chore(3p): bump unstable channel to 2021-07-03
Didn't bother to update the stable channel as it is unused currently.

Changes required:

* tazjin/frog, grfn/modules/obs:
  Remove obs-v4l2sink as it has been integrated into upstream OBS and
  the package removed from nixpkgs subsequently (at least according to
  the `builtins.throw`-message).

Change-Id: I4335ed060eef2c4ff8ac55a68d894bcc3d8ef4a3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3243
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
2021-07-16 13:57:04 +00:00
Griffin Smith
f32cc0ecb1 fix(gs/system): Add mime handler for telegramdesktop
Telegram adds this itself, which means the file is different from what
home-manager knows about, which means running home-manager switch
breaks unless this is here.

Change-Id: Iad507bf63365a630b7eef349228b633f5b83d78b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3251
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-07-16 13:44:23 +00:00
Griffin Smith
2c6b00330f refactor(gs/emacs): Drop flow config
Change-Id: Ide0f3c4de34e6d9cb90038094407f1aa99ccf96f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3250
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-07-16 13:44:23 +00:00
Griffin Smith
af7d26f08d fix(gs/emacs): Shift around loading of org config
I don't know why this is causing issues, I really don't. But I get
agenda items without having to reload this file now.

Change-Id: I38fd4f7942430a07231cadbc0320e1ba786616e6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3249
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-07-16 13:44:23 +00:00
Griffin Smith
b5339a7e51 fix(gs/emacs): Pass --read-envelope-from to sendmail
Change-Id: I8e4c0171336cad3ed817956b07b371aba706ab9f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3248
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-07-16 13:44:23 +00:00
Vincent Ambo
8e33ae4ad7 feat(tazjin/emacs): Add layout for external TV on tverskoy
Change-Id: I6ac9b7180b940ca3018d999500f035245a358079
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3246
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
2021-07-14 17:03:59 +00:00
Vincent Ambo
60dfa3a971 fix(tazjin/emacs): Enable key bindings for Russian layout
Change-Id: I26d0d437c00d927b9244c4aa4a8705681cd212c8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3245
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
2021-07-14 17:03:59 +00:00
Vincent Ambo
155ac87e5a fix(tverskoy): Ensure rink is installed
Yes, this is a fix.

Change-Id: Ie80dc0f60c6343388388fba3327816d8a1b0fbe0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3244
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
2021-07-14 17:03:59 +00:00
Vincent Ambo
ee6590dea1 chore(tazjin/tverskoy): Enable fwupd
Very worried about this, Lenovo has a knack for bricking devices with
firmware updates ...

Change-Id: Idc111fe9d4bd7edf1e6c633040cf35e82f858724
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3224
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
2021-07-14 17:03:59 +00:00
Griffin Smith
e00a7263fb feat(gs/emacs): Don't display info-level flycheck errors
These end up being things like "hey, you used a proc macro" which isn't
useful to me, and clogs up the rest of my error navigation.

Change-Id: I9ccfddcce9683184f2479ae1aa30a8414f7e7c51
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3242
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-07-06 18:32:08 +00:00
Griffin Smith
ad8d38c64c fix(xanthous): Fix display of square/cubic units
Previously this'd display `5 m m³`, because it'd show the underlying
value then add the unit suffix on at the end

Change-Id: Idd240ddfebc212460f9fb529eff72732a5dafe2a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3241
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-07-06 18:32:08 +00:00
Griffin Smith
e62f578687 fix(gs/emacs): Fix headlines-from-assigned-to-me
If org-tracker-headlines-from-search is called non-interactively, it
only *returns* the org headlines as a string, rather than inputting them
at point.

Change-Id: Ia43d516f35a11383b206a57f345a6aeedfe86831
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3230
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-06-23 21:52:08 +00:00
Griffin Smith
7437a18188 fix(xanthous): Only use alphabetic chars for menu items
Previously, we were using `smallestNotIn` for selecting new characters
for menu items with duplicate chatacters - this uses the 'Bounded'
instance for the type, which for Char meant the first character we would
always select was \NUL - making it look like the menu item had no
character, and making it impossible to actually select the menu item.
This introduces an AlphaChar newtype, which is a wrapper around Char
whose Bounded and Enum instances only use alphabetic characters (a-ZA-Z)
and uses that for menu characters instead.

Change-Id: If34ed9e9ce84f2bcb1cb87432cc6273f40b69f72
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3229
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-06-23 21:52:08 +00:00
Griffin Smith
76258fbfa1 feat(xanthous): Describe *where* the item is in the inventory
When describing items in the inventory, both in detail and when
producing menus from those items, describe not just the item itself but
also *where* in the inventory the item is (either in the backpack, or
wielded in either or both of the hands). This uses a new
InventoryPosition datatype, and a method to get a list of items in the
inventory associated with their inventory position. When *removing*
items from the inventory (to wield, drop, or eat them), we want to make
sure we remove from the right position, so this also introduces
a `removeItemAtPosition` method to make that happen correctly.

Finally, some of the tests for this stuff was getting really slow - I
narrowed this down to runaway arbitrary generation for message
Templates, so I've tweaked the Arbitrary instance for that type to
generate smaller values.

Change-Id: I24e9948adae24b0ca9bf13955602108ca9079dcc
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3228
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
2021-06-23 21:52:08 +00:00