about summary refs log tree commit diff
path: root/users/multi (follow)
AgeCommit message (Collapse)AuthorFilesLines
2020-11-27 r/1936 fix(users/multi/home): fix tmux keybindings for tmux 3.1multi1-2/+2
The "swap-window" command swaps two windows, the 'source' and 'destination' window, exchanging the indices they occupy in the window list. In at least tmux 2.8 (which is what's in Debian Stable), if the window under focus is the source window, then focus follows that window (i.e. the focus changes to the current window's new index atomically with it being moved to that index). In more recent tmux versions, this is not the case, and the focus remains on the old index, so that the replacement window comes under focus. The former behaviour is still possible, but must be explicitly requested. Change-Id: Ieff606dfc2624b869d3bb6e1344dd4d0c6301857 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2169 Reviewed-by: multi <depot@in-addr.xyz> Tested-by: BuildkiteCI
2020-11-23 r/1916 feat(users/multi/home): add readline configuration and nix-shell handling to ↵multi1-3/+40
bashrc. This adds my standard inputrc to my home-manager configuration, via the latter's readline module, and adds nix-shell detection to my bash prompt string. Additionally, nix-shell is wrapped in a shell function, so that entering a nix-shell environment automatically runs bash as a subprocess where appropriate, as the default environment spawned by nix-shell is not to my liking. Change-Id: Id5b1b9415a185ad9920f268c66de32d6ccc0b452 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2146 Reviewed-by: multi <depot@in-addr.xyz> Tested-by: BuildkiteCI
2020-11-22 r/1902 fix(users/multi/home): re-add overridden htop package to home-manager ↵multi1-0/+2
configuration. I previously removed my local package set from my HM config while the latter was being made readTree compatible. Now that both the HM config and the local package set can be built with readTree, I can re-enable the locally-overridden htop package. Change-Id: I77e20248c010bc7027e0b0a3164ec48d6ec29f31 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2132 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz>
2020-11-22 r/1901 refactor(user/multi/pkgs): make my local package set readTree-compatible.multi2-4/+11
This adds readTree configuration for accessing my local package set, and also adds these packages to the CI configuration. Change-Id: Icd2d16e85859343902e73a466f3c6ba8d781537f Reviewed-on: https://cl.tvl.fyi/c/depot/+/2131 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz>
2020-11-22 r/1900 fix(users/multi/home): use local depot checkout.multi1-2/+6
This reverts 1478317d149539d74fa4bad8414658fb7119ea07. Using depot.depotPath in my home-manager configuration results in my NIX_PATH and home-manager config file path being pointed at a copy of the depot in the nix store, which makes building from my local depot checkout a bit cumbersome. Change-Id: Ib687d3e8147cb32df071d3c19a5300294ea62c0c Reviewed-on: https://cl.tvl.fyi/c/depot/+/2130 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz>
2020-11-22 r/1899 refactor(users/multi): migrate whitby home-manager config to ↵multi3-69/+11
readTree-compatible version. Add a new home-manager-compatible configuration file which loads the common config attrset used by the readTree machinery into a structure which the home-manager command line tool understands. Garbage-collect the old home-manager configuration file used on whitby, and update the HOME_MANAGER_CONFIG path to point at the new shim config. Instead of having a per-environment HM configuration (not that I have more than one environment), there's now a single configuration which evaluates to an attrset of configurations, which can be loaded and built using "home-manager build -A $attr". Change-Id: Id8b35dc89aabffedf1a4dadfa0d3d4b914e4e2e7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2129 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz>
2020-11-22 r/1898 refactor(users/multi): make my user directory CI-compatible.multi3-0/+93
My home-manager config is not currently readTree compatible, which means that it's not built by CI. This constructs a house of cards around home-manager to make this buildable in CI. Change-Id: I80480f24ff47347f46d708edbbf34d59fa76adac Reviewed-on: https://cl.tvl.fyi/c/depot/+/2123 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz>
2020-11-22 r/1897 refactor(users/multi/whitby): use the depot's own source location attribute.multi2-9/+2
The depot knows where it is, not because it knows where it isn't, but because it does an "import ./." at the top level and then makes this path value available in the attrset passed to the rest of the tree. My home-manager config on whitby previously involved manual specification of the depot checkout location on whitby, however this isn't necessary when the depot can already magically tell us where it is. Change-Id: I68577c8ef2cda6ba5bc46cf8f4821aac021c8066 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2122 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz>
2020-11-21 r/1895 fix(users/multi/whitby): fix home-manager configuration on whitby.multi1-1/+1
"let pkgs = import <nixpkgs> {}; in pkgs.home-manager.src" evaluates to the source derivation for home-manager, however home-manager's configuration machinery expects to be passed the store path of this derivation instead of the derivation object itself. Change-Id: I6b0ba3efaff9d080900349529576443192b058e9 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2121 Reviewed-by: multi <depot@in-addr.xyz> Tested-by: BuildkiteCI
2020-11-21 r/1894 chore(3p): Bump nixpkgs to nixos-unstable from 2020-11-21Vincent Ambo1-6/+4
Included fixes for random breakage: * 3p/awscli: pick from the stable channel; it is broken on unstable * 3p/googletest: bumped version & removed patches that nixpkgs applies * 3p/lisp/cffi: bumped library version for SBCL compat * 3p/nix: fix libsystemd attribute * 3p/nix: reformatted (clang-format handling of ternaries changed) * glittershark/home: Use home-manager from nixkpgs * glittershark/kernel: bumped linux-ck patch hash * glittershark/kernel: removed "patch patch" * multi/whitby: Use home-manager from nixpkgs * tazjin/frog: drop Sourcetrail (it doesn't build currently) Note that in addition to these changes, some previous CLs updated the versions of git and cgit which was necessary for this channel bump, but which could not be done in the same commit due to the nature of the subtree merges. Change-Id: If2563e8a68e2750c4b913a976ff7b93b42e8b7f3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2110 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz> Reviewed-by: glittershark <grfn@gws.fyi>
2020-11-18 r/1883 chore(users/multi): Update htop derivation for new upstream.multi13-3609/+10
- htop has moved upstreams, which has been producing new releases, so update the derivation to pull from the new repository on GitHub. - All of the patches I have locally have been merged upstream, so drop them from the depot. - Pull from a reasonably recent git commit instead of from a numbered release, as the ZFS ARC stats and CPU meter columnation patches haven't made it into a release yet. Change-Id: I66ad4c035df07709abf4f75a9d4e1486920091d0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2105 Reviewed-by: multi <depot@in-addr.xyz> Tested-by: BuildkiteCI
2020-09-20 r/1808 fix(users/multi): don't attempt to invoke a string as a function.multi1-1/+1
This fixes a typo in f43dfd4b8e20e51300ec44cc9555cdad612b95c6. Change-Id: Ifc3050adc4c25a146a5d8c72e964d9aefb3bc580 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1994 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz>
2020-09-20 r/1807 feat(users/multi): refactor home manager configuration on whitby.multi2-10/+20
Previously this used git checkouts of home-manager.git and nixpkgs.git on whitby, which is self-evidently non-reproducible, so instead use pinned tarballs of those repositories as data sources. Change-Id: I3bd01e44d746c62e6bfbeab2e7698ae9954c8a94 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1993 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz>
2020-09-20 r/1806 feat(users/multi): synchronise local changes on whitby.multi1-1/+15
Change-Id: I9330c9905e772ab7bbfea12728a1dff9c0d1718f Reviewed-on: https://cl.tvl.fyi/c/depot/+/1992 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz>
2020-08-26 r/1720 fix(multi/home-manager): Prevent readTree failures on home-manager.nixVincent Ambo1-1/+1
This file is not a readTree-compatible Nix file, but rather a NixOS module. At some point it should be moved elsewhere and .skip-subtree'd to avoid this issue. Change-Id: If1b3f7cc80084af1f44036b8b9272f7b76438c2c Reviewed-on: https://cl.tvl.fyi/c/depot/+/1849 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz>
2020-08-10 r/1630 feat(users/multi): bootstrap home-manager configuration for whitbymulti15-0/+3677
Change-Id: Iad3024a5a640d33377cfae436134fda9f358397b Reviewed-on: https://cl.tvl.fyi/c/depot/+/1703 Tested-by: BuildkiteCI Reviewed-by: multi <depot@in-addr.xyz>
2020-08-09 r/1629 feat(whitby): add multimulti1-2/+11
Change-Id: Ibfc2a5fcf73099b8414b8c46958007374d14fd0a Reviewed-on: https://cl.tvl.fyi/c/depot/+/1701 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: isomer <isomer@tvl.fyi>
2020-08-09 r/1626 feat(users/multi): init, add SSH keysmulti2-0/+8
Change-Id: I93d6733595c96e0d4e67281e4781e2e0ff424a63 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1700 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: glittershark <grfn@gws.fyi>