waybar: fix by specifying bars as list instead of attrs (wtf home-manager?)

hosts/common/default.nix

@@ -5,6 +5,7 @@
     ./feeds.nix
     ./fs.nix
     ./hardware.nix
+    ./home
     ./i2p.nix
     ./ids.nix
     ./machine-id.nix
@@ -47,7 +48,6 @@
     "nixpkgs-overlays=${../..}/overlays"
   ];
 
-  # TODO: move this into home-manager?
   fonts = {
     enableDefaultFonts = true;
     fonts = with pkgs; [ font-awesome twitter-color-emoji hack-font ];

hosts/common/home/aerc.nix

@@ -5,7 +5,7 @@ lib.mkIf config.sane.home-manager.enable
 {
   sops.secrets."aerc_accounts" = {
     owner = config.users.users.colin.name;
-    sopsFile = ../../secrets/universal/aerc_accounts.conf;
+    sopsFile = ../../../secrets/universal/aerc_accounts.conf;
     format = "binary";
   };
   sane.fs."/home/colin/.config/aerc/accounts.conf" = sane-lib.fs.wantedSymlinkTo config.sops.secrets.aerc_accounts.path;

hosts/common/home/default.nix

@@ -0,0 +1,23 @@
+{ ... }:
+{
+  imports = [
+    ./aerc.nix
+    ./firefox.nix
+    ./gfeeds.nix
+    ./git.nix
+    ./gpodder.nix
+    ./keyring.nix
+    ./kitty.nix
+    ./libreoffice.nix
+    ./mime.nix
+    ./mpv.nix
+    ./neovim.nix
+    ./newsflash.nix
+    ./splatmoji.nix
+    ./ssh.nix
+    ./sublime-music.nix
+    ./vlc.nix
+    ./xdg-dirs.nix
+    ./zsh
+  ];
+}

hosts/common/home/git.nix

@@ -0,0 +1,19 @@
+{ config, lib, pkgs, sane-lib, ... }:
+
+let
+  mkCfg = lib.generators.toINI { };
+in
+lib.mkIf config.sane.home-manager.enable
+{
+  sane.fs."/home/colin/.config/git/config" = sane-lib.fs.wantedText (mkCfg {
+    user.name = "Colin";
+    user.email = "colin@uninsane.org";
+    alias.co = "checkout";
+    # difftastic docs:
+    # - <https://difftastic.wilfred.me.uk/git.html>
+    diff.tool = "difftastic";
+    difftool.prompt = false;
+    "difftool \"difftastic\"".cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
+    # now run `git difftool` to use difftastic git
+  });
+}

hosts/common/home/keyring.nix

@@ -5,7 +5,7 @@ lib.mkIf config.sane.home-manager.enable
   sane.persist.home.private = [ ".local/share/keyrings" ];
 
   sane.fs."/home/colin/private/.local/share/keyrings/default" = {
-    generated.script.script = builtins.readFile ../../scripts/init-keyring;
+    generated.script.script = builtins.readFile ../../../scripts/init-keyring;
     wantedBy = [ config.sane.fs."/home/colin/private".unit ];
   };
 }

hosts/common/home/kitty.nix

@@ -0,0 +1,69 @@
+{ config, lib, pkgs, sane-lib, ... }:
+
+lib.mkIf config.sane.home-manager.enable
+{
+  sane.fs."/home/colin/.config/kitty/kitty.conf" = sane-lib.fs.wantedText ''
+    # docs: https://sw.kovidgoyal.net/kitty/conf/
+    # disable terminal bell (when e.g. you backspace too many times)
+    enable_audio_bell no
+
+    map ctrl+n new_os_window_with_cwd
+
+    include ${pkgs.kitty-themes}/themes/PaperColor_dark.conf
+  '';
+  # THEME CHOICES:
+  #   docs: https://github.com/kovidgoyal/kitty-themes
+  # theme = "1984 Light";  # dislike: awful, harsh blues/teals
+  # theme = "Adventure Time";  # dislike: harsh (dark)
+  # theme = "Atom One Light";  # GOOD: light theme. all color combos readable. not a huge fan of the blue.
+  # theme = "Belafonte Day";  # dislike: too low contrast for text colors
+  # theme = "Belafonte Night";  # better: dark theme that's easy on the eyes. all combos readable. low contrast.
+  # theme = "Catppuccin";  # dislike: a bit pale/low-contrast (dark)
+  # theme = "Desert";  # mediocre: colors are harsh
+  # theme = "Earthsong";  # BEST: dark theme. readable, good contrast. unique, but decent colors.
+  # theme = "Espresso Libre";  # better: dark theme. readable, but meh colors
+  # theme = "Forest Night";  # decent: very pastel. it's workable, but unconventional and muted/flat.
+  # theme = "Gruvbox Material Light Hard";  # mediocre light theme.
+  # theme = "kanagawabones";  # better: dark theme. colors are too background-y
+  # theme = "Kaolin Dark";  # dislike: too dark
+  # theme = "Kaolin Breeze";  # mediocre: not-too-harsh light theme, but some parts are poor contrast
+  # theme = "Later This Evening";  # mediocre: not-too-harsh dark theme, but cursor is poor contrast
+  # theme = "Material"; # decent: light theme, few colors.
+  # theme = "Mayukai";  # decent: not-too-harsh dark theme. the teal is a bit straining
+  # theme = "Nord";  # mediocre: pale background, low contrast
+  # theme = "One Half Light";  # better: not-too-harsh light theme. contrast could be better
+  # theme = "PaperColor Dark";  # BEST: dark theme, very readable still the colors are background-y
+  # theme = "Parasio Dark";  # dislike: too low contrast
+  # theme = "Pencil Light";  # better: not-too-harsh light theme. decent contrast.
+  # theme = "Pnevma";  # dislike: too low contrast
+  # theme = "Piatto Light";  # better: readable light theme. pleasing colors. powerline prompt is hard to read.
+  # theme = "Rosé Pine Dawn";  # GOOD: light theme. all color combinations are readable. it is very mild -- may need to manually tweak contrast. tasteful colors
+  # theme = "Rosé Pine Moon";  # GOOD: dark theme. tasteful colors. but background is a bit intense
+  # theme = "Sea Shells";  # mediocre. not all color combos are readable
+  # theme = "Solarized Light";  # mediocre: not-too-harsh light theme; GREAT background; but some colors are low contrast
+  # theme = "Solarized Dark Higher Contrast";  # better: dark theme, decent colors
+  # theme = "Sourcerer";  # mediocre: ugly colors
+  # theme = "Space Gray";  # mediocre: too muted
+  # theme = "Space Gray Eighties";  # better: all readable, decent colors
+  # theme = "Spacemacs";  # mediocre: too muted
+  # theme = "Spring";  # mediocre: readable light theme, but the teal is ugly.
+  # theme = "Srcery";  # better: highly readable. colors are ehhh
+  # theme = "Substrata";  # decent: nice colors, but a bit flat.
+  # theme = "Sundried";  # mediocre: the solar text makes me squint
+  # theme = "Symfonic";  # mediocre: the dark purple has low contrast to the black bg.
+  # theme = "Tango Light";  # dislike: teal is too grating
+  # theme = "Tokyo Night Day";  # medicore: too muted
+  # theme = "Tokyo Night";  # better: tasteful. a bit flat
+  # theme = "Tomorrow";  # GOOD: all color combinations are readable. contrast is slightly better than Rose. on the blander side
+  # theme = "Treehouse";  # dislike: the orange is harsh on my eyes.
+  # theme = "Urple";  # dislike: weird palette
+  # theme = "Warm Neon";  # decent: not-too-harsh dark theme. the green is a bit unattractive
+  # theme = "Wild Cherry";  # GOOD: dark theme: nice colors. a bit flat
+  # theme = "Xcodedark";  # dislike: bad palette
+  # theme = "citylights";  # decent: dark theme. some parts have just a bit low contrast
+  # theme = "neobones_light"; # better light theme. the background is maybe too muted
+  # theme = "vimbones";
+  # theme = "zenbones_dark";  # mediocre: readable, but meh colors
+  # theme = "zenbones_light";  # decent: light theme. all colors are readable. contrast is passable but not excellent. highlight color is BAD
+  # theme = "zenwritten_dark";  # mediocre: looks same as zenbones_dark
+}

hosts/common/home/libreoffice.nix

@@ -0,0 +1,15 @@
+{ config, lib, sane-lib, ... }:
+
+lib.mkIf config.sane.home-manager.enable
+{
+  # libreoffice: disable first-run stuff
+  sane.fs."/home/colin/.config/libreoffice/4/user/registrymodifications.xcu" = sane-lib.fs.wantedText ''
+    <?xml version="1.0" encoding="UTF-8"?>
+    <oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      <item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="FirstRun" oor:op="fuse"><value>false</value></prop></item>
+      <item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="ShowTipOfTheDay" oor:op="fuse"><value>false</value></prop></item>
+    </oor:items>
+  '';
+  # <item oor:path="/org.openoffice.Setup/Product"><prop oor:name="LastTimeDonateShown" oor:op="fuse"><value>1667693880</value></prop></item>
+  # <item oor:path="/org.openoffice.Setup/Product"><prop oor:name="LastTimeGetInvolvedShown" oor:op="fuse"><value>1667693880</value></prop></item>
+}

hosts/common/home/mime.nix

@@ -0,0 +1,43 @@
+{ config, lib, sane-lib, ...}:
+
+let
+  www = config.sane.web-browser.browser.desktop;
+  pdf = "org.gnome.Evince.desktop";
+  md = "obsidian.desktop";
+  thumb = "org.gnome.gThumb.desktop";
+  video = "vlc.desktop";
+  # audio = "mpv.desktop";
+  audio = "vlc.desktop";
+in
+lib.mkIf config.sane.home-manager.enable
+{
+
+  # the xdg mime type for a file can be found with:
+  # - `xdg-mime query filetype path/to/thing.ext`
+  # we can have single associations or a list of associations.
+  # there's also options to *remove* [non-default] associations from specific apps
+  xdg.mime.enable = true;
+  xdg.mime.defaultApplications = {
+    # AUDIO
+    "audio/flac" = audio;
+    "audio/mpeg" = audio;
+    "audio/x-vorbis+ogg" = audio;
+    # IMAGES
+    "image/heif" = thumb;  # apple codec
+    "image/png" = thumb;
+    "image/jpeg" = thumb;
+    # VIDEO
+    "video/mp4" = video;
+    "video/quicktime" = video;
+    "video/x-matroska" = video;
+    # HTML
+    "text/html" = www;
+    "x-scheme-handler/http" = www;
+    "x-scheme-handler/https" = www;
+    "x-scheme-handler/about" = www;
+    "x-scheme-handler/unknown" = www;
+    # RICH-TEXT DOCUMENTS
+    "application/pdf" = pdf;
+    "text/markdown" = md;
+  };
+}

hosts/common/home/mpv.nix

@@ -0,0 +1,11 @@
+{ config, lib, sane-lib, ... }:
+
+lib.mkIf config.sane.home-manager.enable
+{
+  # format is <key>=%<length>%<value>
+  sane.fs."/home/colin/.config/mpv/mpv.conf" = sane-lib.fs.wantedText ''
+    save-position-on-quit=%3%yes
+    keep-open=%3%yes
+  '';
+}
+

hosts/common/home/neovim.nix

@@ -0,0 +1,130 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (builtins) map;
+  inherit (lib) concatMapStrings optionalString;
+  # this structure roughly mirrors home-manager's `programs.neovim.plugins` option
+  plugins = with pkgs.vimPlugins; [
+    # docs: surround-nvim: https://github.com/ur4ltz/surround.nvim/
+    # docs: vim-surround: https://github.com/tpope/vim-surround
+    { plugin = vim-surround; }
+    # docs: fzf-vim (fuzzy finder): https://github.com/junegunn/fzf.vim
+    { plugin = fzf-vim; }
+    ({
+      # docs: tex-conceal-vim: https://github.com/KeitaNakamura/tex-conceal.vim/
+      plugin = tex-conceal-vim;
+      type = "viml";
+      config = ''
+        " present prettier fractions
+        let g:tex_conceal_frac=1
+      '';
+    })
+    ({
+      plugin = vim-SyntaxRange;
+      type = "viml";
+      config = ''
+        " enable markdown-style codeblock highlighting for tex code
+        autocmd BufEnter * call SyntaxRange#Include('```tex', '```', 'tex', 'NonText')
+        " autocmd Syntax tex set conceallevel=2
+      '';
+    })
+    ({
+      # treesitter syntax highlighting: https://nixos.wiki/wiki/Tree_sitters
+      # docs: https://github.com/nvim-treesitter/nvim-treesitter
+      # config taken from: https://github.com/i077/system/blob/master/modules/home/neovim/default.nix
+      # this is required for tree-sitter to even highlight
+      plugin = nvim-treesitter.withAllGrammars;
+      type = "lua";
+      config = ''
+        require'nvim-treesitter.configs'.setup {
+          highlight = {
+            enable = true,
+            -- disable treesitter on Rust so that we can use SyntaxRange
+            -- and leverage TeX rendering in rust projects
+            disable = { "rust", "tex", "latex" },
+            -- disable = { "tex", "latex" },
+            -- true to also use builtin vim syntax highlighting when treesitter fails
+            additional_vim_regex_highlighting = false
+          },
+          incremental_selection = {
+            enable = true,
+            keymaps = {
+              init_selection = "gnn",
+              node_incremental = "grn",
+              mcope_incremental = "grc",
+              node_decremental = "grm"
+            }
+          },
+          indent = {
+            enable = true,
+            disable = {}
+          }
+        }
+
+        vim.o.foldmethod = 'expr'
+        vim.o.foldexpr = 'nvim_treesitter#foldexpr()'
+      '';
+    })
+  ];
+  plugin-packages = map (p: p.plugin) plugins;
+  plugin-config-tex = concatMapStrings (p: optionalString (p.type or "" == "viml") p.config) plugins;
+  plugin-config-lua = concatMapStrings (p: optionalString (p.type or "" == "lua") p.config) plugins;
+in
+lib.mkIf config.sane.home-manager.enable
+{
+  # private because there could be sensitive things in the swap
+  sane.persist.home.private = [ ".cache/vim-swap" ];
+
+  programs.neovim = {
+    # neovim: https://github.com/neovim/neovim
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    configure = {
+      packages.myVimPackage = {
+        start = plugin-packages;
+      };
+      customRC = ''
+        " let the terminal handle mouse events, that way i get OS-level ctrl+shift+c/etc
+        " this used to be default, until <https://github.com/neovim/neovim/pull/19290>
+        set mouse=
+
+        " copy/paste to system clipboard
+        set clipboard=unnamedplus
+
+        " screw tabs; always expand them into spaces
+        set expandtab
+
+        " at least don't open files with sections folded by default
+        set nofoldenable
+
+        " allow text substitutions for certain glyphs.
+        " higher number = more aggressive substitution (0, 1, 2, 3)
+        " i only make use of this for tex, but it's unclear how to
+        " apply that *just* to tex and retain the SyntaxRange stuff.
+        set conceallevel=2
+
+        " horizontal rule under the active line
+        " set cursorline
+
+        " highlight trailing space & related syntax errors (doesn't seem to work??)
+        " let c_space_errors=1
+        " let python_space_errors=1
+
+        " enable highlighting of leading/trailing spaces,
+        " and especially tabs
+        " source: https://www.reddit.com/r/neovim/comments/chlmfk/highlight_trailing_whitespaces_in_neovim/
+        set list
+        set listchars=tab:▷\·,trail:·,extends:◣,precedes:◢,nbsp:○
+
+        """"" PLUGIN CONFIG (tex)
+        ${plugin-config-tex}
+
+        """"" PLUGIN CONFIG (lua)
+        lua <<EOF
+        ${plugin-config-lua}
+        EOF
+      '';
+    };
+  };
+}

hosts/common/home/sublime-music.nix

@@ -5,7 +5,7 @@ lib.mkIf config.sane.home-manager.enable
   # TODO: this should only be shipped on gui platforms
   sops.secrets."sublime_music_config" = {
     owner = config.users.users.colin.name;
-    sopsFile = ../../secrets/universal/sublime_music_config.json.bin;
+    sopsFile = ../../../secrets/universal/sublime_music_config.json.bin;
     format = "binary";
   };
   sane.fs."/home/colin/.config/sublime-music/config.json" = sane-lib.fs.wantedSymlinkTo config.sops.secrets.sublime_music_config.path;

hosts/common/home/xdg-dirs.nix

@@ -0,0 +1,21 @@
+{ config, lib, sane-lib, ...}:
+
+lib.mkIf config.sane.home-manager.enable
+{
+  # XDG defines things like ~/Desktop, ~/Downloads, etc.
+  # these clutter the home, so i mostly don't use them.
+  sane.fs."/home/colin/.config/user-dirs.dirs" = sane-lib.fs.wantedText ''
+    XDG_DESKTOP_DIR="$HOME/.xdg/Desktop"
+    XDG_DOCUMENTS_DIR="$HOME/dev"
+    XDG_DOWNLOAD_DIR="$HOME/tmp"
+    XDG_MUSIC_DIR="$HOME/Music"
+    XDG_PICTURES_DIR="$HOME/Pictures"
+    XDG_PUBLICSHARE_DIR="$HOME/.xdg/Public"
+    XDG_TEMPLATES_DIR="$HOME/.xdg/Templates"
+    XDG_VIDEOS_DIR="$HOME/Videos"
+  '';
+
+  # prevent `xdg-user-dirs-update` from overriding/updating our config
+  # see <https://manpages.ubuntu.com/manpages/bionic/man5/user-dirs.conf.5.html>
+  sane.fs."/home/colin/.config/user-dirs.conf" = sane-lib.fs.wantedText "enabled=False";
+}

hosts/common/home/zsh/default.nix

@@ -0,0 +1,141 @@
+{ config, lib, pkgs, sane-lib, ... }:
+
+let
+  # powerlevel10k prompt config
+  # p10k.zsh is the auto-generated config, and i overwrite those defaults here, below.
+  p10k-overrides = ''
+    # powerlevel10k launches a gitstatusd daemon to accelerate git prompt queries.
+    # this keeps open file handles for any git repo i touch for 60 minutes (by default).
+    # that prevents unmounting whatever device the git repo is on -- particularly problematic for ~/private.
+    # i can disable gitstatusd and get slower fallback git queries:
+    # - either universally
+    # - or selectively by path
+    # see: <https://github.com/romkatv/powerlevel10k/issues/246>
+    typeset -g POWERLEVEL9K_VCS_DISABLED_DIR_PATTERN='(/home/colin/private/*|/home/colin/knowledge/*)'
+    # typeset -g POWERLEVEL9K_DISABLE_GITSTATUS=true
+
+    # show user@host also when logged into the current machine.
+    # default behavior is to show it only over ssh.
+    typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_CONTENT_EXPANSION='$P9K_CONTENT'
+  '';
+
+  prezto-init = ''
+    source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+    source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+    source ${pkgs.zsh-prezto}/share/zsh-prezto/init.zsh
+  '';
+in
+lib.mkIf config.sane.home-manager.enable
+{
+  sane.persist.home.plaintext = [
+    # we don't need to full zsh dir -- just the history file --
+    # but zsh will sometimes backup the history file and we get fewer errors if we do proper mounts instead of symlinks.
+    # TODO: should be private?
+    ".local/share/zsh"
+    # cache gitstatus otherwise p10k fetched it from the net EVERY BOOT
+    ".cache/gitstatus"
+  ];
+
+  # zsh/prezto complains if zshrc doesn't exist; but it does allow an "empty" file.
+  sane.fs."/home/colin/.config/zsh/.zshrc" = sane-lib.fs.wantedText "# ";
+
+  programs.zsh = {
+    enable = true;
+    histFile = "$HOME/.local/share/zsh/history";
+    shellAliases = {
+      ":q" = "exit";
+      # common typos
+      "cd.." = "cd ..";
+      "cd../" = "cd ../";
+    };
+    setOptions = [
+      # defaults:
+      "HIST_IGNORE_DUPS"
+      "SHARE_HISTORY"
+      "HIST_FCNTL_LOCK"
+      # disable `rm *` confirmations
+      "rmstarsilent"
+    ];
+
+    # .zshenv config:
+    shellInit = ''
+      ZDOTDIR=$HOME/.config/zsh
+    '';
+
+    # .zshrc config:
+    interactiveShellInit =
+      (builtins.readFile ./p10k.zsh)
+    + p10k-overrides
+    + prezto-init
+    + ''
+      # zmv is a way to do rich moves/renames, with pattern matching/substitution.
+      # see for an example: <https://filipe.kiss.ink/zmv-zsh-rename/>
+      autoload -Uz zmv
+
+      HISTORY_IGNORE='(sane-shutdown *|sane-reboot *|rm *)'
+
+      # extra aliases
+      # TODO: move to `shellAliases` config?
+      function nd() {
+        mkdir -p "$1";
+        pushd "$1";
+      }
+
+      # auto-cd into any of these dirs by typing them and pressing 'enter':
+      hash -d 3rd="/home/colin/dev/3rd"
+      hash -d dev="/home/colin/dev"
+      hash -d knowledge="/home/colin/knowledge"
+      hash -d nixos="/home/colin/nixos"
+      hash -d nixpkgs="/home/colin/dev/3rd/nixpkgs"
+      hash -d ref="/home/colin/ref"
+      hash -d secrets="/home/colin/knowledge/secrets"
+      hash -d tmp="/home/colin/tmp"
+      hash -d uninsane="/home/colin/dev/uninsane"
+      hash -d Videos="/home/colin/Videos"
+    '';
+
+    syntaxHighlighting.enable = true;
+    vteIntegration = true;
+  };
+
+  # enable a command-not-found hook to show nix packages that might provide the binary typed.
+  programs.nix-index.enable = true;
+  programs.command-not-found.enable = false;  #< mutually exclusive with nix-index
+
+  # prezto = oh-my-zsh fork; controls prompt, auto-completion, etc.
+  # see: https://github.com/sorin-ionescu/prezto
+  # i believe this file is auto-sourced by the prezto init.zsh script.
+  sane.fs."/home/colin/.config/zsh/.zpreztorc" = sane-lib.fs.wantedText ''
+    zstyle ':prezto:*:*' color 'yes'
+
+    # modules (they ship with prezto):
+    # ENVIRONMENT: configures jobs to persist after shell exit; other basic niceties
+    # TERMINAL: auto-titles terminal (e.g. based on cwd)
+    # EDITOR: configures shortcuts like Ctrl+U=undo, Ctrl+L=clear
+    # HISTORY: `history-stat` alias, setopts for good history defaults
+    # DIRECTORY: sets AUTO_CD, adds `d` alias to list directory stack, and `1`-`9` to cd that far back the stack
+    # SPECTRUM: helpers for term colors and styling. used by prompts? might be unnecessary
+    # UTILITY: configures aliases like `ll`, `la`, disables globbing for things like rsync
+    #   adds aliases like `get` to fetch a file. also adds `http-serve` alias??
+    # COMPLETION: tab completion. requires `utility` module prior to loading
+    # TODO: enable AUTO_PARAM_SLASH
+    zstyle ':prezto:load' pmodule \
+      'environment' \
+      'terminal' \
+      'editor' \
+      'history' \
+      'directory' \
+      'spectrum' \
+      'utility' \
+      'completion' \
+      'prompt'
+
+    # default keymap. try also `vicmd` (vim normal mode, AKA "cmd mode") or `vi`.
+    zstyle ':prezto:module:editor' key-bindings 'emacs'
+
+    zstyle ':prezto:module:prompt' theme 'powerlevel10k'
+
+    # disable `mv` confirmation (and `rm`, too, unfortunately)
+    zstyle ':prezto:module:utility' safe-ops 'no'
+  '';
+}

hosts/common/users.nix

@@ -87,6 +87,7 @@ in
       "Videos"
 
       ".cache/nix"
+      ".cache/nix-index"
       ".cargo"
       ".rustup"
     ];

hosts/modules/hostnames.nix

@@ -1,11 +1,21 @@
 { config, lib, ... }:
 
 {
-  # if using router's DNS, these mappings will already exist.
-  # if using a different DNS provider (which servo does), then we need to explicity provide them.
-  # ugly hack. would be better to get servo to somehow use the router's DNS
-  networking.hosts = lib.mapAttrs' (host: cfg: {
-    name = cfg.lan-ip;
-    value = [ host ];
-  }) config.sane.hosts.by-name;
+  # give each host a shortname that all the other hosts know, to allow easy comms.
+  networking.hosts = lib.mkMerge [
+    (lib.mapAttrs' (host: cfg: {
+      # bare-name for LAN addresses
+      # if using router's DNS, these mappings will already exist.
+      # if using a different DNS provider (which servo does), then we need to explicity provide them.
+      # ugly hack. would be better to get servo to somehow use the router's DNS
+      name = cfg.lan-ip;
+      value = [ host ];
+    }) config.sane.hosts.by-name)
+    (lib.mapAttrs' (host: cfg: {
+      # -hn suffixed name for communication over my wg-home VPN.
+      # hn = "home network"
+      name = cfg.wg-home.ip;
+      value = [ "${host}-hn" ];
+    }) config.sane.hosts.by-name)
+  ];
 }

modules/gui/sway.nix

@@ -1,9 +1,76 @@
-{ pkgs, lib, config, ... }:
+{ config, lib, pkgs, sane-lib, ... }:
  
 # docs: https://nixos.wiki/wiki/Sway
 with lib;
 let
   cfg = config.sane.gui.sway;
+  # docs: https://github.com/Alexays/Waybar/wiki/Configuration
+  # format specifiers: https://fmt.dev/latest/syntax.html#syntax
+  waybar-config = [
+    { # TOP BAR
+      layer = "top";
+      height = 40;
+      modules-left = ["sway/workspaces" "sway/mode"];
+      modules-center = ["sway/window"];
+      modules-right = ["custom/mediaplayer" "clock" "battery" "cpu" "network"];
+      "sway/window" = {
+        max-length = 50;
+      };
+      # include song artist/title. source: https://www.reddit.com/r/swaywm/comments/ni0vso/waybar_spotify_tracktitle/
+      "custom/mediaplayer" = {
+        exec = pkgs.writeShellScript "waybar-mediaplayer" ''
+          player_status=$(${pkgs.playerctl}/bin/playerctl status 2> /dev/null)
+          if [ "$player_status" = "Playing" ]; then
+            echo "$(${pkgs.playerctl}/bin/playerctl metadata artist) - $(${pkgs.playerctl}/bin/playerctl metadata title)"
+          elif [ "$player_status" = "Paused" ]; then
+            echo " $(${pkgs.playerctl}/bin/playerctl metadata artist) - $(${pkgs.playerctl}/bin/playerctl metadata title)"
+          fi
+        '';
+        interval = 2;
+        format = "{}  ";
+        # return-type = "json";
+        on-click = "${pkgs.playerctl}/bin/playerctl play-pause";
+        on-scroll-up = "${pkgs.playerctl}/bin/playerctl next";
+        on-scroll-down = "${pkgs.playerctl}/bin/playerctl previous";
+      };
+      network = {
+        # docs: https://github.com/Alexays/Waybar/blob/master/man/waybar-network.5.scd
+        interval = 2;
+        max-length = 40;
+        # custom :> format specifier explained here: https://github.com/Alexays/Waybar/pull/472
+        format-ethernet = "  {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
+        tooltip-format-ethernet = "{ifname} {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
+
+        format-wifi = "{ifname} ({signalStrength}%) {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
+        tooltip-format-wifi = "{essid} ({signalStrength}%) {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
+
+        format-disconnected = "";
+      };
+      cpu = {
+        format = " {usage:2}%";
+        tooltip = false;
+      };
+      battery = {
+        states = {
+          good = 95;
+          warning = 30;
+          critical = 10;
+        };
+        format = "{icon} {capacity}%";
+        format-icons = [
+          ""
+          ""
+          ""
+          ""
+          ""
+        ];
+      };
+      clock = {
+        format-alt = "{:%a, %d. %b  %H:%M}";
+      };
+    }
+  ];
+  waybar-config-text = lib.generators.toJSON {} waybar-config;
 in
 {
   options = {
@@ -288,351 +355,285 @@ in
       };
     };
 
-    sane.home-manager.programs.waybar = {
-      enable = true;
-      # docs: https://github.com/Alexays/Waybar/wiki/Configuration
-      # format specifiers: https://fmt.dev/latest/syntax.html#syntax
-      settings = {
-        mainBar = {
-          layer = "top";
-          height = 40;
-          modules-left = ["sway/workspaces" "sway/mode"];
-          modules-center = ["sway/window"];
-          modules-right = ["custom/mediaplayer" "clock" "battery" "cpu" "network"];
-          "sway/window" = {
-            max-length = 50;
-          };
-          # include song artist/title. source: https://www.reddit.com/r/swaywm/comments/ni0vso/waybar_spotify_tracktitle/
-          "custom/mediaplayer" = {
-            exec = pkgs.writeShellScript "waybar-mediaplayer" ''
-              player_status=$(${pkgs.playerctl}/bin/playerctl status 2> /dev/null)
-              if [ "$player_status" = "Playing" ]; then
-                echo "$(${pkgs.playerctl}/bin/playerctl metadata artist) - $(${pkgs.playerctl}/bin/playerctl metadata title)"
-              elif [ "$player_status" = "Paused" ]; then
-                echo " $(${pkgs.playerctl}/bin/playerctl metadata artist) - $(${pkgs.playerctl}/bin/playerctl metadata title)"
-              fi
-            '';
-            interval = 2;
-            format = "{}  ";
-            # return-type = "json";
-            on-click = "${pkgs.playerctl}/bin/playerctl play-pause";
-            on-scroll-up = "${pkgs.playerctl}/bin/playerctl next";
-            on-scroll-down = "${pkgs.playerctl}/bin/playerctl previous";
-          };
-          network = {
-            # docs: https://github.com/Alexays/Waybar/blob/master/man/waybar-network.5.scd
-            interval = 2;
-            max-length = 40;
-            # custom :> format specifier explained here: https://github.com/Alexays/Waybar/pull/472
-            format-ethernet = "  {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
-            tooltip-format-ethernet = "{ifname} {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
+    sane.fs."/home/colin/.config/waybar/config" = sane-lib.fs.wantedText waybar-config-text;
 
-            format-wifi = "{ifname} ({signalStrength}%) {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
-            tooltip-format-wifi = "{essid} ({signalStrength}%) {bandwidthUpBits:>}▲ {bandwidthDownBits:>}▼";
+    # style docs: https://github.com/Alexays/Waybar/wiki/Styling
+    sane.fs."/home/colin/.config/waybar/style.css" = sane-lib.fs.wantedText ''
+      * {
+        font-family: monospace;
+      }
 
-            format-disconnected = "";
-          };
-          cpu = {
-            format = " {usage:2}%";
-            tooltip = false;
-          };
-          battery = {
-            states = {
-              good = 95;
-              warning = 30;
-              critical = 10;
-            };
-            format = "{icon} {capacity}%";
-            format-icons = [
-              ""
-              ""
-              ""
-              ""
-              ""
-            ];
-          };
-          clock = {
-            format-alt = "{:%a, %d. %b  %H:%M}";
-          };
-        };
-      };
-      # style docs: https://github.com/Alexays/Waybar/wiki/Styling
-      style = ''
-        * {
-          font-family: monospace;
-        }
+      /* defaults below: https://github.com/Alexays/Waybar/blob/master/resources/style.css */
+      window#waybar {
+        background-color: rgba(43, 48, 59, 0.5);
+        border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+        color: #ffffff;
+        transition-property: background-color;
+        transition-duration: .5s;
+      }
 
-        /* defaults below: https://github.com/Alexays/Waybar/blob/master/resources/style.css */
-        window#waybar {
-          background-color: rgba(43, 48, 59, 0.5);
-          border-bottom: 3px solid rgba(100, 114, 125, 0.5);
-          color: #ffffff;
-          transition-property: background-color;
-          transition-duration: .5s;
-        }
+      window#waybar.hidden {
+        opacity: 0.2;
+      }
 
-        window#waybar.hidden {
-          opacity: 0.2;
-        }
+      /*
+      window#waybar.empty {
+        background-color: transparent;
+      }
+      window#waybar.solo {
+        background-color: #FFFFFF;
+      }
+      */
 
-        /*
-        window#waybar.empty {
-          background-color: transparent;
-        }
-        window#waybar.solo {
-          background-color: #FFFFFF;
-        }
-        */
+      window#waybar.termite {
+        background-color: #3F3F3F;
+      }
 
-        window#waybar.termite {
-          background-color: #3F3F3F;
-        }
+      window#waybar.chromium {
+        background-color: #000000;
+        border: none;
+      }
 
-        window#waybar.chromium {
-          background-color: #000000;
-          border: none;
-        }
+      #workspaces button {
+        padding: 0 5px;
+        background-color: transparent;
+        color: #ffffff;
+        /* Use box-shadow instead of border so the text isn't offset */
+        box-shadow: inset 0 -3px transparent;
+        /* Avoid rounded borders under each workspace name */
+        border: none;
+        border-radius: 0;
+      }
 
-        #workspaces button {
-          padding: 0 5px;
-          background-color: transparent;
-          color: #ffffff;
-          /* Use box-shadow instead of border so the text isn't offset */
-          box-shadow: inset 0 -3px transparent;
-          /* Avoid rounded borders under each workspace name */
-          border: none;
-          border-radius: 0;
-        }
+      /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+      #workspaces button:hover {
+        background: rgba(0, 0, 0, 0.2);
+        box-shadow: inset 0 -3px #ffffff;
+      }
 
-        /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-        #workspaces button:hover {
-          background: rgba(0, 0, 0, 0.2);
-          box-shadow: inset 0 -3px #ffffff;
-        }
+      #workspaces button.focused {
+        background-color: #64727D;
+        box-shadow: inset 0 -3px #ffffff;
+      }
 
-        #workspaces button.focused {
-          background-color: #64727D;
-          box-shadow: inset 0 -3px #ffffff;
-        }
+      #workspaces button.urgent {
+        background-color: #eb4d4b;
+      }
 
-        #workspaces button.urgent {
-          background-color: #eb4d4b;
-        }
+      #mode {
+        background-color: #64727D;
+        border-bottom: 3px solid #ffffff;
+      }
 
-        #mode {
-          background-color: #64727D;
-          border-bottom: 3px solid #ffffff;
-        }
+      #clock,
+      #battery,
+      #cpu,
+      #memory,
+      #disk,
+      #temperature,
+      #backlight,
+      #network,
+      #pulseaudio,
+      #custom-media,
+      #tray,
+      #mode,
+      #idle_inhibitor,
+      #mpd {
+        padding: 0 10px;
+        color: #ffffff;
+      }
 
-        #clock,
-        #battery,
-        #cpu,
-        #memory,
-        #disk,
-        #temperature,
-        #backlight,
-        #network,
-        #pulseaudio,
-        #custom-media,
-        #tray,
-        #mode,
-        #idle_inhibitor,
-        #mpd {
-          padding: 0 10px;
-          color: #ffffff;
-        }
+      #window,
+      #workspaces {
+        margin: 0 4px;
+      }
 
-        #window,
-        #workspaces {
-          margin: 0 4px;
-        }
+      /* If workspaces is the leftmost module, omit left margin */
+      .modules-left > widget:first-child > #workspaces {
+        margin-left: 0;
+      }
 
-        /* If workspaces is the leftmost module, omit left margin */
-        .modules-left > widget:first-child > #workspaces {
-          margin-left: 0;
-        }
+      /* If workspaces is the rightmost module, omit right margin */
+      .modules-right > widget:last-child > #workspaces {
+        margin-right: 0;
+      }
 
-        /* If workspaces is the rightmost module, omit right margin */
-        .modules-right > widget:last-child > #workspaces {
-          margin-right: 0;
-        }
+      #clock {
+        background-color: #64727D;
+      }
 
-        #clock {
-          background-color: #64727D;
-        }
+      #battery {
+        background-color: #ffffff;
+        color: #000000;
+      }
 
-        #battery {
+      #battery.charging, #battery.plugged {
+        color: #ffffff;
+        background-color: #26A65B;
+      }
+
+      @keyframes blink {
+        to {
           background-color: #ffffff;
           color: #000000;
         }
+      }
 
-        #battery.charging, #battery.plugged {
-          color: #ffffff;
-          background-color: #26A65B;
-        }
+      #battery.critical:not(.charging) {
+        background-color: #f53c3c;
+        color: #ffffff;
+        animation-name: blink;
+        animation-duration: 0.5s;
+        animation-timing-function: linear;
+        animation-iteration-count: infinite;
+        animation-direction: alternate;
+      }
 
-        @keyframes blink {
-          to {
-            background-color: #ffffff;
-            color: #000000;
-          }
-        }
+      label:focus {
+        background-color: #000000;
+      }
 
-        #battery.critical:not(.charging) {
-          background-color: #f53c3c;
-          color: #ffffff;
-          animation-name: blink;
-          animation-duration: 0.5s;
-          animation-timing-function: linear;
-          animation-iteration-count: infinite;
-          animation-direction: alternate;
-        }
+      #cpu {
+        background-color: #2ecc71;
+        color: #000000;
+      }
 
-        label:focus {
-          background-color: #000000;
-        }
+      #memory {
+        background-color: #9b59b6;
+      }
 
-        #cpu {
-          background-color: #2ecc71;
-          color: #000000;
-        }
+      #disk {
+        background-color: #964B00;
+      }
 
-        #memory {
-          background-color: #9b59b6;
-        }
+      #backlight {
+        background-color: #90b1b1;
+      }
 
-        #disk {
-          background-color: #964B00;
-        }
+      #network {
+        background-color: #2980b9;
+      }
 
-        #backlight {
-          background-color: #90b1b1;
-        }
+      #network.disconnected {
+        background-color: #f53c3c;
+      }
 
-        #network {
-          background-color: #2980b9;
-        }
+      #pulseaudio {
+        background-color: #f1c40f;
+        color: #000000;
+      }
 
-        #network.disconnected {
-          background-color: #f53c3c;
-        }
+      #pulseaudio.muted {
+        background-color: #90b1b1;
+        color: #2a5c45;
+      }
 
-        #pulseaudio {
-          background-color: #f1c40f;
-          color: #000000;
-        }
+      #custom-media {
+        background-color: #66cc99;
+        color: #2a5c45;
+        min-width: 100px;
+      }
 
-        #pulseaudio.muted {
-          background-color: #90b1b1;
-          color: #2a5c45;
-        }
+      #custom-media.custom-spotify {
+        background-color: #66cc99;
+      }
 
-        #custom-media {
-          background-color: #66cc99;
-          color: #2a5c45;
-          min-width: 100px;
-        }
+      #custom-media.custom-vlc {
+        background-color: #ffa000;
+      }
 
-        #custom-media.custom-spotify {
-          background-color: #66cc99;
-        }
+      #temperature {
+        background-color: #f0932b;
+      }
 
-        #custom-media.custom-vlc {
-          background-color: #ffa000;
-        }
+      #temperature.critical {
+        background-color: #eb4d4b;
+      }
 
-        #temperature {
-          background-color: #f0932b;
-        }
+      #tray {
+        background-color: #2980b9;
+      }
 
-        #temperature.critical {
-          background-color: #eb4d4b;
-        }
+      #tray > .passive {
+        -gtk-icon-effect: dim;
+      }
 
-        #tray {
-          background-color: #2980b9;
-        }
+      #tray > .needs-attention {
+        -gtk-icon-effect: highlight;
+        background-color: #eb4d4b;
+      }
 
-        #tray > .passive {
-          -gtk-icon-effect: dim;
-        }
+      #idle_inhibitor {
+        background-color: #2d3436;
+      }
 
-        #tray > .needs-attention {
-          -gtk-icon-effect: highlight;
-          background-color: #eb4d4b;
-        }
+      #idle_inhibitor.activated {
+        background-color: #ecf0f1;
+        color: #2d3436;
+      }
 
-        #idle_inhibitor {
-          background-color: #2d3436;
-        }
+      #mpd {
+        background-color: #66cc99;
+        color: #2a5c45;
+      }
 
-        #idle_inhibitor.activated {
-          background-color: #ecf0f1;
-          color: #2d3436;
-        }
+      #mpd.disconnected {
+        background-color: #f53c3c;
+      }
 
-        #mpd {
-          background-color: #66cc99;
-          color: #2a5c45;
-        }
+      #mpd.stopped {
+        background-color: #90b1b1;
+      }
 
-        #mpd.disconnected {
-          background-color: #f53c3c;
-        }
+      #mpd.paused {
+        background-color: #51a37a;
+      }
 
-        #mpd.stopped {
-          background-color: #90b1b1;
-        }
+      #language {
+        background: #00b093;
+        color: #740864;
+        padding: 0 5px;
+        margin: 0 5px;
+        min-width: 16px;
+      }
 
-        #mpd.paused {
-          background-color: #51a37a;
-        }
+      #keyboard-state {
+        background: #97e1ad;
+        color: #000000;
+        padding: 0 0px;
+        margin: 0 5px;
+        min-width: 16px;
+      }
 
-        #language {
-          background: #00b093;
-          color: #740864;
-          padding: 0 5px;
-          margin: 0 5px;
-          min-width: 16px;
-        }
+      #keyboard-state > label {
+        padding: 0 5px;
+      }
 
-        #keyboard-state {
-          background: #97e1ad;
-          color: #000000;
-          padding: 0 0px;
-          margin: 0 5px;
-          min-width: 16px;
-        }
+      #keyboard-state > label.locked {
+        background: rgba(0, 0, 0, 0.2);
+      }
+    '';
+    # style = ''
+    #   * {
+    #     border: none;
+    #     border-radius: 0;
+    #     font-family: Source Code Pro;
+    #   }
+    #   window#waybar {
+    #     background: #16191C;
+    #     color: #AAB2BF;
+    #   }
+    #   #workspaces button {
+    #     padding: 0 5px;
+    #   }
+    #   .custom-spotify {
+    #     padding: 0 10px;
+    #     margin: 0 4px;
+    #     background-color: #1DB954;
+    #     color: black;
+    #   }
+    # '';
 
-        #keyboard-state > label {
-          padding: 0 5px;
-        }
-
-        #keyboard-state > label.locked {
-          background: rgba(0, 0, 0, 0.2);
-        }
-      '';
-      # style = ''
-      #   * {
-      #     border: none;
-      #     border-radius: 0;
-      #     font-family: Source Code Pro;
-      #   }
-      #   window#waybar {
-      #     background: #16191C;
-      #     color: #AAB2BF;
-      #   }
-      #   #workspaces button {
-      #     padding: 0 5px;
-      #   }
-      #   .custom-spotify {
-      #     padding: 0 10px;
-      #     margin: 0 4px;
-      #     background-color: #1DB954;
-      #     color: black;
-      #   }
-      # '';
-    };
     sane.packages.extraUserPkgs = with pkgs; [
       swaylock
       swayidle  # (unused)

modules/home-manager/default.nix

@@ -13,24 +13,6 @@ let
   pkg-list = pkgspec: builtins.map (e: e.pkg) pkgspec;
 in
 {
-  imports = [
-    ./aerc.nix
-    ./firefox.nix
-    ./gfeeds.nix
-    ./git.nix
-    ./gpodder.nix
-    ./keyring.nix
-    ./kitty.nix
-    ./mpv.nix
-    ./neovim.nix
-    ./newsflash.nix
-    ./splatmoji.nix
-    ./ssh.nix
-    ./sublime-music.nix
-    ./vlc.nix
-    ./zsh
-  ];
-
   options = {
     sane.home-manager.enable = mkOption {
       default = false;
@@ -41,106 +23,30 @@ in
       default = {};
       type = types.attrs;
     };
-
-    # extra attributes to include in home-manager's `programs` option
-    sane.home-manager.programs = mkOption {
-      default = {};
-      type = types.attrs;
-    };
   };
 
   config = lib.mkIf cfg.enable {
     home-manager.useGlobalPkgs = true;
     home-manager.useUserPackages = true;
 
-    # XXX this weird rename + closure is to get home-manager's `config.lib.file` to exist.
-    # see: https://github.com/nix-community/home-manager/issues/589#issuecomment-950474105
-    home-manager.users.colin = let sysconfig = config; in { config, ... }: {
+    home-manager.users.colin = {
 
       # run `home-manager-help` to access manpages
       # or `man home-configuration.nix`
       manual.html.enable = false;  # TODO: set to true later (build failure)
       manual.manpages.enable = false;  # TODO: enable after https://github.com/nix-community/home-manager/issues/3344
 
-      home.packages = pkg-list sysconfig.sane.packages.enabledUserPkgs;
+      home.packages = pkg-list config.sane.packages.enabledUserPkgs;
       wayland.windowManager = cfg.windowManager;
 
       home.stateVersion = "21.11";
       home.username = "colin";
       home.homeDirectory = "/home/colin";
 
-      # XDG defines things like ~/Desktop, ~/Downloads, etc.
-      # these clutter the home, so i mostly don't use them.
-      xdg.userDirs = {
-        enable = true;
-        createDirectories = false;  # on headless systems, most xdg dirs are noise
-        desktop = "$HOME/.xdg/Desktop";
-        documents = "$HOME/dev";
-        download = "$HOME/tmp";
-        music = "$HOME/Music";
-        pictures = "$HOME/Pictures";
-        publicShare = "$HOME/.xdg/Public";
-        templates = "$HOME/.xdg/Templates";
-        videos = "$HOME/Videos";
+      programs = {
+        # XXX: unsure what this does?
+        home-manager.enable = true;
       };
-
-      # the xdg mime type for a file can be found with:
-      # - `xdg-mime query filetype path/to/thing.ext`
-      xdg.mimeApps.enable = true;
-      xdg.mimeApps.defaultApplications = let
-        www = sysconfig.sane.web-browser.browser.desktop;
-        pdf = "org.gnome.Evince.desktop";
-        md = "obsidian.desktop";
-        thumb = "org.gnome.gThumb.desktop";
-        video = "vlc.desktop";
-        # audio = "mpv.desktop";
-        audio = "vlc.desktop";
-      in {
-        # HTML
-        "text/html" = [ www ];
-        "x-scheme-handler/http" = [ www ];
-        "x-scheme-handler/https" = [ www ];
-        "x-scheme-handler/about" = [ www ];
-        "x-scheme-handler/unknown" = [ www ];
-        # RICH-TEXT DOCUMENTS
-        "application/pdf" = [ pdf ];
-        "text/markdown" = [ md ];
-        # IMAGES
-        "image/heif" = [ thumb ];  # apple codec
-        "image/png" = [ thumb ];
-        "image/jpeg" = [ thumb ];
-        # VIDEO
-        "video/mp4" = [ video ];
-        "video/quicktime" = [ video ];
-        "video/x-matroska" = [ video ];
-        # AUDIO
-        "audio/flac" = [ audio ];
-        "audio/mpeg" = [ audio ];
-        "audio/x-vorbis+ogg" = [ audio ];
-      };
-
-      # libreoffice: disable first-run stuff
-      xdg.configFile."libreoffice/4/user/registrymodifications.xcu".text = ''
-        <?xml version="1.0" encoding="UTF-8"?>
-        <oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-          <item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="FirstRun" oor:op="fuse"><value>false</value></prop></item>
-          <item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="ShowTipOfTheDay" oor:op="fuse"><value>false</value></prop></item>
-        </oor:items>
-      '';
-      # <item oor:path="/org.openoffice.Setup/Product"><prop oor:name="LastTimeDonateShown" oor:op="fuse"><value>1667693880</value></prop></item>
-      # <item oor:path="/org.openoffice.Setup/Product"><prop oor:name="LastTimeGetInvolvedShown" oor:op="fuse"><value>1667693880</value></prop></item>
-
-
-      programs = lib.mkMerge [
-        {
-          home-manager.enable = true;  # this lets home-manager manage dot-files in user dirs, i think
-          # "command not found" will cause the command to be searched in nixpkgs
-          nix-index.enable = true;
-        }
-        cfg.programs
-      ];
     };
-
-    sane.persist.home.plaintext = [ ".cache/nix-index" ];
   };
 }

modules/home-manager/git.nix

@@ -1,20 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-lib.mkIf config.sane.home-manager.enable
-{
-  home-manager.users.colin.programs.git = {
-    enable = true;
-    userName = "colin";
-    userEmail = "colin@uninsane.org";
-
-    aliases = { co = "checkout"; };
-    extraConfig = {
-      # difftastic docs:
-      # - <https://difftastic.wilfred.me.uk/git.html>
-      diff.tool = "difftastic";
-      difftool.prompt = false;
-      "difftool \"difftastic\"".cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
-      # now run `git difftool` to use difftastic git
-    };
-  };
-}

modules/home-manager/kitty.nix

@@ -1,71 +0,0 @@
-{ config, lib, ... }:
-
-lib.mkIf config.sane.home-manager.enable
-{
-  home-manager.users.colin.programs.kitty = {
-    enable = true;
-    # docs: https://sw.kovidgoyal.net/kitty/conf/
-    settings = {
-      # disable terminal bell (when e.g. you backspace too many times)
-      enable_audio_bell = false;
-    };
-    keybindings = {
-      "ctrl+n" = "new_os_window_with_cwd";
-    };
-    # docs: https://github.com/kovidgoyal/kitty-themes
-    # theme = "1984 Light";  # dislike: awful, harsh blues/teals
-    # theme = "Adventure Time";  # dislike: harsh (dark)
-    # theme = "Atom One Light";  # GOOD: light theme. all color combos readable. not a huge fan of the blue.
-    # theme = "Belafonte Day";  # dislike: too low contrast for text colors
-    # theme = "Belafonte Night";  # better: dark theme that's easy on the eyes. all combos readable. low contrast.
-    # theme = "Catppuccin";  # dislike: a bit pale/low-contrast (dark)
-    # theme = "Desert";  # mediocre: colors are harsh
-    # theme = "Earthsong";  # BEST: dark theme. readable, good contrast. unique, but decent colors.
-    # theme = "Espresso Libre";  # better: dark theme. readable, but meh colors
-    # theme = "Forest Night";  # decent: very pastel. it's workable, but unconventional and muted/flat.
-    # theme = "Gruvbox Material Light Hard";  # mediocre light theme.
-    # theme = "kanagawabones";  # better: dark theme. colors are too background-y
-    # theme = "Kaolin Dark";  # dislike: too dark
-    # theme = "Kaolin Breeze";  # mediocre: not-too-harsh light theme, but some parts are poor contrast
-    # theme = "Later This Evening";  # mediocre: not-too-harsh dark theme, but cursor is poor contrast
-    # theme = "Material"; # decent: light theme, few colors.
-    # theme = "Mayukai";  # decent: not-too-harsh dark theme. the teal is a bit straining
-    # theme = "Nord";  # mediocre: pale background, low contrast
-    # theme = "One Half Light";  # better: not-too-harsh light theme. contrast could be better
-    theme = "PaperColor Dark";  # BEST: dark theme, very readable still the colors are background-y
-    # theme = "Parasio Dark";  # dislike: too low contrast
-    # theme = "Pencil Light";  # better: not-too-harsh light theme. decent contrast.
-    # theme = "Pnevma";  # dislike: too low contrast
-    # theme = "Piatto Light";  # better: readable light theme. pleasing colors. powerline prompt is hard to read.
-    # theme = "Rosé Pine Dawn";  # GOOD: light theme. all color combinations are readable. it is very mild -- may need to manually tweak contrast. tasteful colors
-    # theme = "Rosé Pine Moon";  # GOOD: dark theme. tasteful colors. but background is a bit intense
-    # theme = "Sea Shells";  # mediocre. not all color combos are readable
-    # theme = "Solarized Light";  # mediocre: not-too-harsh light theme; GREAT background; but some colors are low contrast
-    # theme = "Solarized Dark Higher Contrast";  # better: dark theme, decent colors
-    # theme = "Sourcerer";  # mediocre: ugly colors
-    # theme = "Space Gray";  # mediocre: too muted
-    # theme = "Space Gray Eighties";  # better: all readable, decent colors
-    # theme = "Spacemacs";  # mediocre: too muted
-    # theme = "Spring";  # mediocre: readable light theme, but the teal is ugly.
-    # theme = "Srcery";  # better: highly readable. colors are ehhh
-    # theme = "Substrata";  # decent: nice colors, but a bit flat.
-    # theme = "Sundried";  # mediocre: the solar text makes me squint
-    # theme = "Symfonic";  # mediocre: the dark purple has low contrast to the black bg.
-    # theme = "Tango Light";  # dislike: teal is too grating
-    # theme = "Tokyo Night Day";  # medicore: too muted
-    # theme = "Tokyo Night";  # better: tasteful. a bit flat
-    # theme = "Tomorrow";  # GOOD: all color combinations are readable. contrast is slightly better than Rose. on the blander side
-    # theme = "Treehouse";  # dislike: the orange is harsh on my eyes.
-    # theme = "Urple";  # dislike: weird palette
-    # theme = "Warm Neon";  # decent: not-too-harsh dark theme. the green is a bit unattractive
-    # theme = "Wild Cherry";  # GOOD: dark theme: nice colors. a bit flat
-    # theme = "Xcodedark";  # dislike: bad palette
-    # theme = "citylights";  # decent: dark theme. some parts have just a bit low contrast
-    # theme = "neobones_light"; # better light theme. the background is maybe too muted
-    # theme = "vimbones";
-    # theme = "zenbones_dark";  # mediocre: readable, but meh colors
-    # theme = "zenbones_light";  # decent: light theme. all colors are readable. contrast is passable but not excellent. highlight color is BAD
-    # theme = "zenwritten_dark";  # mediocre: looks same as zenbones_dark
-    # extraConfig = "";
-  };
-}

modules/home-manager/mpv.nix

@@ -1,13 +0,0 @@
-{ config, lib, ... }:
-
-lib.mkIf config.sane.home-manager.enable
-{
-  home-manager.users.colin.programs.mpv = {
-    enable = true;
-    config = {
-      save-position-on-quit = true;
-      keep-open = "yes";
-    };
-  };
-}
-

modules/home-manager/neovim.nix

@@ -1,109 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-lib.mkIf config.sane.home-manager.enable
-{
-  # private because there could be sensitive things in the swap
-  sane.persist.home.private = [ ".cache/vim-swap" ];
-
-  home-manager.users.colin.programs.neovim = {
-    # neovim: https://github.com/neovim/neovim
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-    plugins = with pkgs.vimPlugins; [
-      # docs: surround-nvim: https://github.com/ur4ltz/surround.nvim/
-      # docs: vim-surround: https://github.com/tpope/vim-surround
-      vim-surround
-      # docs: fzf-vim (fuzzy finder): https://github.com/junegunn/fzf.vim
-      fzf-vim
-      # docs: https://github.com/KeitaNakamura/tex-conceal.vim/
-      ({
-        plugin = tex-conceal-vim;
-        type = "viml";
-        config = ''
-          " present prettier fractions
-          let g:tex_conceal_frac=1
-        '';
-      })
-      ({
-        plugin = vim-SyntaxRange;
-        type = "viml";
-        config = ''
-          " enable markdown-style codeblock highlighting for tex code
-          autocmd BufEnter * call SyntaxRange#Include('```tex', '```', 'tex', 'NonText')
-          " autocmd Syntax tex set conceallevel=2
-        '';
-      })
-      # treesitter syntax highlighting: https://nixos.wiki/wiki/Tree_sitters
-      # docs: https://github.com/nvim-treesitter/nvim-treesitter
-      # config taken from: https://github.com/i077/system/blob/master/modules/home/neovim/default.nix
-      # this is required for tree-sitter to even highlight
-      ({
-        plugin = nvim-treesitter.withAllGrammars;
-        type = "lua";
-        config = ''
-          require'nvim-treesitter.configs'.setup {
-            highlight = {
-              enable = true,
-              -- disable treesitter on Rust so that we can use SyntaxRange
-              -- and leverage TeX rendering in rust projects
-              disable = { "rust", "tex", "latex" },
-              -- disable = { "tex", "latex" },
-              -- true to also use builtin vim syntax highlighting when treesitter fails
-              additional_vim_regex_highlighting = false
-            },
-            incremental_selection = {
-              enable = true,
-              keymaps = {
-                init_selection = "gnn",
-                node_incremental = "grn",
-                mcope_incremental = "grc",
-                node_decremental = "grm"
-              }
-            },
-            indent = {
-              enable = true,
-              disable = {}
-            }
-          }
-
-          vim.o.foldmethod = 'expr'
-          vim.o.foldexpr = 'nvim_treesitter#foldexpr()'
-        '';
-      })
-    ];
-    extraConfig = ''
-      " let the terminal handle mouse events, that way i get OS-level ctrl+shift+c/etc
-      " this used to be default, until <https://github.com/neovim/neovim/pull/19290>
-      set mouse=
-
-      " copy/paste to system clipboard
-      set clipboard=unnamedplus
-
-      " screw tabs; always expand them into spaces
-      set expandtab
-
-      " at least don't open files with sections folded by default
-      set nofoldenable
-
-      " allow text substitutions for certain glyphs.
-      " higher number = more aggressive substitution (0, 1, 2, 3)
-      " i only make use of this for tex, but it's unclear how to
-      " apply that *just* to tex and retain the SyntaxRange stuff.
-      set conceallevel=2
-
-      " horizontal rule under the active line
-      " set cursorline
-
-      " highlight trailing space & related syntax errors (doesn't seem to work??)
-      " let c_space_errors=1
-      " let python_space_errors=1
-
-      " enable highlighting of leading/trailing spaces,
-      " and especially tabs
-      " source: https://www.reddit.com/r/neovim/comments/chlmfk/highlight_trailing_whitespaces_in_neovim/
-      set list
-      set listchars=tab:▷\·,trail:·,extends:◣,precedes:◢,nbsp:○
-    '';
-  };
-}

modules/home-manager/zsh/default.nix

@@ -1,108 +0,0 @@
-{ config, lib, ... }:
-
-lib.mkIf config.sane.home-manager.enable
-{
-  sane.persist.home.plaintext = [
-    # we don't need to full zsh dir -- just the history file --
-    # but zsh will sometimes backup the history file and we get fewer errors if we do proper mounts instead of symlinks.
-    # TODO: should be private?
-    ".local/share/zsh"
-    # cache gitstatus otherwise p10k fetched it from the net EVERY BOOT
-    ".cache/gitstatus"
-  ];
-
-  home-manager.users.colin.programs.zsh = {
-    enable = true;
-    enableSyntaxHighlighting = true;
-    enableVteIntegration = true;
-    history.ignorePatterns = [ "rm *" ];
-    dotDir = ".config/zsh";
-    history.path = "/home/colin/.local/share/zsh/history";
-
-    # defaultKeymap = "vicmd"; # vim normal mode (cmd mode)
-
-    # powerlevel10k prompt config
-    # p10k.zsh is the auto-generated config, and i overwrite those defaults here, below.
-    initExtraBeforeCompInit = (builtins.readFile ./p10k.zsh) + ''
-      # powerlevel10k launches a gitstatusd daemon to accelerate git prompt queries.
-      # this keeps open file handles for any git repo i touch for 60 minutes (by default).
-      # that prevents unmounting whatever device the git repo is on -- particularly problematic for ~/private.
-      # i can disable gitstatusd and get slower fallback git queries:
-      # - either universally
-      # - or selectively by path
-      # see: <https://github.com/romkatv/powerlevel10k/issues/246>
-      typeset -g POWERLEVEL9K_VCS_DISABLED_DIR_PATTERN='(/home/colin/private/*|/home/colin/knowledge/*)'
-      # typeset -g POWERLEVEL9K_DISABLE_GITSTATUS=true
-
-      # show user@host also when logged into the current machine.
-      # default behavior is to show it only over ssh.
-      typeset -g POWERLEVEL9K_CONTEXT_{DEFAULT,SUDO}_CONTENT_EXPANSION='$P9K_CONTENT'
-    '';
-
-    initExtra = ''
-      # zmv is a way to do rich moves/renames, with pattern matching/substitution.
-      # see for an example: <https://filipe.kiss.ink/zmv-zsh-rename/>
-      autoload -Uz zmv
-
-      # disable `rm *` confirmations
-      setopt rmstarsilent
-
-      function nd() {
-        mkdir -p "$1";
-        pushd "$1";
-      }
-    '';
-
-    # prezto = oh-my-zsh fork; controls prompt, auto-completion, etc.
-    # see: https://github.com/sorin-ionescu/prezto
-    prezto = {
-      enable = true;
-      pmodules = [
-        # configures jobs to persist after shell exit; other basic niceties
-        "environment"
-        # auto-titles terminal (e.g. based on cwd)
-        "terminal"
-        # configures shortcuts like Ctrl+U=undo, Ctrl+L=clear
-        "editor"
-        # adds `history-stat` alias, setopts for good history defaults
-        "history"
-        # sets AUTO_CD, adds `d` alias to list directory stack, and `1`-`9` to cd that far back the stack
-        "directory"
-        # helpers for term colors and styling. used by prompts? might be unnecessary
-        "spectrum"
-        # configures aliases like `ll`, `la`, disables globbing for things like rsync
-        # adds aliases like `get` to fetch a file. also adds `http-serve` alias??
-        "utility"
-        # tab completion. requires `utility` module prior to loading
-        # TODO: enable AUTO_PARAM_SLASH
-        "completion"
-        "prompt"
-        # TODO: enable syntax-highlighting ?
-      ];
-      prompt.theme = "powerlevel10k";
-      utility.safeOps = false;  # disable `mv` confirmation (and supposedly `rm`, too)
-      # editor.keymap = "vi";
-    };
-
-    dirHashes = {
-      # convenient `cd`-isms
-      "3rd" = "/home/colin/dev/3rd";
-      "dev" = "/home/colin/dev";
-      "knowledge" = "/home/colin/knowledge";
-      "nixos" = "/home/colin/nixos";
-      "nixpkgs" = "/home/colin/dev/3rd/nixpkgs";
-      "ref" = "/home/colin/ref";
-      "secrets" = "/home/colin/knowledge/secrets";
-      "tmp" = "/home/colin/tmp";
-      "uninsane" = "/home/colin/dev/uninsane";
-      "Videos" = "/home/colin/Videos";
-    };
-  };
-
-  home-manager.users.colin.home.shellAliases = {
-    ":q" = "exit";
-    # common typos
-    "cd.." = "cd ..";
-    "cd../" = "cd ../";
-  };
-}

modules/packages.nix

@@ -112,6 +112,7 @@ let
 
     kdenlive
     kid3  # audio tagging
+    kitty
     krita
     libreoffice-fresh  # XXX colin: maybe don't want this on mobile
     lollypop
@@ -205,6 +206,7 @@ let
     fd
     file
     gawk
+    git
     gptfdisk
     hdparm
     htop

nixpatches/list.nix

@@ -20,6 +20,14 @@
     hash = "sha256-nkXgwQUtxYkJT2OzG6Jc72snizW5wHvR1nmh2KDnaPc=";
   })
 
+  # fix handbrake build by: handbrake: 1.5.1 -> 1.6.1
+  # PR opened 2023/01/23
+  (fetchpatch {
+    # see alternate fix: <https://github.com/NixOS/nixpkgs/pull/211834>
+    url = "https://github.com/NixOS/nixpkgs/pull/212306.diff";
+    hash = "sha256-iQX2NaZaCzZVRlCM0pgXt0gecNwhXGeh3kXEiY38ZIM=";
+  })
+
   ./2022-12-19-i2p-aarch64.patch
 
   # fix for <https://gitlab.com/signald/signald/-/issues/345>

overlays/pins.nix

@@ -30,8 +30,5 @@
     #   error: 1 dependencies of derivation '/nix/store/hrb3qpdbisqh0lzlyz1g9g4164khmqwn-etc.drv' failed to build
     #   error: 1 dependencies of derivation '/nix/store/ny21xyicbgim5wy7ksg2hibd9gn7i01b-nixos-system-moby-23.05pre-git.drv' failed to build
     # nheko
-
-    # TODO(unpin): broken build on 2023/01/16. <https://hydra.nixos.org/build/205551450>
-    handbrake
   ;
 })