refactor(home/work): improve configuration structure

- Add nixpkgs.config.allowUnfree setting
- Fix nixGL configuration path to targets.genericLinux.nixGL
- Remove redundant anki program import (now in modules)
- Enable gh and kubecolor programs
- Pass inputs to packages.nix for flake package access

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

.envrc

@@ -1 +0,0 @@
-use flake

.gitignore

@@ -1,7 +1,3 @@
-#
-.claude/
-home/hosts/work/packages.local.nix
-
 # ---> Nix
 # Ignore build outputs from performing a nix-build or `nix build` command
 result
@@ -9,5 +5,4 @@ result-*
 
 nixos-efi-vars.fd
 
-.direnv/
-.pre-commit-config.yaml
+home/hosts/work/packages.local.nix

.mcp.json

@@ -1,7 +0,0 @@
-{
-  "mcpServers": {
-    "nixos": {
-      "command": "mcp-nixos"
-    }
-  }
-}

README.md

@@ -1,30 +1,15 @@
-# ❄️ NixOS flake
+# NixOS flake
 
-![nix](https://img.shields.io/badge/nix-blue?logo=nixos&logoColor=%234d6fb7&labelColor=%23fff&color=%234d6fb7&link=https%3A%2F%2Fnixos.org%2F)
-![neovim](https://img.shields.io/badge/neovim-flat?logo=neovim&logoColor=%23408040&labelColor=%23fff&color=%2380C040)
+## Set up virtual machine ([`disko`](https://github.com/nix-community/disko/blob/master/docs/interactive-vm.md))
 
-## hosts
-
-### NixOS
-
-```
-nixos-rebuild switch --flake .#<hostname>
-```
-
-### home manager
-
-```
-home-manager switch --flake .#work
-```
-
-### virtual machines
+1. Build the virtual machine
 
 ```
 nix build -L '.#nixosConfigurations.vm.config.system.build.vmWithDisko'
-./result/bin/disko-vm
 ```
 
-## docs
+2. Run the virtual machine
 
-* [deploy using colmena](./deploy/README.md)
-* [SD installer images](./images/README.md)
+```
+./result/bin/disko-vm
+```

deploy/README.md

@@ -1,10 +0,0 @@
-# `colmena` deployments
-
-* tags: `personal`, `lab`
-* deployments can be made from `astyanax` and `andromache` hosts
-* `hecuba` uses `deploy-rs` instead of `colmena` (see `./deploy-rs.nix`)
-
-## References
-
-- [docs: `colmena`](https://colmena.cli.rs/)
-- [repo: `colmena`](https://github.com/zhaofengli/colmena)

deploy/colmena.nix

@@ -1,51 +0,0 @@
-{
-  self,
-  inputs,
-}:
-
-let
-  inherit (inputs.nixpkgs) lib;
-  utils = import ../utils { inherit lib; };
-  # exclude hosts that need auto rollback (until `colmena` supports it) for
-  # now, we use `deploy-rs` (which has magic rollback) for those (also see ./deploy-rs.nix)
-  #
-  # see <https://github.com/nix-community/colmena/issues/38>
-  #     <https://github.com/nix-community/colmena/issues/344>
-  hostnames = lib.filter (
-    hostname: !((utils.hostMeta ../hosts/${hostname}).deploy.autoRollback or false)
-  ) (utils.dirNames ../hosts);
-
-  mkNode =
-    hostname:
-    let
-      meta = utils.hostMeta ../hosts/${hostname};
-      isArm = meta.system == "aarch64-linux";
-    in
-    {
-      imports = [ ../hosts/${hostname} ];
-      host.name = hostname;
-      deployment = {
-        inherit (meta) tags;
-        targetUser = meta.host.username;
-        targetHost = hostname;
-        allowLocalDeployment = meta.host.admin or false;
-        buildOnTarget = !isArm;
-      };
-    };
-
-  nodes = lib.genAttrs hostnames mkNode;
-in
-inputs.colmena.lib.makeHive (
-  {
-    meta = {
-      nixpkgs = import inputs.nixpkgs { localSystem = "x86_64-linux"; };
-      specialArgs = {
-        inherit inputs;
-        outputs = self;
-        dotsPath = ../dots;
-        myUtils = utils;
-      };
-    };
-  }
-  // nodes
-)

deploy/deploy-rs.nix

@@ -1,34 +0,0 @@
-{
-  self,
-  inputs,
-}:
-
-let
-  inherit (inputs.nixpkgs) lib;
-  utils = import ../utils { inherit lib; };
-
-  # only include hosts that need auto rollback (until `colmena` supports it)
-  # `colmena` is used for other hosts (see ./colmena.nix)
-  hostnames = lib.filter (
-    hostname: (utils.hostMeta ../hosts/${hostname}).deploy.autoRollback or false
-  ) (utils.dirNames ../hosts);
-
-  mkNode =
-    hostname:
-    let
-      meta = utils.hostMeta ../hosts/${hostname};
-    in
-    {
-      inherit hostname;
-      sshUser = meta.host.username;
-      magicRollback = true;
-      autoRollback = true;
-      profiles.system = {
-        user = "root";
-        path = inputs.deploy-rs.lib.${meta.system}.activate.nixos self.nixosConfigurations.${hostname};
-      };
-    };
-in
-{
-  nodes = lib.genAttrs hostnames mkNode;
-}

dots/.bash_aliases/all

@@ -27,6 +27,8 @@ alias ipa="ip -brief address"
 alias ipl="ip -brief link"
 alias ipr="ip route"
 
+alias clip="xclip -sel clip"
+
 alias df="df -kTh"
 alias fzfpac="pacman -Slq | fzf -m --preview 'pacman -Si {1}' | xargs -ro sudo pacman -S"
 alias path='echo -e ${PATH//:/\\n}' # Pretty print path variables

dots/.bash_profile

@@ -2,6 +2,7 @@
 # shellcheck disable=SC1090
 [[ -f ~/.bashrc ]] && . ~/.bashrc
 
+export SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/ssh-agent.socket"
 export _JAVA_AWT_WM_NONREPARENTING=1
 
 if [[ -z "${DISPLAY}" ]] && [[ "${XDG_VTNR}" -eq 1 ]]; then

dots/.bashrc

@@ -60,7 +60,7 @@ export XDG_DATA_HOME=$HOME/.local/share
 if [ -f "/usr/bin/fzf" ]; then
   # Fuzzy finder setup
   export FZF_COMPLETION_TRIGGER='**'
-  export FZF_DEFAULT_COMMAND='rg --files ""'
+  export FZF_DEFAULT_COMMAND='ag -g ""'
   export FZF_DEFAULT_OPTS="
   --pointer='❭'
   --height 10%
@@ -97,6 +97,19 @@ export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab
 # Zettelkasten {{{
 export ZK_PATH="$HOME/.zk"
 
+# SSH Agent {{{
+if [[ -z "${SSH_CONNECTION}" ]]; then
+    export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+fi
+# }}}
+
+# pnpm
+export PNPM_HOME="/home/h/.local/share/pnpm"
+case ":$PATH:" in
+  *":$PNPM_HOME:"*) ;;
+  *) export PATH="$PNPM_HOME:$PATH" ;;
+esac
+# pnpm end
 
 # Codi
 # Usage: codi [filetype] [filename]

dots/.bashrc.d/editor

@@ -4,4 +4,16 @@
 # Set NeoVim as default editor
 export EDITOR=nvim
 export SUDO_EDITOR="$EDITOR"
-export SYSTEMD_EDITOR="$EDITOR"
+
+declare -A -r EDITOR_CONFIGS=(
+  ["nvim"]="$HOME/.config/nvim/init.lua"
+  ["vim"]="$HOME/.vimrc"
+)
+
+edit_editor_config() {
+  for editor in "${!EDITOR_CONFIGS[@]}"; do
+    if [ "$EDITOR" = "$editor" ]; then
+      $EDITOR "${EDITOR_CONFIGS[$editor]}"
+    fi
+  done
+}

dots/.bin/bak

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-# back up a file by copying it to a new file with a .bak extension
-# reference: https://askubuntu.com/questions/962489/is-there-any-way-to-create-backup-copy-of-a-file-without-type-its-name-twice
-
-usage() {
-  echo "Usage: bak [-t|--timestamp] <file to back up>"
-  exit 1
-}
-
-timestamp=false
-
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    -t|--timestamp)
-      timestamp=true
-      shift
-      ;;
-    *)
-      break
-      ;;
-  esac
-done
-
-[ $# -eq 1 ] || usage
-
-if $timestamp; then
-  date="$(date +%Y-%m-%d_%H-%M-%S)"
-  cp -vpn "$1"{,."$date".bak}
-else
-  cp -vpn "$1"{,.bak}
-fi

dots/.bin/git-cb

@@ -0,0 +1,221 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+readonly ALLOWED_MAIN_BRANCHES=("main" "master" "develop")
+readonly BRANCH_TYPES=(
+  "feat      For new features"
+  "hotfix    For urgent fixes"
+  "fix       For fixes"
+  "release   For preparing releases"
+  "chore     For non-code tasks"
+)
+
+error() {
+  echo "Error: $1" >&2
+  exit 1
+}
+
+warn() {
+  echo "Warning: $1" >&2
+}
+
+check_dependencies() {
+  local missing=()
+  for cmd in git fzf; do
+    if ! command -v "$cmd" &> /dev/null; then
+      missing+=("$cmd")
+    fi
+  done
+
+  if [[ ${#missing[@]} -gt 0 ]]; then
+    error "Missing required commands: ${missing[*]}"
+  fi
+}
+
+check_git_repo() {
+  if ! git rev-parse --git-dir &> /dev/null; then
+    error "Not in a git repository"
+  fi
+}
+
+check_current_branch() {
+  local current_branch
+  current_branch=$(git branch --show-current)
+
+  local is_main_branch=false
+  for branch in "${ALLOWED_MAIN_BRANCHES[@]}"; do
+    if [[ "$current_branch" == "$branch" ]]; then
+      is_main_branch=true
+      break
+    fi
+  done
+
+  if [[ "$is_main_branch" == false ]]; then
+    warn "Not branching from a main branch (current: $current_branch)"
+    read -rp "Continue anyway? [y/N] " response
+    if [[ ! "$response" =~ ^[Yy]$ ]]; then
+      exit 0
+    fi
+  fi
+}
+
+get_user_email() {
+  local email
+  email=$(git config --get user.email 2>/dev/null)
+
+  if [[ -z "$email" ]]; then
+    error "Git user email not configured. Run: git config user.email 'your@email.com'"
+  fi
+
+  echo "$email"
+}
+
+select_branch_type() {
+  local selected
+  selected=$(printf '%s\n' "${BRANCH_TYPES[@]}" | \
+    fzf --prompt="Select branch type: " \
+        --height=40% \
+        --border \
+        --info=inline) || error "Branch type selection cancelled"
+
+  echo "${selected%% *}"
+}
+
+select_jira_ticket() {
+  local email=$1
+
+  if ! command -v jira &> /dev/null; then
+    warn "Jira CLI not found. Proceeding without ticket ID."
+    return 0
+  fi
+
+  echo "Fetching Jira tickets for $email..." >&2
+  local jira_data
+  jira_data=$(jira issue list --assignee="$email" --order-by=priority --plain --no-headers 2>/dev/null) || {
+    warn "Could not fetch Jira tickets. Proceeding without ticket ID."
+    return 0
+  }
+
+  if [[ -z "$jira_data" ]]; then
+    warn "No Jira tickets found. Proceeding without ticket ID."
+    return 0
+  fi
+
+  echo "$jira_data" >&2
+  echo "" >&2
+
+  local formatted_tickets
+  formatted_tickets=$(echo "$jira_data" | awk '{
+    ticket_id = $2
+    $1 = $2 = ""
+    description = $0
+    gsub(/^[ \t]+/, "", description)
+    if (length(description) > 60) {
+      description = substr(description, 1, 57) "..."
+    }
+    print ticket_id " - " description
+  }')
+
+  if [[ -z "$formatted_tickets" ]]; then
+    warn "No tickets to display. Proceeding without ticket ID."
+    return 0
+  fi
+
+  local selected_ticket
+  selected_ticket=$(echo -e "SKIP - Create branch without ticket ID\n$formatted_tickets" | \
+    fzf --prompt="Select Jira ticket (or skip): " \
+        --height=40% \
+        --border \
+        --info=inline) || error "Ticket selection cancelled"
+
+  if [[ "$selected_ticket" != "SKIP"* ]]; then
+    echo "${selected_ticket%% -*}"
+  fi
+}
+
+get_branch_description() {
+  local ticket_id=$1
+  local editor="${EDITOR:-vi}"
+  local tmpfile
+  tmpfile=$(mktemp)
+
+  trap "rm -f '$tmpfile'" EXIT
+
+  if [[ -n "$ticket_id" ]]; then
+    cat > "$tmpfile" << EOF
+# Selected ticket: $ticket_id
+# Enter your branch description below in kebab-case (e.g., my-description):
+# The ticket ID will be automatically included in the branch name.
+# Lines starting with # will be ignored.
+
+EOF
+  else
+    cat > "$tmpfile" << 'EOF'
+# Enter your branch description below in kebab-case (e.g., my-description):
+# Lines starting with # will be ignored.
+
+EOF
+  fi
+  
+  "$editor" "$tmpfile" < /dev/tty > /dev/tty
+
+  local desc
+  desc=$(grep -v '^#' "$tmpfile" | tr -d '\n' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+
+  echo "$desc"
+}
+
+validate_description() {
+  local desc=$1
+
+  if [[ -z "$desc" ]]; then
+    error "No description provided"
+  fi
+
+  if [[ ! "$desc" =~ ^[a-z0-9]+(-[a-z0-9]+)*$ ]]; then
+    error "Invalid branch description format.\nUse lowercase letters, numbers, and hyphens only.\nNo trailing or consecutive hyphens allowed.\nExample: my-feature-description"
+  fi
+}
+
+create_branch() {
+  local type=$1
+  local ticket_id=$2
+  local desc=$3
+
+  local branch
+  if [[ -n "$ticket_id" ]]; then
+    branch="$type/$ticket_id-$desc"
+  else
+    branch="$type/$desc"
+  fi
+
+  if git show-ref --verify --quiet "refs/heads/$branch"; then
+    error "Branch '$branch' already exists"
+  fi
+
+  echo ""
+  echo "Creating branch: $branch"
+  git checkout -b "$branch"
+}
+
+main() {
+  check_dependencies
+  check_git_repo
+  check_current_branch
+
+  local email
+  email=$(get_user_email)
+
+  local type
+  type=$(select_branch_type)
+
+  echo "About to call select_jira_ticket" >&2
+  local ticket_id=""
+  ticket_id=$(select_jira_ticket "$email")
+  local desc
+  desc=$(get_branch_description "$ticket_id")
+  validate_description "$desc"
+  create_branch "$type" "$ticket_id" "$desc"
+}
+
+main "$@"

dots/.bin/pomo

@@ -8,24 +8,19 @@ Pomodoro timer
 - Notification on break finish
 """
 
-import atexit
 import os
+import atexit
 from argparse import ArgumentParser
 from time import sleep
-
 from plyer import notification
 
-POMO_PATH = os.path.join(
-    os.getenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share")), "pomo"
-)
-
+POMO_PATH = os.path.join(os.getenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share")), "pomo")
 
 @atexit.register
 def clear():
     if os.path.exists(POMO_PATH):
         os.remove(POMO_PATH)
 
-
 def format_mins_secs(mins, secs):
     return f"{mins:02d}:{secs:02d}"
 
@@ -39,7 +34,6 @@ def make_countdown():
             os.system(f'echo -n "{time_str}" > {POMO_PATH}')
             sleep(1)
             duration -= 1
-
     return countdown
 
 
@@ -64,23 +58,21 @@ def main(args):
 def handle_signal(signal, frame):
     # Wait for clear to finish
     clear()
-    print("Exiting")
+    print('Exiting')
     exit(0)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
 
     parser = ArgumentParser()
-    parser.add_argument(
-        "-w", "--work-duration", type=int, help="Session duration", default=25
-    )
-    parser.add_argument(
-        "-b", "--break-duration", type=int, help="Break duration", default=5
-    )
-    parser.add_argument(
-        "-r", "--repeats", type=int, help="Numer of sessions", default=1
-    )
-    parser.add_argument("-c", "--clear", action="store_true", help="Clear timer")
+    parser.add_argument('-w', '--work-duration', type=int,
+                        help='Session duration', default=25)
+    parser.add_argument('-b', '--break-duration', type=int,
+                        help='Break duration', default=5)
+    parser.add_argument('-r', '--repeats', type=int,
+                        help='Numer of sessions', default=1)
+    parser.add_argument('-c', '--clear', action='store_true',
+                        help='Clear timer')
 
     args = parser.parse_args()
 

dots/.bin/r5rs

@@ -2,8 +2,8 @@
 
 session="r5rs"
 
-tmux attach-session -t "$session" || tmux new-session -s "$session" \; \
+tmux attach-session -t $session || tmux new-session -s $session \; \
   split-window -h -t $session \; \
-  send-keys -t 1 "nvim -c \"set ft=scheme\"" C-m \; \
-  send-keys -t 2 "plt-r5rs --no-prim" C-m \; \
-  select-pane -t 1
+  send-keys -t 0 "vim" C-m \; \
+  send-keys -t 1 "plt-r5rs --no-prim" C-m \; \
+  select-pane -t 0

dots/.bin/save-home

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Back up my $HOME folder to OneDrive using `restic`.
+#
+# Adds extra flags needed for using `rclone` with sharepoint WebDav I.e. add
+# `--ignore-size --ignore-checksum --update` to the default `rclone.args`.
+#
+# Select directory in repo using -r rclone:<repo>:<directory>
+#
+# Runs `backup` command on $HOME and ignore what is listed in `.resticexclude`
+#
+# ```/etc/restic-env
+# export B2_ACCOUNT_ID=
+# export B2_ACCOUNT_KEY=
+# ```
+#
+# `restic -r b2:desktop-arch init`
+
+source /etc/restic-env
+restic -r "$RESTIC_REPOSITORY:$HOSTNAME" backup \
+  --tag "hektor" \
+  --one-file-system \
+  --files-from="$HOME/.resticinclude" \
+  --exclude-file="$HOME/.resticexclude" \
+  --verbose=3

dots/.bin/save-zk

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+cd "$ZK_PATH" || echo "No zettelkasten directory found"
+git a . && git commit -m "Update" && git push

dots/.bin/sb-pomo

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-[ -f "/home/h/.local/share/pomo" ] && cat /home/h/.local/share/pomo || echo ""
+[ -f "/tmp/pomo" ] && cat /tmp/pomo || echo ""

dots/.bin/screen-temperature

@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
-import subprocess
 import sys
+import subprocess
 
 DEFAULT_TEMPERATURE = 3500
 
 try:
-    with open("/tmp/temperature", "r") as temp_file:
+    with open('/tmp/temperature', 'r') as temp_file:
         current_temperature = int(temp_file.read())
 except FileNotFoundError:
     current_temperature = DEFAULT_TEMPERATURE
@@ -16,8 +16,7 @@ if len(sys.argv) == 1:
     print(current_temperature)
     sys.exit(0)
 elif len(sys.argv) != 2:
-    print(
-        """
+    print("""
 Usage:
 
   screen-temperature
@@ -28,8 +27,7 @@ Usage:
 
   screen-temperature <+|-><temperature>
       increase or decrease screen temperature by <temperature>
-"""
-    )
+""")
     sys.exit(1)
 
 temperature_change = sys.argv[1]
@@ -43,10 +41,11 @@ else:
 
 try:
     subprocess.run(["redshift", "-O", str(new_temperature), "-P"], check=True)
-    with open("/tmp/temperature", "w") as temp_file:
-        temp_file.write(str(new_temperature) + "\n")
+    with open('/tmp/temperature', 'w') as temp_file:
+        temp_file.write(str(new_temperature) + '\n')
     # Send notification
-    subprocess.run(["notify-send", str(new_temperature) + "K"])
+    subprocess.run(
+        ["notify-send", str(new_temperature) + "K"])
 except subprocess.CalledProcessError:
     print("Error: could not set screen temperature.")
     sys.exit(1)

dots/.bin/setup-gnome

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+gsettings set org.gnome.desktop.background primary-color "#555555"
+
+gsettings set org.gnome.desktop.wm.preferences workspace-names "['sh', 'www', 'dev', 'info', 'etc']"
+gsettings set org.gnome.desktop.wm.keybindings close "['<Shift><Super>Delete']"
+gsettings set org.gnome.desktop.wm.keybindings switch-applications "['<Super>j']"
+gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['<Super>k']"
+gsettings set org.gnome.shell.keybindings toggle-application-view "['<Super>p']"
+gsettings set org.gnome.mutter center-new-windows true
+gsettings set org.gnome.shell.keybindings toggle-quick-settings []
+
+gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-1 "['<Super>a']"
+gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-2 "['<Super>s']"
+gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-3 "['<Super>d']"
+gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-4 "['<Super>f']"
+gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-5 "['<Super>g']"
+gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-1 "['<Super><Shift>a']"
+gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-2 "['<Super><Shift>s']"
+gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-3 "['<Super><Shift>d']"
+gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-4 "['<Super><Shift>f']"
+gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-5 "['<Super><Shift>g']"
+
+gsettings set org.gnome.settings-daemon.plugins.media-keys custom-keybindings "['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/']"
+gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/ name "Kitty"
+gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/ command "kitty"
+gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/ binding "<Shift><Super>Return"
+
+gsettings set org.gnome.shell.keybindings screenshot "['Print']"
+
+gsettings set org.gnome.desktop.wm.preferences num-workspaces "5"
+gsettings set org.gnome.mutter dynamic-workspaces "false"
+gsettings set org.gnome.shell.extensions.window-list display-all-workspaces "true"
+gsettings set org.gnome.shell.app-switcher current-workspace-only "true"
+
+gsettings set org.gnome.login-screen logo ''
+gsettings set org.gnome.shell favorite-apps "['firefox-developer-edition.desktop']"

dots/.bin/setup-zk

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [ ! -d ~/.zk ]; then
+    echo "[zk] Setting up zettelkasten"
+    gh repo clone zk ~/.zk
+else
+    echo "[zk] Zettelkasten already set up."
+fi
+
+read -p "Would you like open your zettelkasten? [y/N] " -n 1 -r
+echo
+
+if [[ $REPLY =~ ^[Yy]$ ]]; then
+  if [ -x "$(command -v zk)" ]; then
+    zk
+  else
+    echo "Error: 'zk' command not found or not executable"
+    exit 1
+  fi
+fi

dots/.bin/taskdeps

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python
 
 import argparse
 import json

dots/.bin/update-vim

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+# Tiny Vim update helper
+
+nvim +PlugUpgrade +PlugUpdate +CocUpdate

dots/.bin/zk

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+if [ "$TERM_PROGRAM" = tmux ]; then
+  cd ~/.zk && $EDITOR "$(cat ~/.zk/current-zettel.txt)"
+else
+  echo 'Not in tmux'
+  echo 'Choose an option:'
+  echo '1. Open in tmux'
+  echo '2. Open in current terminal'
+  read -r -p 'Enter your choice: ' choice
+  case $choice in
+    1)
+      # Check if a tmux session is running with a window named zk
+      if tmux list-windows -F '#{window_name}' | grep -q zk; then
+        # Attach to the session containing the 'zk' window
+        session="$(tmux list-windows -F '#{window_name} #{session_name}' | grep zk | head -n 1 | awk '{ print $2 }')"
+        tmux attach -t "$session"
+      else
+        # Create session with a window named 'zk' and start nvim
+        tmux new-session -s zk -n zk -d
+        tmux send-keys -t zk:zk "cd ~/.zk && $EDITOR \"\$(cat ~/.zk/current-zettel.txt)\"" Enter
+        tmux attach -t zk
+      fi
+      ;;
+    2)
+      cd ~/.zk && $EDITOR "$(cat ~/.zk/current-zettel.txt)"
+      ;;
+    *)
+      echo 'Not opening Zettelkasten'
+      exit 1
+      ;;
+  esac
+fi

dots/.config/kitty/kitty.conf

@@ -56,7 +56,7 @@ hide_window_decorations yes
 
 #: Tab bar {{{
 
-tab_bar_edge bottom
+tab_bar_edge top
 tab_bar_style powerline
 tab_bar_min_tabs 1
 tab_powerline_style slanted
@@ -136,7 +136,7 @@ map f5 goto_tab 5
 map f6 goto_tab 6
 map f7 goto_tab 7
 map f8 goto_tab 8
-# map kitty_mod+c new_tab # FIXME: conflict with 'copy'
+map kitty_mod+c new_tab
 map cmd+t
 map kitty_mod+q
 map cmd+w
@@ -163,4 +163,5 @@ map cmd+q
 
 #: }}}
 
+include ./themes/zenwritten_dark.conf
 include ./nvim.conf

dots/.config/kitty/themes/zenwritten_dark.conf

@@ -0,0 +1,49 @@
+# This file is auto-generated by shipwright.nvim
+# vim:ft=kitty
+## name: zenwritten_dark
+## author: Michael Chris Lopez
+## license: MIT
+## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenwritten_dark.conf
+## blurb: A zenbones variant with zero hue and saturation.
+foreground                      #BBBBBB
+background                      #191919
+selection_foreground            #BBBBBB
+selection_background            #404040
+# Cursor colors
+cursor                          #C9C9C9
+cursor_text_color               #191919
+# URL underline color when hovering with mouse
+# kitty window border colors
+# OS Window titlebar colors
+# Tab bar colors
+active_tab_foreground           #BBBBBB
+active_tab_background           #65435E
+inactive_tab_foreground         #BBBBBB
+inactive_tab_background         #303030
+# Colors for marks (marked text in the terminal)
+# The basic 16 colors
+# black
+color0 #191919
+color8 #3D3839
+# red
+color1 #DE6E7C
+color9 #E8838F
+# green
+color2  #819B69
+color10 #8BAE68
+# yellow
+color3  #B77E64
+color11 #D68C67
+# blue
+color4  #6099C0
+color12 #61ABDA
+# magenta
+color5  #B279A7
+color13 #CF86C1
+# cyan
+color6  #66A5AD
+color14 #65B8C1
+# white
+color7  #BBBBBB
+color15 #8E8E8E
+# You can set the remaining 240 colors as color16 to color255.

dots/.config/kitty/themes/zenwritten_light.conf

@@ -0,0 +1,49 @@
+# This file is auto-generated by shipwright.nvim
+# vim:ft=kitty
+## name: zenwritten_light
+## author: Michael Chris Lopez
+## license: MIT
+## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenwritten_light.conf
+## blurb: A zenbones variant with zero hue and saturation.
+foreground                      #353535
+background                      #EEEEEE
+selection_foreground            #353535
+selection_background            #D7D7D7
+# Cursor colors
+cursor                          #353535
+cursor_text_color               #EEEEEE
+# URL underline color when hovering with mouse
+# kitty window border colors
+# OS Window titlebar colors
+# Tab bar colors
+active_tab_foreground           #353535
+active_tab_background           #DEB9D6
+inactive_tab_foreground         #353535
+inactive_tab_background         #CFCFCF
+# Colors for marks (marked text in the terminal)
+# The basic 16 colors
+# black
+color0 #EEEEEE
+color8 #C6C3C3
+# red
+color1 #A8334C
+color9 #94253E
+# green
+color2  #4F6C31
+color10 #3F5A22
+# yellow
+color3  #944927
+color11 #803D1C
+# blue
+color4  #286486
+color12 #1D5573
+# magenta
+color5  #88507D
+color13 #7B3B70
+# cyan
+color6  #3B8992
+color14 #2B747C
+# white
+color7  #353535
+color15 #5C5C5C
+# You can set the remaining 240 colors as color16 to color255.

dots/.config/ncspot/config.toml

@@ -1,6 +1,5 @@
 default_keybindings = false
 flip_status_indicators = true
-library_tabs = ["tracks", "albums", "artists", "playlists", "browse"] # remove podcasts tab
 
 [keybindings]
 "Enter" = "play"
@@ -25,10 +24,11 @@ library_tabs = ["tracks", "albums", "artists", "playlists", "browse"] # remove p
 "c" = "clear"
 "=" = "volup 1"
 "-" = "voldown 1"
+"/" = "focus search"
+"Q" = "focus queue"
+"L" = "focus library"
 "1" = "focus queue"
-"2" = "focus search"
-"3" = "focus library"
-"4" = "focus cover"
+"2" = "focus library"
 "h" = "move left 1"
 "j" = "move down 1"
 "k" = "move up 1"
@@ -41,5 +41,26 @@ library_tabs = ["tracks", "albums", "artists", "playlists", "browse"] # remove p
 "Y" = "share selected"
 "U" = "update"
 
+[theme]
+primary="#aaaaaa"
+secondary="#555555"
+background="1a1a1a"
+title="#cccccc"
+title_secondary="#aaaaaa"
+playing="#ffffff"
+playing_bg="1a1a1a"
+playing_selected="#ffffff"
+highlight="#cccccc"
+highlight_bg="#333333"
+error="#ffffff"
+error_bg="#333333"
+statusbar="#cccccc"
+statusbar_bg="#1a1a1a"
+statusbar_progress="#cccccc"
+statusbar_progress_bg="#1a1a1a"
+cmdline="#cccccc"
+cmdline_bg="#1a1a1a"
+search_match="#ffffff"
+
 backend="pipe"
 notify="false"

dots/.config/ncspot/credentials.toml

@@ -0,0 +1,3 @@
+username = 'hektor.misplon@gmail.com'
+auth_type = 0
+auth_data = 'KDEzMzc9PXRydTMpPzo='

dots/.config/nvim/after/plugin/claude-code.nvim.lua

@@ -1,61 +0,0 @@
-require("claude-code").setup({
-  -- Terminal window settings
-  window = {
-    split_ratio = 0.3, -- Percentage of screen for the terminal window (height for horizontal, width for vertical splits)
-    position = "vertical", -- Position of the window: "botright", "topleft", "vertical", "float", etc.
-    enter_insert = true, -- Whether to enter insert mode when opening Claude Code
-    hide_numbers = true, -- Hide line numbers in the terminal window
-    hide_signcolumn = true, -- Hide the sign column in the terminal window
-
-    -- Floating window configuration (only applies when position = "float")
-    float = {
-      width = "80%", -- Width: number of columns or percentage string
-      height = "80%", -- Height: number of rows or percentage string
-      row = "center", -- Row position: number, "center", or percentage string
-      col = "center", -- Column position: number, "center", or percentage string
-      relative = "editor", -- Relative to: "editor" or "cursor"
-      border = "rounded", -- Border style: "none", "single", "double", "rounded", "solid", "shadow"
-    },
-  },
-  -- File refresh settings
-  refresh = {
-    enable = true, -- Enable file change detection
-    updatetime = 100, -- updatetime when Claude Code is active (milliseconds)
-    timer_interval = 1000, -- How often to check for file changes (milliseconds)
-    show_notifications = true, -- Show notification when files are reloaded
-  },
-  -- Git project settings
-  git = {
-    use_git_root = true, -- Set CWD to git root when opening Claude Code (if in git project)
-  },
-  -- Shell-specific settings
-  shell = {
-    separator = "&&", -- Command separator used in shell commands
-    pushd_cmd = "pushd", -- Command to push directory onto stack (e.g., 'pushd' for bash/zsh, 'enter' for nushell)
-    popd_cmd = "popd", -- Command to pop directory from stack (e.g., 'popd' for bash/zsh, 'exit' for nushell)
-  },
-  -- Command settings
-  command = "claude", -- Command used to launch Claude Code
-  -- Command variants
-  command_variants = {
-    -- Conversation management
-    continue = "--continue", -- Resume the most recent conversation
-    resume = "--resume", -- Display an interactive conversation picker
-
-    -- Output options
-    verbose = "--verbose", -- Enable verbose logging with full turn-by-turn output
-  },
-  -- Keymaps
-  keymaps = {
-    toggle = {
-      normal = "<C-,>", -- Normal mode keymap for toggling Claude Code, false to disable
-      terminal = "<C-,>", -- Terminal mode keymap for toggling Claude Code, false to disable
-      variants = {
-        continue = "<leader>cC", -- Normal mode keymap for Claude Code with continue flag
-        verbose = "<leader>cV", -- Normal mode keymap for Claude Code with verbose flag
-      },
-    },
-    window_navigation = true, -- Enable window navigation keymaps (<C-h/j/k/l>)
-    scrolling = true, -- Enable scrolling keymaps (<C-f/b>) for page up/down
-  },
-})

dots/.config/nvim/after/plugin/codecompanion.nvim.lua

@@ -1,23 +1,16 @@
 require("codecompanion").setup({
-  ignore_warnings = true,
+  extensions = {
+    mcphub = {
+      callback = "mcphub.extensions.codecompanion",
+      opts = {
+        make_vars = true,
+        make_slash_commands = true,
+        show_result_in_chat = true
+      }
+    }
+  },
   strategies = {
     chat = { adapter = "openai" },
     inline = { adapter = "openai" },
   },
 })
-
--- Load mcphub extension after codecompanion is initialized
--- and ensure the config structure exists
-local ok, cc_config = pcall(require, "codecompanion.config")
-if ok then
-  cc_config.interactions = cc_config.interactions or {}
-  cc_config.interactions.chat = cc_config.interactions.chat or {}
-  cc_config.interactions.chat.tools = cc_config.interactions.chat.tools or {}
-  cc_config.interactions.chat.variables = cc_config.interactions.chat.variables or {}
-
-  require("mcphub.extensions.codecompanion").setup({
-    make_vars = true,
-    make_slash_commands = true,
-    show_result_in_chat = true,
-  })
-end

dots/.config/nvim/after/plugin/conform.lua

@@ -13,15 +13,14 @@ require("conform").setup({
     gdscript = { "gdformat" },
     haskell = { "ormolu" },
     html = { "prettierd", "prettier", stop_after_first = true },
+    lua = { "stylua" }, -- configured in stylua.toml
+    markdown = { "prettierd", "prettier", stop_after_first = true },
+    nix = { "nixfmt" },
     javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
     javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
     json = { "prettierd", "prettier", stop_after_first = true },
     jsonc = { "prettierd", "prettier", stop_after_first = true },
-    lua = { "stylua" }, -- configured in stylua.toml
-    markdown = { "prettierd", "prettier", stop_after_first = true },
-    nix = { "nixfmt" },
     python = { "isort", "black" },
-    rust = { "rustfmt", lsp_fallback = "fallback" },
     svelte = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
     typescript = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
     typescriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },

dots/.config/nvim/after/plugin/fidget.nvim.lua

@@ -1 +0,0 @@
-require("fidget").setup()

dots/.config/nvim/after/plugin/fzf-lua.lua

@@ -11,6 +11,6 @@ vim.keymap.set("n", "<leader>fd", fzf.diagnostics_workspace)
 vim.keymap.set("n", "<leader>fhe", fzf.help_tags)
 vim.keymap.set("n", "<leader>fhi", fzf.search_history)
 vim.keymap.set("n", "<leader>fma", fzf.marks)
-vim.keymap.set("n", "<leader>fmp", fzf.man_pages)
+vim.keymap.set("n", "<leader>fma", fzf.man_pages)
 
 vim.keymap.set("i", "<c-f>", fzf.complete_path)

dots/.config/nvim/after/plugin/hydra.lua

@@ -1,35 +0,0 @@
-local hydra_repl = "hydra-repl"
-
-if not vim.fn.executable(hydra_repl) then
-  return
-end
-
-local function send(lines)
-  vim.system({ hydra_repl, table.concat(lines, "\n") })
-end
-
-local function get_paragraph(buf)
-  local start_ = vim.fn.search("^$", "bnW")
-  local end_ = vim.fn.search("^$", "nW") - 1
-  if end_ < vim.api.nvim_win_get_cursor(0)[1] then
-    end_ = vim.api.nvim_buf_line_count(buf)
-  end
-  return vim.api.nvim_buf_get_lines(buf, start_, end_, false)
-end
-
-local function get_selection(buf)
-  return vim.api.nvim_buf_get_lines(buf, vim.fn.line("'<") - 1, vim.fn.line("'>"), false)
-end
-
-vim.api.nvim_create_autocmd("FileType", {
-  pattern = "javascript",
-  callback = function(e)
-    if vim.fn.fnamemodify(vim.api.nvim_buf_get_name(e.buf), ":e") ~= "hydra" then
-      return
-    end
-
-    local buf = e.buf
-    vim.keymap.set("n", "<CR>", function() send(get_paragraph(buf)) end, { buffer = buf, desc = "hydra: send block" })
-    vim.keymap.set("v", "<CR>", function() send(get_selection(buf)) end, { buffer = buf, desc = "hydra: send selection" })
-  end,
-})

dots/.config/nvim/after/plugin/image.nvim.lua

@@ -1,5 +1,3 @@
-if not vim.env.KITTY_WINDOW_ID then return end
-
 require("image").setup({
   backend = "kitty",
   kitty_method = "normal",

dots/.config/nvim/after/plugin/lspconfig.lua

@@ -1,5 +1,8 @@
 require("neodev").setup() -- should setup before lspconfig
 
+-- vim.g.coq_settings = { auto_start = 'shut-up' }
+-- local capabilities = coq.lsp_ensure_capabilities()
+
 local cmp_nvim_lsp = require("cmp_nvim_lsp")
 local capabilities = cmp_nvim_lsp.default_capabilities()
 
@@ -61,32 +64,10 @@ local servers = {
       Lua = {},
     },
   },
-  nixd = {
-    settings = {
-      nixd = {
-        nixpkgs = {
-          expr = "import <nixpkgs> { }",
-          expr = 'import (builtins.getFlake ("git+file://" + toString ../../../../../.)).inputs.nixpkgs { }',
-        },
-      },
-      options = {
-        nixos = {
-          expr = '(builtins.getFlake ("git+file://" + toString ../../../../../.)).nixosConfigurations."'
-            .. vim.fn.hostname()
-            .. '".options',
-        },
-        home_manager = {
-          expr = '(builtins.getFlake ("git+file://" + toString ../../../../../.)).homeConfigurations."'
-            .. vim.fn.expand("$USER")
-            .. "@"
-            .. vim.fn.hostname()
-            .. '".options',
-        },
-      },
-    },
-  },
-  openscad_ls = {},
+  -- marksman = {},
+  nixd = {},
   pyright = {},
+  -- tsserver = {},
   svelte = {
     plugin = {
       svelte = {
@@ -95,6 +76,7 @@ local servers = {
     },
   },
   tailwindcss = {},
+  -- vtsls = {},
   ts_ls = {},
   -- vtsls = {
   --   maxTsServerMemory = 16384,

dots/.config/nvim/after/plugin/luasnip.lua

@@ -1,5 +1,23 @@
 local ls = require("luasnip")
 
+local s = ls.snippet
+local sn = ls.snippet_node
+local t = ls.text_node
+local i = ls.insert_node
+local f = ls.function_node
+local c = ls.choice_node
+local d = ls.dynamic_node
+local r = ls.restore_node
+local l = require("luasnip.extras").lambda
+local rep = require("luasnip.extras").rep
+local p = require("luasnip.extras").partial
+local m = require("luasnip.extras").match
+local n = require("luasnip.extras").nonempty
+local dl = require("luasnip.extras").dynamic_lambda
+local fmt = require("luasnip.extras.fmt").fmt
+local fmta = require("luasnip.extras.fmt").fmta
+local conds = require("luasnip.extras.expand_conditions")
+
 ls.config.set_config({
   history = true,
   update_events = "TextChanged,TextChangedI",
@@ -9,5 +27,287 @@ ls.config.set_config({
   store_selection_keys = "<Tab>",
 })
 
+local function copy(args)
+  return args[1]
+end
+
+local function bash(_, _, command)
+  local file = io.popen(command, "r")
+  local res = {}
+  if file then
+    for line in file:lines() do
+      table.insert(res, line)
+    end
+  end
+  return res
+end
+
+local date_input = function(args, snip, old_state, date_format)
+  print(args, snip, old_state)
+  return sn(nil, i(1, os.date(date_format or "%Y-%m-%d")))
+end
+
+-- -- FIXME: EXAMPLE
+-- ls.add_snippets("all", {
+--   -- arg1: trigger `fn`,
+--   -- arg2: nodes to insert into buffer on expansion.
+--   s("fn", {
+--     t("//Parameters: "),    -- Text.
+--     f(copy, 2),             -- 1: function, 2: placeholders to copy text from
+--     t({ "", "function " }), -- placeholder/insert.
+--     i(1),
+--     t("("),                 -- placeholder with initial text.
+--     i(2, "int foo"),        -- linebreak
+--     t({ ") {", "\t" }),     -- last placeholder, snippet exit point
+--     i(0),
+--     t({ "", "}" }),
+--   }),
+--   s("class", {
+--     -- Choice: Switch between two different Nodes, first parameter is its position, second a list of nodes.
+--     c(1, {
+--       t("public "),
+--       t("private "),
+--     }),
+--     t("class "),
+--     i(2),
+--     t(" "),
+--     c(3, {
+--       t("{"),
+--       -- sn: Nested Snippet. Instead of a trigger, it has a position, just like insert-nodes. !!! These don't expect a 0-node!!!!
+--       -- Inside Choices, Nodes don't need a position as the choice node is the one being jumped to.
+--       sn(nil, {
+--         t("extends "),
+--         -- restoreNode: stores and restores nodes.
+--         -- pass position, store-key and nodes.
+--         r(1, "other_class", i(1)),
+--         t(" {"),
+--       }),
+--       sn(nil, {
+--         t("implements "),
+--         -- no need to define the nodes for a given key a second time.
+--         r(1, "other_class"),
+--         t(" {"),
+--       }),
+--     }),
+--     t({ "", "\t" }),
+--     i(0),
+--     t({ "", "}" }),
+--   }),
+--   -- Alternative printf-like notation for defining snippets. It uses format
+--   -- string with placeholders similar to the ones used with Python's .format().
+--   s(
+--     "fmt1",
+--     fmt("To {title} {} {}.", {
+--       i(2, "Name"),
+--       i(3, "Surname"),
+--       title = c(1, { t("Mr."), t("Ms.") }),
+--     })
+--   ),
+--   -- To escape delimiters use double them, e.g. `{}` -> `{{}}`.
+--   -- Multi-line format strings by default have empty first/last line removed.
+--   -- Indent common to all lines is also removed. Use the third `opts` argument
+--   -- to control this behaviour.
+--   s(
+--     "fmt2",
+--     fmt(
+--       [[
+-- 		foo({1}, {3}) {{
+-- 			return {2} * {4}
+-- 		}}
+-- 		]],
+--       {
+--         i(1, "x"),
+--         rep(1),
+--         i(2, "y"),
+--         rep(2),
+--       }
+--     )
+--   ),
+--   -- Empty placeholders are numbered automatically starting from 1 or the last
+--   -- value of a numbered placeholder. Named placeholders do not affect numbering.
+--   s(
+--     "fmt3",
+--     fmt("{} {a} {} {1} {}", {
+--       t("1"),
+--       t("2"),
+--       a = t("A"),
+--     })
+--   ),
+--   -- The delimiters can be changed from the default `{}` to something else.
+--   s("fmt4", fmt("foo() { return []; }", i(1, "x"), { delimiters = "[]" })),
+--   -- `fmta` is a convenient wrapper that uses `<>` instead of `{}`.
+--   s("fmt5", fmta("foo() { return <>; }", i(1, "x"))),
+--   -- By default all args must be used. Use strict=false to disable the check
+--   s(
+--     "fmt6",
+--     fmt("use {} only", { t("this"), t("not this") }, { strict = false })
+--   ),
+--   -- Use a dynamic_node to interpolate the output of a
+--   -- function (see date_input above) into the initial
+--   -- value of an insert_node.
+--   s("novel", {
+--     t("It was a dark and stormy night on "),
+--     d(1, date_input, {}, { user_args = { "%A, %B %d of %Y" } }),
+--     t(" and the clocks were striking thirteen."),
+--   }),
+--   -- Parsing snippets: First parameter: Snippet-Trigger, Second: Snippet body.
+--   -- Placeholders are parsed into choices with 1. the placeholder text(as a snippet) and 2. an empty string.
+--   -- This means they are not SELECTed like in other editors/Snippet engines.
+--   ls.parser.parse_snippet(
+--     "lspsyn",
+--     "Wow! This ${1:Stuff} really ${2:works. ${3:Well, a bit.}}"
+--   ),
+
+--   -- When wordTrig is set to false, snippets may also expand inside other words.
+--   ls.parser.parse_snippet(
+--     { trig = "te", wordTrig = false },
+--     "${1:cond} ? ${2:true} : ${3:false}"
+--   ),
+
+--   -- When regTrig is set, trig is treated like a pattern, this snippet will expand after any number.
+--   ls.parser.parse_snippet({ trig = "%d", regTrig = true }, "A Number!!"),
+--   -- Using the condition, it's possible to allow expansion only in specific cases.
+--   s("cond", {
+--     t("will only expand in c-style comments"),
+--   }, {
+--     condition = function(line_to_cursor, matched_trigger, captures)
+--       -- optional whitespace followed by //
+--       return line_to_cursor:match("%s*//")
+--     end,
+--   }),
+--   -- there's some built-in conditions in "luasnip.extras.expand_conditions".
+--   s("cond2", {
+--     t("will only expand at the beginning of the line"),
+--   }, {
+--     condition = conds.line_begin,
+--   }),
+--   -- The last entry of args passed to the user-function is the surrounding snippet.
+--   s(
+--     { trig = "a%d", regTrig = true },
+--     f(function(_, snip)
+--       return "Triggered with " .. snip.trigger .. "."
+--     end, {})
+--   ),
+--   -- It's possible to use capture-groups inside regex-triggers.
+--   s(
+--     { trig = "b(%d)", regTrig = true },
+--     f(function(_, snip)
+--       return "Captured Text: " .. snip.captures[1] .. "."
+--     end, {})
+--   ),
+--   s({ trig = "c(%d+)", regTrig = true }, {
+--     t("will only expand for even numbers"),
+--   }, {
+--     condition = function(line_to_cursor, matched_trigger, captures)
+--       return tonumber(captures[1]) % 2 == 0
+--     end,
+--   }),
+--   -- Use a function to execute any shell command and print its text.
+--   s("bash", f(bash, {}, "ls")),
+--   -- Short version for applying String transformations using function nodes.
+--   s("transform", {
+--     i(1, "initial text"),
+--     t({ "", "" }),
+--     -- lambda nodes accept an l._1,2,3,4,5, which in turn accept any string transformations.
+--     -- This list will be applied in order to the first node given in the second argument.
+--     l(l._1:match("[^i]*$"):gsub("i", "o"):gsub(" ", "_"):upper(), 1),
+--   }),
+
+--   s("transform2", {
+--     i(1, "initial text"),
+--     t("::"),
+--     i(2, "replacement for e"),
+--     t({ "", "" }),
+--     -- Lambdas can also apply transforms USING the text of other nodes:
+--     l(l._1:gsub("e", l._2), { 1, 2 }),
+--   }),
+--   s({ trig = "trafo(%d+)", regTrig = true }, {
+--     -- env-variables and captures can also be used:
+--     l(l.CAPTURE1:gsub("1", l.TM_FILENAME), {}),
+--   }),
+--   -- Set store_selection_keys = "<Tab>" (for example) in your
+--   -- luasnip.config.setup() call to populate
+--   -- TM_SELECTED_TEXT/SELECT_RAW/SELECT_DEDENT.
+--   -- In this case: select a URL, hit Tab, then expand this snippet.
+--   s("link_url", {
+--     t('<a href="'),
+--     f(function(_, snip)
+--       -- TM_SELECTED_TEXT is a table to account for multiline-selections.
+--       -- In this case only the first line is inserted.
+--       return snip.env.TM_SELECTED_TEXT[1] or {}
+--     end, {}),
+--     t('">'),
+--     i(1),
+--     t("</a>"),
+--     i(0),
+--   }),
+--   -- Shorthand for repeating the text in a given node.
+--   s("repeat", { i(1, "text"), t({ "", "" }), rep(1) }),
+--   -- Directly insert the ouput from a function evaluated at runtime.
+--   s("part", p(os.date, "%Y")),
+--   -- use matchNodes (`m(argnode, condition, then, else)`) to insert text
+--   -- based on a pattern/function/lambda-evaluation.
+--   -- It's basically a shortcut for simple functionNodes:
+--   s("mat", {
+--     i(1, { "sample_text" }),
+--     t(": "),
+--     m(1, "%d", "contains a number", "no number :("),
+--   }),
+--   -- The `then`-text defaults to the first capture group/the entire
+--   -- match if there are none.
+--   s("mat2", {
+--     i(1, { "sample_text" }),
+--     t(": "),
+--     m(1, "[abc][abc][abc]"),
+--   }),
+--   -- It is even possible to apply gsubs' or other transformations
+--   -- before matching.
+--   s("mat3", {
+--     i(1, { "sample_text" }),
+--     t(": "),
+--     m(
+--       1,
+--       l._1:gsub("[123]", ""):match("%d"),
+--       "contains a number that isn't 1, 2 or 3!"
+--     ),
+--   }),
+--   -- `match` also accepts a function in place of the condition, which in
+--   -- turn accepts the usual functionNode-args.
+--   -- The condition is considered true if the function returns any
+--   -- non-nil/false-value.
+--   -- If that value is a string, it is used as the `if`-text if no if is explicitly given.
+--   s("mat4", {
+--     i(1, { "sample_text" }),
+--     t(": "),
+--     m(1, function(args)
+--       -- args is a table of multiline-strings (as usual).
+--       return (#args[1][1] % 2 == 0 and args[1]) or nil
+--     end),
+--   }),
+--   -- The nonempty-node inserts text depending on whether the arg-node is
+--   -- empty.
+--   s("nempty", {
+--     i(1, "sample_text"),
+--     n(1, "i(1) is not empty!"),
+--   }),
+--   -- dynamic lambdas work exactly like regular lambdas, except that they
+--   -- don't return a textNode, but a dynamicNode containing one insertNode.
+--   -- This makes it easier to dynamically set preset-text for insertNodes.
+--   s("dl1", {
+--     i(1, "sample_text"),
+--     t({ ":", "" }),
+--     dl(2, l._1, 1),
+--   }),
+--   -- Obviously, it's also possible to apply transformations, just like lambdas.
+--   s("dl2", {
+--     i(1, "sample_text"),
+--     i(2, "sample_text_2"),
+--     t({ "", "" }),
+--     dl(3, l._1:gsub("\n", " linebreak ") .. l._2, { 1, 2 }),
+--   }),
+-- }, {
+--   key = "all",
+-- })
+
 require("luasnip.loaders.from_lua").lazy_load({ paths = { "~/.config/nvim/snips" } })
 require("luasnip.loaders.from_vscode").lazy_load({ paths = { "~/.config/Code - Insiders/User/snippets" } })

dots/.config/nvim/after/plugin/nvim-cmp.lua

@@ -64,7 +64,7 @@ cmp.setup({
   sources = {
     { name = "copilot",  group_index = 2 },
     { name = "zk" },
-    { name = "nvim_lsp" },
+    { name = "nvim_lsp", keyword_length = 8 },
     { name = "luasnip",  max_item_count = 16 },
     { name = "path" },
     { name = "buffer",   max_item_count = 8 },

dots/.config/nvim/after/plugin/nvim-highlight-colors.lua

@@ -1 +1,3 @@
+vim.opt.termguicolors = true
+
 require("nvim-highlight-colors").setup({})

dots/.config/nvim/after/plugin/nvim-lint.lua

@@ -28,6 +28,9 @@ require("lint").linters_by_ft = {
   yaml = { "yamllint" },
 }
 
+-- TODO: Wouldn't it be possible / nice to only try to load the linters when they are
+-- actually needed?
+
 vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
   callback = function()
     require("lint").try_lint()

dots/.config/nvim/after/plugin/nvim-ts-context-commentstring.lua

@@ -1,8 +0,0 @@
-require("ts_context_commentstring").setup({ enable_autocmd = false })
-
--- https://github.com/JoosepAlviste/nvim-ts-context-commentstring/issues/109
-local get_option = vim.filetype.get_option
-vim.filetype.get_option = function(filetype, option)
-  return option == "commentstring" and require("ts_context_commentstring.internal").calculate_commentstring()
-    or get_option(filetype, option)
-end

dots/.config/nvim/after/plugin/treesitter.lua

@@ -2,15 +2,12 @@ local ts = require("treesj")
 local vim = vim
 local keymap = vim.keymap
 local opt = vim.opt
-local treesitter = require("nvim-treesitter")
+local treesitter_configs = require("nvim-treesitter.configs")
 
-local nixCatsUtils = require("nixCatsUtils")
-local is_nix = nixCatsUtils.isNixCats
-
-treesitter.setup({
+treesitter_configs.setup({
   -- Basically added what I might need from the docs
   -- <https://github.com/nvim-treesitter/nvim-treesitter?tab=readme-ov-file#supported-languages>
-  ensure_installed = is_nix and {} or {
+  ensure_installed = {
     "awk",
     "bash",
     "bibtex",
@@ -89,7 +86,7 @@ treesitter.setup({
     enable = true,
   },
   sync_install = false,
-  auto_install = not is_nix,
+  auto_install = true,
   ignore_install = {},
   modules = {},
   textobjects = {
@@ -123,7 +120,7 @@ treesitter.setup({
 })
 
 opt.foldmethod = "expr"
-opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+opt.foldexpr = "nvim_treesitter#foldexpr()"
 opt.foldenable = false
 
 -- TreeSJ

dots/.config/nvim/after/plugin/vim-tidal.vim.lua

@@ -1,28 +1,16 @@
-vim.g.tidal_default_config = { socket_name = "default", target_pane = "tidal:1.1" }
-vim.g.tidal_no_mappings = 1
+vim.cmd([[
+" Tidalcycles (sclang and vim-tidal)
+let g:tidal_default_config = {"socket_name": "default", "target_pane": "tidal:1.1"}
+let g:tidal_no_mappings = 1
 
-vim.api.nvim_create_autocmd("FileType", {
-  pattern = "tidal",
-  callback = function(e)
-    local buf = e.buf
-    vim.keymap.set("n", "<leader>ep", "<Plug>TidalParagraphSend", { buffer = buf, desc = "Tidal: send paragraph" })
-    vim.keymap.set("n", "<leader>ee", "<Plug>TidalLineSend", { buffer = buf, desc = "Tidal: send line" })
-    vim.keymap.set("n", "<leader>h", ":TidalHush<cr>", { buffer = buf, desc = "Tidal: hush" })
-    vim.api.nvim_buf_create_user_command(buf, "S", "TidalSilence <args>", { nargs = 1 })
-    vim.api.nvim_buf_create_user_command(buf, "P", "TidalPlay <args>", { nargs = 1 })
-    vim.api.nvim_buf_create_user_command(buf, "H", "TidalHush", { nargs = 0 })
-  end,
-})
+au FileType tidal nm <buffer> <leader>ep <Plug>TidalParagraphSend
+au FileType tidal nm <buffer> <leader>ee <Plug>TidalLineSend
+au FileType tidal nnoremap <buffer> <leader>h :TidalHush<cr>
+au FileType tidal com! -nargs=1 S :TidalSilence <args>
+au FileType tidal com! -nargs=1 P :TidalPlay <args>
+au FileType tidal com! -nargs=0 H :TidalHush
 
--- SuperCollider
-vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter", "BufNewFile", "BufRead" }, {
-  pattern = { "*.sc", "*.scd" },
-  callback = function()
-    vim.bo.filetype = "supercollider"
-  end,
-})
-
-vim.api.nvim_create_autocmd("FileType", {
-  pattern = "supercollider",
-  command = "packadd scvim",
-})
+" SuperCollider
+au BufEnter,BufWinEnter,BufNewFile,BufRead *.sc,*.scd se filetype=supercollider
+au Filetype supercollider packadd scvim
+]])

dots/.config/nvim/after/plugin/wiki.vim.lua

@@ -1,8 +1,6 @@
-require("zk.utils")
-
 vim.cmd([[
 " Change local buffer to directory of current file after the plugin has loaded
-execute 'autocmd BufEnter' g:zk_path . '/*.md' 'silent lcd %:p:h'
+autocmd VimEnter * lcd %:p:h
 
 " " Override wiki index mapping to also cd into the wiki
 nm <leader>ww <plug>(wiki-index)
@@ -13,16 +11,11 @@ nm <leader>ww <plug>(wiki-index)
 " nm <leader>s <plug>(wiki-link-follow-split)
 " nm <leader>v <plug>(wiki-link-follow-vsplit)
 
-function! ZKContextualEcho()
-  let l:name = expand('%:t')
-  if l:name =~ '_' | echo 'hierarchical relation'
-  elseif l:name =~ '--' | echo 'relation'
-  elseif l:name =~ '<>' | echo 'dichotomy'
-  elseif l:name =~ 'my-' | echo 'personal file'
-  elseif l:name =~ 'project_' | echo 'project file'
-  endif
-endfunction
-execute 'autocmd BufEnter' g:zk_path . '/*.md' 'call ZKContextualEcho()'
+autocmd BufEnter *.md if expand('%:t') =~ '_' | echo 'hierarchical relation' | endif
+autocmd BufEnter *.md if expand('%:t') =~ '--' | echo 'relation' | endif
+autocmd BufEnter *.md if expand('%:t') =~ '<>' | echo 'dichotomy' | endif
+autocmd BufEnter *.md if expand('%:t') =~ 'my-' | echo 'personal file' | endif
+autocmd BufEnter *.md if expand('%:t') =~ 'project_' | echo 'project file' | endif
 
 " Only load wiki.vim for zk directory
 let g:wiki_index_name='index'
@@ -83,7 +76,7 @@ let g:wiki_templates = [
 "
 
 let g:wiki_filetypes=['md']
-let g:wiki_root=g:zk_path
+let g:wiki_root='~/.zk'
 let g:wiki_global_load=0
 let g:wiki_link_creation = {
       \ 'md': {

dots/.config/nvim/flake.lock

@@ -1,52 +1,12 @@
 {
   "nodes": {
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "mcp-hub",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743550720,
-        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "mcp-hub": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1755841689,
-        "narHash": "sha256-KakvXZf0vjdqzyT+LsAKHEr4GLICGXPmxl1hZ3tI7Yg=",
-        "owner": "ravitemer",
-        "repo": "mcp-hub",
-        "rev": "9c7670a4c341ed3cf738a6242c0fde1cea40bccf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ravitemer",
-        "repo": "mcp-hub",
-        "type": "github"
-      }
-    },
     "nixCats": {
       "locked": {
-        "lastModified": 1777273601,
-        "narHash": "sha256-xBUa8Tl9V7IXI+VmLEuDc81La/EhoSn1C3EVSnJ3cfU=",
+        "lastModified": 1763330129,
+        "narHash": "sha256-KbOeWIF52SV53BOeETGO2C5ewaV2Ex9iaXH7G72gOr8=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "f69ea013e328841a7def7037ed59788a76be8816",
+        "rev": "c81551ed87db2aefab30a12cf7425ff94dc0ad64",
         "type": "github"
       },
       "original": {
@@ -57,27 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743689281,
-        "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1777270315,
-        "narHash": "sha256-yKB4G6cKsQsWN7M6rZGk6gkJPDNPIzT05y4qzRyCDlI=",
+        "lastModified": 1763464769,
+        "narHash": "sha256-AJHrsT7VoeQzErpBRlLJM1SODcaayp0joAoEA35yiwM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6368eda62c9775c38ef7f714b2555a741c20c72d",
+        "rev": "6f374686605df381de8541c072038472a5ea2e2d",
         "type": "github"
       },
       "original": {
@@ -103,14 +47,30 @@
         "type": "github"
       }
     },
+    "plugins-crazy-node-movement": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693654676,
+        "narHash": "sha256-hQcQEp39zFN2zphMfcr97yRVcuHhBsSkzKO7XNloDpQ=",
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "rev": "d5cf01cc44c5715501d3d6fe439af7c8b7fa5df2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "type": "github"
+      }
+    },
     "plugins-helm-ls-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1773934114,
-        "narHash": "sha256-8trqFsA7nTKSdtkiAL0Sa9bXjh5ONtAqN7XNE/B8ukM=",
+        "lastModified": 1761915179,
+        "narHash": "sha256-W9NRa84l5Cs62OsDeqb+LMxk8oYjhVBCB3o3UmE9a0I=",
         "owner": "qvalentin",
         "repo": "helm-ls.nvim",
-        "rev": "20df43509b02a3ce3c6b3eee254d6e2bffa9a370",
+        "rev": "d6f3a8d4ad59b4f54cd734267dfb5411679ea608",
         "type": "github"
       },
       "original": {
@@ -122,11 +82,11 @@
     "plugins-mcphub-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768730387,
-        "narHash": "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=",
+        "lastModified": 1759035242,
+        "narHash": "sha256-I6EbgY/2sAdtrxtmH0qbAAQvMCHhOsfolJfblV0fXOk=",
         "owner": "ravitemer",
         "repo": "mcphub.nvim",
-        "rev": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f",
+        "rev": "8ff40b5edc649959bb7e89d25ae18e055554859a",
         "type": "github"
       },
       "original": {
@@ -170,11 +130,11 @@
     "plugins-tailwind-fold-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1766077142,
-        "narHash": "sha256-SwcDLlygXUSV/dytPXA5Y45OpUhjnExc8SZg5a8MZ2k=",
+        "lastModified": 1752559116,
+        "narHash": "sha256-8uefZIVsn9USEd6FyiO3m3TRKAS/vigU4t9Tk5ijd3c=",
         "owner": "razak17",
         "repo": "tailwind-fold.nvim",
-        "rev": "e2ba5ee1ca9b74208709fe9d7314b8aa753b26a7",
+        "rev": "d9e7ca11691d252b35795726dff087bf013b2ebf",
         "type": "github"
       },
       "original": {
@@ -185,10 +145,10 @@
     },
     "root": {
       "inputs": {
-        "mcp-hub": "mcp-hub",
         "nixCats": "nixCats",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "plugins-beancount-nvim": "plugins-beancount-nvim",
+        "plugins-crazy-node-movement": "plugins-crazy-node-movement",
         "plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
         "plugins-mcphub-nvim": "plugins-mcphub-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",

dots/.config/nvim/flake.nix

@@ -2,16 +2,15 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     nixCats.url = "github:BirdeeHub/nixCats-nvim";
-    mcp-hub.url = "github:ravitemer/mcp-hub";
 
     plugins-shipwright-nvim = {
       url = "github:rktjmp/shipwright.nvim";
       flake = false;
     };
-    # plugins-m-taskwarrior-d-nvim = {
-    #   url = "github:huantrinh1802/m_taskwarrior_d.nvim";
-    #   flake = false;
-    # };
+    plugins-crazy-node-movement = {
+      url = "github:theHamsta/crazy-node-movement";
+      flake = false;
+    };
     plugins-beancount-nvim = {
       url = "github:polarmutex/beancount.nvim";
       flake = false;
@@ -37,6 +36,7 @@
 
   outputs =
     {
+      self,
       nixpkgs,
       nixCats,
       ...
@@ -45,38 +45,10 @@
       inherit (nixCats) utils;
       luaPath = ./.;
       forEachSystem = utils.eachSystem nixpkgs.lib.platforms.all;
-      extra_pkg_config = {
-        allowUnfreePredicate =
-          pkg:
-          builtins.elem (nixpkgs.lib.getName pkg) [
-            "vim-sandwich"
-            "jupytext.nvim"
-            "eyeliner.nvim"
-            "context_filetype.vim"
-            "editorconfig-vim"
-            "unicode.vim"
-            "quarto-nvim"
-            "vim-openscad"
-            "lsp_lines.nvim"
-            "nvim-highlight-colors"
-            "nvim-lint"
-          ];
-      };
+      extra_pkg_config = { };
 
-      mkDependencyOverlays = system: [
+      dependencyOverlays = [
         (utils.standardPluginOverlay inputs)
-        (_final: _prev: {
-          mcp-hub = inputs.mcp-hub.packages.${system}.default;
-        })
-        (_: prev: {
-          luajitPackages = prev.luajitPackages.overrideScope (
-            _: lprev: {
-              neotest = lprev.neotest.overrideAttrs (_: {
-                doCheck = false;
-              });
-            }
-          );
-        })
       ];
 
       categoryDefinitions =
@@ -87,40 +59,21 @@
         {
           lspsAndRuntimeDeps = with pkgs; {
             general = [
-              nodejs_24
               black
               clang
               clang-tools
-              curl # → plenary-nvim, mcp-hub
-              delta
-              emmet-language-server
-              eslint_d
-              fd
               gawk
               gdtoolkit_4
-              hadolint
-              helm-ls
               isort
-              lua-language-server
-              mcp-hub
+              tree-sitter
+              ormolu
+              nodePackages.prettier
               nixd
               nixfmt
-              prettier
-              typescript-language-server
-              ormolu
               prettierd
-              rust-analyzer
-              rustfmt
               shellcheck-minimal
-              stylelint
               stylua
-              tree-sitter
-              tailwindcss-language-server
-              typescript-language-server
               vscode-langservers-extracted
-              vtsls
-              yaml-language-server
-              yamllint
             ];
           };
 
@@ -170,11 +123,11 @@
               pkgs.neovimPlugins.shipwright-nvim
               lush-nvim
               zenbones-nvim
+              pkgs.neovimPlugins.crazy-node-movement
               nvim-treesitter.withAllGrammars
               nvim-treesitter-textobjects
               # nvim-treesitter-context
               nvim-ts-context-commentstring
-              # theHamsta/crazy-node-movement
               treesj
               sniprun
               gitsigns-nvim
@@ -190,11 +143,7 @@
               copilot-lua
               copilot-cmp
               pkgs.neovimPlugins.helm-ls-nvim
-              kitty-scrollback-nvim
-              fidget-nvim
-              rustaceanvim
-              # pkgs.neovimPlugins.m-taskwarrior-d-nvim
-              claude-code-nvim
+              pkgs.vimPlugins.kitty-scrollback-nvim
             ];
           };
 
@@ -211,7 +160,9 @@
         };
 
       packageDefinitions = {
-        nvim = _: {
+        nvim =
+          { ... }:
+          {
             settings = {
               suffix-path = true;
               suffix-LD = true;
@@ -229,7 +180,6 @@
     forEachSystem (
       system:
       let
-        dependencyOverlays = mkDependencyOverlays system;
         nixCatsBuilder = utils.baseBuilder luaPath {
           inherit
             nixpkgs
@@ -249,7 +199,7 @@
             name = defaultPackageName;
             packages = [ defaultPackage ];
             inputsFrom = [ ];
-            shellHook = "";
+            shellHook = '''';
           };
         };
 
@@ -261,32 +211,31 @@
           moduleNamespace = [ defaultPackageName ];
           inherit
             defaultPackageName
+            dependencyOverlays
             luaPath
             categoryDefinitions
             packageDefinitions
             extra_pkg_config
             nixpkgs
             ;
-          dependencyOverlays = mkDependencyOverlays;
         };
         homeModule = utils.mkHomeModules {
           moduleNamespace = [ defaultPackageName ];
           inherit
             defaultPackageName
+            dependencyOverlays
             luaPath
             categoryDefinitions
             packageDefinitions
             extra_pkg_config
             nixpkgs
             ;
-          dependencyOverlays = mkDependencyOverlays;
         };
       in
       {
 
         overlays = utils.makeOverlays luaPath {
-          inherit nixpkgs extra_pkg_config;
-          dependencyOverlays = mkDependencyOverlays;
+          inherit nixpkgs dependencyOverlays extra_pkg_config;
         } categoryDefinitions packageDefinitions defaultPackageName;
 
         nixosModules.default = nixosModule;

dots/.config/nvim/ftplugin/json.lua

@@ -1,12 +1,15 @@
 local json_newline = function()
   local line = vim.api.nvim_get_current_line()
   if line == "" then
+    print("line is empty")
     return "o"
   elseif string.byte(line, -1) == string.byte(",") then
     return "o"
   elseif string.byte(line, -1) == string.byte("{") then
+    print("line ends with '{'")
     return "o"
   elseif string.byte(line, -1) == string.byte("}") then
+    print("line ends with '}'")
     return "o"
   else
     return "A,<CR>"

dots/.config/nvim/init.lua

@@ -1,20 +1,28 @@
 require("nixCatsUtils").setup({ non_nix_value = true }) -- https://github.com/BirdeeHub/nixCats-nvim/blob/77dffad8235eb77684fcb7599487c8e9f23d5b8f/templates/example/init.lua
 
-vim.opt.termguicolors = true
-vim.api.nvim_set_hl(0, "Normal", { ctermbg = "NONE", bg = "NONE" })
+vim.cmd([[
+set termguicolors
+set bg=light
+hi Normal ctermbg=none guibg=NONE
+]])
 
 require("base")
 require("cursor")
 require("fold")
 require("netrw")
 require("ftdetect")
+require("plug")
 require("pandoc")
 require("keymaps")
 require("highlight")
+require("paq-setup")
 require("statusline")
 require("diagnostic")
 require("utils")
 require("zk")
 require("reload")
 
+require("paq-setup") -- when not on nixCats
+
 vim.opt.background = "dark"
+vim.opt.laststatus = 3

dots/.config/nvim/lua/base.lua

@@ -26,4 +26,5 @@ set lcs=trail:·,tab:→\ ,nbsp:␣         " Whitespace rendering
 set ar                                 " Autoread
 set spellsuggest+=5                    " Limit spell suggestions
 set wildignore+=*/node_modules/*,*/tmp/*,*.so,*.swp,*.zip
+" set thesaurus+=./thesaurus/mthesaur.txt " FIXME
 ]])

dots/.config/nvim/lua/ftdetect.lua

@@ -9,6 +9,5 @@ vim.filetype.add({
     ["%.env.*"] = "dotenv",
     ["%.pl$"] = "prolog",
     [".*.containerfile.*"] = "dockerfile",
-    ["%.hydra$"] = "javascript",
   },
 })

dots/.config/nvim/lua/keymaps.lua

@@ -1,57 +1,60 @@
-vim.g.mapleader = " "
-vim.g.maplocalleader = ";"
+vim.cmd([[
+" Leader keys
+let mapleader = " "
+let maplocalleader = ";"
+
+" Splits & navigation
+nm s <c-w>           " Split horizontal
+nm ss :sp<CR><c-w>w| " Split horizontal
+nm sv :vs<CR><c-w>w| " Split vertical
+nm sw <c-w>w|        " Navigate splits
+nm sh <c-w>h|        "
+nm sj <c-w>j|        "
+nm sk <c-w>k|        "
+nm sl <c-w>l|        "
+nn sH <c-w>8<|       " Resize splits
+nn sJ <c-w>8-|       "
+nn sK <c-w>8+|       "
+nn sL <c-w>8>|       "
+nn s= <c-w>=|        " Equalize splits
+
+" Open
+nn sb :Lex<cr>|          " File tree
+nn <leader><leader> :noh<cr> |"
+nn <leader>t :term<cr>| " Open terminal
+
+" Remaps
+ino <nowait> jj <esc>|   " Normal now
+nn  <left>  <nop>|       " Hard mode
+nn  <down>  <nop>|       " "
+nn  <up>    <nop>|       " "
+nn  <right> <nop>|       " "
+ino <left>  <nop>|       " "
+ino <down>  <nop>|       " "
+ino <up>    <nop>|       " "
+ino <right> <nop>|       " "
+
+" Search
+nn <c-_> :noh<cr>| " map 'ctrl + /'
+
+" Line numbers
+nn <leader>n :set nu! rnu!<cr>
+
+" Vim configuration
+nn <leader>ec :vs $MYVIMRC<cr>
+nn <leader>so :so %<cr>
+]])
 
 local set = vim.keymap.set
 
--- splits & navigation
-set("n", "s", "<c-w>", { desc = "window prefix" })
-set("n", "ss", ":sp<CR><c-w>w", { desc = "split horizontal" })
-set("n", "sv", ":vs<CR><c-w>w", { desc = "split vertical" })
-set("n", "sw", "<c-w>w", { desc = "navigate splits" })
-set("n", "sh", "<c-w>h", { desc = "focus left split" })
-set("n", "sj", "<c-w>j", { desc = "focus below split" })
-set("n", "sk", "<c-w>k", { desc = "focus above split" })
-set("n", "sl", "<c-w>l", { desc = "focus right split" })
-set("n", "sH", "<c-w>8<", { desc = "shrink split left" })
-set("n", "sJ", "<c-w>8-", { desc = "shrink split down" })
-set("n", "sK", "<c-w>8+", { desc = "grow split up" })
-set("n", "sL", "<c-w>8>", { desc = "grow split right" })
-set("n", "s=", "<c-w>=", { desc = "equalize splits" })
+set("n", "<leader>cx", "<cmd>!chmod +x %<CR>", { silent = true, desc = "Run `chmod +x` on current file" })
+set("n", "yp", "<cmd>let @+ = expand('%r')<CR>:p<CR>", { silent = true, desc = "Yank path" })
 
--- open
-set("n", "sb", ":Lex<cr>", { desc = "file tree" })
-set("n", "<leader><leader>", ":noh<cr>", { desc = "clear highlights" })
-set("n", "<leader>t", ":term<cr>", { desc = "open terminal" })
+-- Remap native NeoVim comment keymaps
+set({ "n", "x" }, "<leader>c", "gc", { remap = true, desc = "Toggle comment" })
+set("n", "<leader>cc", "gcc", { remap = true, desc = "Toggle comment line" })
+set("o", "<leader>c", "gc", { remap = true, desc = "Comment textobject" })
 
--- remaps
-set("i", "jj", "<esc>", { nowait = true, desc = "exit insert mode" })
-set("n", "<left>", "<nop>")
-set("n", "<down>", "<nop>")
-set("n", "<up>", "<nop>")
-set("n", "<right>", "<nop>")
-set("i", "<left>", "<nop>")
-set("i", "<down>", "<nop>")
-set("i", "<up>", "<nop>")
-set("i", "<right>", "<nop>")
-
--- search
-set("n", "<c-_>", ":noh<cr>", { desc = "clear search highlight" })
-
--- line numbers
-set("n", "<leader>n", ":set nu! rnu!<cr>", { desc = "toggle line numbers" })
-
--- vim configuration
-set("n", "<leader>ec", ":vs $MYVIMRC<cr>", { desc = "edit vimrc" })
-set("n", "<leader>so", ":so %<cr>", { desc = "source current file" })
-
-set("n", "<leader>cx", "<cmd>!chmod +x %<CR>", { silent = true, desc = "run `chmod +x` on current file" })
-set("n", "yp", "<cmd>let @+ = expand('%r')<CR>:p<CR>", { silent = true, desc = "yank path" })
-
--- remap native NeoVim comment keymaps
-set({ "n", "x" }, "<leader>c", "gc", { remap = true, desc = "toggle comment" })
-set("n", "<leader>cc", "gcc", { remap = true, desc = "toggle comment line" })
-set("o", "<leader>c", "gc", { remap = true, desc = "comment textobject" })
-
--- move lines
-set("v", "K", ": '<,'>move '<-2<cr>gv", { desc = "move selection up" })
-set("v", "J", ": '<,'>move '>+1<cr>gv", { desc = "move selection down" })
+-- Move lines
+set("v", "K", ": '<,'>move '<-2<cr>gv")
+set("v", "J", ": '<,'>move '>+1<cr>gv")

dots/.config/nvim/lua/nixCatsUtils/catPacker.lua

@@ -0,0 +1,53 @@
+-- Source: https://github.com/BirdeeHub/nixCats-nvim/blob/main/templates/example/lua/nixCatsUtils/catPacker.lua
+--[[
+  This directory is the luaUtils template.
+  You can choose what things from it that you would like to use.
+  And then delete the rest.
+  Everything in this directory is optional.
+--]]
+
+local M = {}
+-- NOTE: This function is for defining a paq.nvim fallback method of downloading plugins
+-- when nixCats was not used to install your config.
+-- If you only ever load your config using nixCats, you don't need this file.
+
+-- it literally just only runs it when not on nixCats
+-- all neovim package managers that use the regular plugin loading scheme
+-- can be used this way, just do whatever the plugin manager needs to put it in the
+-- opt directory for lazy loading, and add the build steps so that when theres no nix the steps are ran
+function M.setup(v)
+  if not vim.g[ [[nixCats-special-rtp-entry-nixCats]] ] then
+    local function clone_paq()
+      local path = vim.fn.stdpath("data") .. "/site/pack/paqs/start/paq-nvim"
+      local is_installed = vim.fn.empty(vim.fn.glob(path)) == 0
+      if not is_installed then
+        vim.fn.system({ "git", "clone", "--depth=1", "https://github.com/savq/paq-nvim.git", path })
+        return true
+      end
+    end
+    local function bootstrap_paq(packages)
+      local first_install = clone_paq()
+      vim.cmd.packadd("paq-nvim")
+      local paq = require("paq")
+      if first_install then
+        vim.notify("Installing plugins... If prompted, hit Enter to continue.")
+      end
+      paq(packages)
+      paq.install()
+    end
+
+    vim.api.nvim_create_autocmd("VimEnter", {
+      once = true,
+      callback = function()
+        local pkgs_count = #require("paq").query("to_install")
+        if pkgs_count < 1 then
+          return
+        end
+        vim.notify(string.format("There are %d to install", pkgs_count))
+      end,
+    })
+
+    bootstrap_paq(vim.list_extend({ "savq/paq-nvim" }, v))
+  end
+end
+return M

dots/.config/nvim/lua/paq-setup.lua

@@ -0,0 +1,46 @@
+require("nixCatsUtils.catPacker").setup({
+  { "savq/paq-nvim" },
+  { "jinh0/eyeliner.nvim" },
+  { "ibhagwan/fzf-lua" },
+  { "barreiroleo/ltex_extra.nvim" },
+  { "neovim/nvim-lspconfig" },
+  { "https://git.sr.ht/~whynothugo/lsp_lines.nvim" },
+  { "linrongbin16/lsp-progress.nvim" },
+  { "folke/neodev.nvim" }, -- Nvim
+  { "b0o/schemastore.nvim" }, -- JSON Schemas
+  { "mfussenegger/nvim-lint" },
+  { "stevearc/conform.nvim" },
+  { "L3MON4D3/LuaSnip" },
+  { "saadparwaiz1/cmp_luasnip" },
+  { "hrsh7th/nvim-cmp" },
+  { "hrsh7th/cmp-nvim-lsp" },
+  { "hrsh7th/cmp-buffer" },
+  { "hrsh7th/cmp-path" },
+  { "nvim-lua/plenary.nvim" },
+  { "MunifTanjim/nui.nvim" },
+  { "folke/trouble.nvim" },
+  { "rktjmp/shipwright.nvim" }, -- For building themes based on lush (e.g. terminal)
+  { "rktjmp/lush.nvim" },
+  { "mcchrish/zenbones.nvim" }, -- Zenbones themes (contains zenwritten)
+  { "theHamsta/crazy-node-movement" },
+  { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
+  { "nvim-treesitter/nvim-treesitter-textobjects" },
+  -- { "nvim-treesitter/nvim-treesitter-context" },
+  { "JoosepAlviste/nvim-ts-context-commentstring" }, -- commentstring based on cursor position (e.g. for Svelte)
+  { "Wansmer/treesj" },
+  { "michaelb/sniprun", build = "sh install.sh" },
+  { "lewis6991/gitsigns.nvim" },
+  { "brenoprata10/nvim-highlight-colors" },
+  { "razak17/tailwind-fold.nvim" },
+  { "rmagatti/auto-session" },
+  { "kndndrj/nvim-dbee" },
+  { "3rd/image.nvim", build = false },
+  { "polarmutex/beancount.nvim" },
+  { "jamesblckwell/nvimkit.nvim" },
+  { 'olimorris/codecompanion.nvim' },
+  { "ravitemer/mcphub.nvim",                       build = "pnpm install -g mcp-hub@latest" },
+  { "zbirenbaum/copilot.lua" },
+  { "zbirenbaum/copilot-cmp" },
+  { "qvalentin/helm-ls.nvim", ft = "helm" },
+  { "mikesmithgh/kitty-scrollback.nvim" },
+})

dots/.config/nvim/lua/plug.lua

@@ -0,0 +1,35 @@
+if not vim.g[ [[nixCats-special-rtp-entry-nixCats]] ] then
+  local vim = vim
+  local Plug = vim.fn["plug#"]
+
+  vim.call("plug#begin")
+
+  Plug("machakann/vim-sandwich")
+  Plug("Shougo/context_filetype.vim")
+  Plug("editorconfig/editorconfig-vim")
+  Plug("honza/vim-snippets")
+  Plug("chrisbra/unicode.vim")
+  Plug("ap/vim-css-color")
+  -- Jupyter
+  Plug("quarto-dev/quarto-vim")
+  -- LaTeX
+  Plug("lervag/vimtex")
+  -- Wiki
+  Plug("lervag/wiki.vim")
+  -- Markdown
+  Plug("vim-pandoc/vim-pandoc")
+  Plug("vim-pandoc/vim-pandoc-syntax")
+  Plug("ferrine/md-img-paste.vim")
+  -- TidalCycles
+  Plug("supercollider/scvim")
+  Plug("tidalcycles/vim-tidal")
+  -- GLSL
+  Plug("tikhomirov/vim-glsl")
+  Plug("timtro/glslView-nvim")
+  -- Jupyter notebooks
+  Plug("goerz/jupytext.vim")
+  -- OpenSCAD
+  Plug("sirtaj/vim-openscad")
+
+  vim.call("plug#end")
+end

dots/.config/nvim/lua/skeleton/init.lua

@@ -2,10 +2,10 @@ local autocmd = vim.api.nvim_create_autocmd
 
 autocmd("BufNewFile", {
   pattern = "shell.nix",
-  command = "0r ~/.config/nvim/skeletons/shell.nix.skeleton",
+  command = "0r ~/.config/nvim/skeletons/shell.nix",
 })
 
 autocmd("BufNewFile", {
   pattern = "flake.nix",
-  command = "0r ~/.config/nvim/skeletons/flake.nix.skeleton",
+  command = "0r ~/.config/nvim/skeletons/flake.nix",
 })

dots/.config/nvim/lua/statusline.lua

@@ -1,6 +1,5 @@
-vim.opt.laststatus = 3
-
 vim.cmd([[
+se ls=2
 se stl=\ %0*%n
 se stl+=\ %m
 se stl+=\ %y%0*

dots/.config/nvim/lua/zk/cmp.lua

@@ -13,19 +13,13 @@ local function get_markdown_files(base)
   return items
 end
 
-function source:get_keyword_pattern()
-  return "[%w%./%-]*"
-end
-
 function source:complete(params, callback)
   local cursor_before_line = params.context.cursor_before_line
   local cursor_after_line = params.context.cursor_after_line or ""
 
-  if not cursor_before_line:match("%[[^%]]*%]%(") then
-    callback({})
-    return
-  end
+  local trigger = cursor_before_line:match("%[[^%]]*%]%(([^)]*)$")
 
+  if trigger ~= nil then
     local items = get_markdown_files(".")
     local next_char = cursor_after_line:sub(1, 1)
 
@@ -38,6 +32,9 @@ function source:complete(params, callback)
     end
 
     callback(items)
+  else
+    callback({})
+  end
 end
 
 function source:get_trigger_characters()

dots/.config/nvim/lua/zk/init.lua

@@ -1,10 +1,9 @@
 require("zk.cmp")
-require("zk.utils")
 
 vim.cmd([[
 let s:zk_preview_enabled = 0
 let s:live_server_job = -1
-execute 'au BufEnter' g:zk_path . '/*.md' 'silent exe "!echo %" ">" g:zk_path . "/current-zettel.txt"'
+au BufEnter /home/h/.zk/*.md silent exe '!echo "%" > /home/h/.zk/current-zettel.txt'
 function! ToggleZKPreview()
     if s:zk_preview_enabled == 1
         let s:zk_preview_enabled = 0
@@ -12,10 +11,10 @@ function! ToggleZKPreview()
         au! ZKPreview
     else
         let s:zk_preview_enabled = 1
-        let s:live_server_job = jobstart('live-server --watch=' . g:zk_path . '/current-zettel-content.html --open=current-zettel-content.html --port=8080')
+        let s:live_server_job = jobstart('live-server --watch=/home/h/.zk/current-zettel-content.html --open=current-zettel-content.html --port=8080')
         augroup ZKPreview
-          execute 'au BufEnter' g:zk_path . '/*.md' 'silent exe "!cat %:r.html" ">" g:zk_path . "/current-zettel-content.html"'
-          execute 'au BufWritePost' g:zk_path . '/*.md' 'silent exe "!make && cat %:r.html" ">" g:zk_path . "/current-zettel-content.html"'
+          au BufEnter /home/h/.zk/*.md silent exe '!cat "%:r.html" > /home/h/.zk/current-zettel-content.html'
+          au BufWritePost /home/h/.zk/*.md silent exe '!make && cat "%:r.html" > /home/h/.zk/current-zettel-content.html'
         augroup END
     endif
 endfunction

dots/.config/nvim/lua/zk/utils.lua

@@ -1,2 +0,0 @@
-vim.g.zk_path = os.getenv("ZK_PATH") or (os.getenv("HOME") .. "/.zk")
-return vim.g.zk_path

dots/.config/nvim/snips/all.lua

@@ -17,7 +17,7 @@ local LOCALHOST_IP = "127.0.0.1"
 
 return {
   s({ trig = "fn", desc = "Filename" }, { f(TM_FILENAME_BASE) }),
-  s({ trig = "fne", desc = "Filename (+extension)" }, { f(TM_FILENAME) }),
+  s({ trig = "fne", dscr = "Filename (+extension)" }, { f(TM_FILENAME) }),
   s({ trig = "hm" }, { t(NAME) }),
   s({ trig = "loho" }, { t(LOCALHOST) }),
   s({ trig = "lohoi" }, { t(LOCALHOST_IP) }),

dots/.config/nvim/snips/css.lua

@@ -5,112 +5,112 @@ local i = ls.insert_node
 
 return {
   -- Flex
-  s({ trig = "b1", desc = "Add 'border: 1px <color>;'" }, {
+  s({ trig = "b1", dscr = "Add 'border: 1px <color>;'" }, {
     t("border: 1px solid "),
     i(1),
     t(";"),
     i(0),
   }),
-  s({ trig = "dfl", desc = "Add 'display: flex;'" }, {
+  s({ trig = "dfl", dscr = "Add 'display: flex;'" }, {
     t("display: flex;"),
     i(0),
   }),
-  s({ trig = "flr", desc = "Add 'flex-direction: row;'" }, {
+  s({ trig = "flr", dscr = "Add 'flex-direction: row;'" }, {
     t("flex-direction: row;"),
     i(0),
   }),
-  s({ trig = "flc", desc = "Add 'flex-direction: column;'" }, {
+  s({ trig = "flc", dscr = "Add 'flex-direction: column;'" }, {
     t("flex-direction: column;"),
     i(0),
   }),
-  s({ trig = "flw", desc = "Add 'flex-wrap: wrap;'" }, {
+  s({ trig = "flw", dscr = "Add 'flex-wrap: wrap;'" }, {
     t("flex-wrap: wrap;"),
     i(0),
   }),
-  s({ trig = "dfc", desc = "Add 'flex-direction: column;'" }, {
+  s({ trig = "dfc", dscr = "Add 'flex-direction: column;'" }, {
     t("display: flex;"),
     t("flex-direction: column;"),
     i(0),
   }),
   -- Grid
-  s({ trig = "dg", desc = "Add 'display: grid;'" }, {
+  s({ trig = "dg", dscr = "Add 'display: grid;'" }, {
     t("display: grid;"),
     i(0),
   }),
   -- Block
-  s({ trig = "db", desc = "Add 'display: block;'" }, {
+  s({ trig = "db", dscr = "Add 'display: block;'" }, {
     t("display: block;"),
     i(0),
   }),
   -- None
-  s({ trig = "dn", desc = "Add 'display: none;'" }, {
+  s({ trig = "dn", dscr = "Add 'display: none;'" }, {
     t("display: none;"),
     i(0),
   }),
   -- CSS Variables
-  s({ trig = "v", desc = "Add CSS variable" }, {
+  s({ trig = "v", dscr = "Add CSS variable" }, {
     t("var(--"),
     i(1),
     t(")"),
     i(0),
   }),
   -- Margin
-  s({ trig = "m", desc = "Add 'margin: ;'" }, {
+  s({ trig = "m", dscr = "Add 'margin: ;'" }, {
     t("margin: "),
     i(1),
     t(";"),
     i(0),
   }),
-  s({ trig = "mt", desc = "Add 'margin-top: ;'" }, {
+  s({ trig = "mt", dscr = "Add 'margin-top: ;'" }, {
     t("margin-top: "),
     i(1),
     t(";"),
     i(0),
   }),
-  s({ trig = "mr", desc = "Add 'margin-right: ;'" }, {
+  s({ trig = "mr", dscr = "Add 'margin-right: ;'" }, {
     t("margin-right: "),
     i(1),
     t(";"),
     i(0),
   }),
-  s({ trig = "mb", desc = "Add 'margin-bottom: ;'" }, {
+  s({ trig = "mb", dscr = "Add 'margin-bottom: ;'" }, {
     t("margin-bottom: "),
     i(1),
     t(";"),
     i(0),
   }),
-  s({ trig = "ml", desc = "Add 'margin-left: ;'" }, {
+  s({ trig = "ml", dscr = "Add 'margin-left: ;'" }, {
     t("margin-left: "),
     i(1),
     t(";"),
     i(0),
   }),
   -- Padding
-  s({ trig = "p", desc = "Add 'padding: ;'" }, {
+  s({ trig = "p", dscr = "Add 'padding: ;'" }, {
     t("padding: "),
     i(1),
     t(";"),
     i(0),
   }),
-  s({ trig = "pt", desc = "Add 'padding-top: ;'" }, {
+  s({ trig = "pt", dscr = "Add 'padding-top: ;'" }, {
     t("padding-top: "),
     i(1),
     t(";"),
     i(0),
   }),
-  s({ trig = "pr", desc = "Add 'padding-right: ;'" }, {
+  s({ trig = "pr", dscr = "Add 'padding-right: ;'" }, {
     t("padding-right: "),
     i(1),
     t(";"),
     i(0),
   }),
-  s({ trig = "pb", desc = "Add 'padding-bottom: ;'" }, {
+  s({ trig = "pb", dscr = "Add 'padding-bottom: ;'" }, {
     t("padding-bottom: "),
     i(1),
     t(";"),
     i(0),
   }),
-  s({ trig = "pl", desc = "Add 'padding-left: ;'" }, {
+  s({ trig = "pl", dscr = "Add 'padding-left: ;'" }, {
     t("padding-left: "),
     i(1),
     t(";"),

dots/.config/nvim/snips/javascript.lua

@@ -4,19 +4,19 @@ local t = ls.text_node
 local i = ls.insert_node
 
 return {
-  s({ trig = "clg", desc = "console.log" }, {
+  s({ trig = "clg", dscr = "console.log" }, {
     t("console.log("),
     i(1),
     t(")"),
     i(0),
   }),
-  s({ trig = "Js", desc = "JSON.stringify" }, {
+  s({ trig = "Js", dscr = "JSON.stringify" }, {
     t("JSON.stringify("),
     i(1),
     t(")"),
     i(0),
   }),
-  s({ trig = "Jsf", desc = "JSON.stringify (formatted)" }, {
+  s({ trig = "Jsf", dscr = "JSON.stringify (formatted)" }, {
     t("JSON.stringify("),
     i(1),
     t(", 0, 2)"),

dots/.config/nvim/snips/pandoc.lua

@@ -915,21 +915,21 @@ end
 
 return {
   s(
-    { trig = "^h", regTrig = true, desc = "Markdown header" },
+    { trig = "^h", regTrig = true, dscr = "Markdown header" },
     fmta("# <><>", {
       d(1, get_visual),
       i(0),
     })
   ),
   s(
-    { trig = "^sec", regTrig = true, desc = "Markdown header" },
+    { trig = "^sec", regTrig = true, dscr = "Markdown header" },
     fmta("## <><>", {
       d(1, get_visual),
       i(0),
     })
   ),
   s(
-    { trig = "^ssec", regTrig = true, desc = "Markdown header" },
+    { trig = "^ssec", regTrig = true, dscr = "Markdown header" },
     fmta("### <><>", {
       d(1, get_visual),
       i(0),

dots/.config/nvim/vscode.lua

@@ -1,5 +1,11 @@
+local cmd = vim.cmd
 local map = vim.keymap.set
 
+cmd([[
+source ~/.vim/init/base.vim
+source ~/.vim/init/mappings.vim
+]])
+
 require("keymaps")
 
 map({ "n", "v" }, "<leader>p", '<cmd>call VSCodeNotify("workbench.action.quickOpen")<cr>')

dots/.config/systemd/user/ssh-agent.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH Key agent
+
+[Service]
+Type=simple
+Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
+ExecStart=/usr/bin/ssh-agent -D -a $SSH_AUTH_SOCK
+
+[Install]
+WantedBy=default.target

dots/.config/task/taskrc

@@ -1,3 +1,4 @@
+include ./taskrc.d/$HOSTNAME
 include ./taskrc.d/aliases
 include ./taskrc.d/urgency
 include ./taskrc.d/reports
@@ -9,5 +10,6 @@ search.case.sensitive=no
 
 rc.json.array=on
 rc.verbose=nothing
-news.version=3.4.2
+news.version=3.1.0
 
+recurrence=off

dots/.config/tmux/hooks/tmux.regular.conf

@@ -0,0 +1 @@
+set  -g status-style bg=default

dots/.config/tmux/hooks/tmux.ssh.conf

@@ -0,0 +1 @@
+set  -g status-style bg=blue,fg=black;

dots/.config/tmux/themes/zenwritten_dark.tmux

@@ -0,0 +1,22 @@
+# This file is based on the one provided by shipwright.nvim
+set -g @FG '#dddddd'
+set -g @BG '#111111'
+
+set -g status-left ' #[fg=#{@FG},bold]#{s/root//:client_key_table} '
+set -g status-right '#[fg=#{@FG},bold] [#S]#[fg=#{@FG},bold] [%d/%m] #[fg=#{@FG},bold][%I:%M%p] '
+set -g status-style fg='#{@FG}',bg='#{@BG}'
+
+set -g window-status-current-style fg='#{@FG}',bg='#{@BG}',bold
+
+set -g pane-border-style fg='#{@FG}'
+set -g pane-active-border-style fg='#{@FG}'
+
+set -g message-style fg='#{@FG}',bg='#{@FG}'
+
+set -g display-panes-active-colour '#{@FG}'
+set -g display-panes-colour '#{@FG}'
+
+set -g clock-mode-colour '#{@FG}'
+
+set -g mode-style fg='#{@FG}',bg='#{@FG}'
+

dots/.config/tmux/themes/zenwritten_light.tmux

@@ -0,0 +1,22 @@
+# This file is based on the one provided by shipwright.nvim
+set -g @FG '#111111'
+set -g @BG '#dddddd'
+
+set -g status-left ' #[fg=#{@FG},bold]#{s/root//:client_key_table} '
+set -g status-right '#[fg=#{@FG},bold] [#S]#[fg=#{@FG},bold] [%d/%m] #[fg=#{@FG},bold][%I:%M%p] '
+set -g status-style fg='#{@FG}',bg='#{@BG}'
+
+set -g window-status-current-style fg='#{@FG}',bg='#{@BG}',bold
+
+set -g pane-border-style fg='#{@FG}'
+set -g pane-active-border-style fg='#{@FG}'
+
+set -g message-style fg='#{@FG}',bg='#{@FG}'
+
+set -g display-panes-active-colour '#{@FG}'
+set -g display-panes-colour '#{@FG}'
+
+set -g clock-mode-colour '#{@FG}'
+
+set -g mode-style fg='#{@FG}',bg='#{@FG}'
+

dots/.config/tmux/tmux.conf

@@ -39,22 +39,10 @@ bind-key -T root F7 select-window -t 7
 bind-key -T root F8 select-window -t 8
 bind-key -T root F9 select-window -t 9
 
-
-# bind-key j command-prompt -p "join pane from:"  "join-pane -s '%%'"
-# bind-key s command-prompt -p "send pane to:"  "join-pane -t '%%'"
-bind-key -T root S-F1 join-pane -s :1
-bind-key -T root S-F2 join-pane -s :2
-bind-key -T root S-F3 join-pane -s :3
-bind-key -T root S-F4 join-pane -s :4
-bind-key -T root S-F5 join-pane -s :5
-bind-key -T root S-F6 join-pane -s :6
-bind-key -T root S-F7 join-pane -s :7
-bind-key -T root S-F8 join-pane -s :8
-bind-key -T root S-F9 join-pane -s :9
-
 # 1-based indexing makes most sense for keyboard layouts (where number row start at 1)
 set  -g base-index 1
 set  -g pane-base-index 1
+setw -g automatic-rename
 
 # statusbar
 set -g status-position top
@@ -65,16 +53,25 @@ set -g status-left "#[bg=colour235,fg=colour255] #S  #[fg=colour235,bg=default]
 set -g status-right ""
 %else
 set -g status-left '#h '
-set -g status-right '#(uptime | cut -f 4-5 -d " " | cut -f 1 -d ",") %a %l:%M:%S %p %Y-%m-%d'
+set -g status-right '#(uptime | cut -f 4-5 -d " " | cut -f 1 -d ",") %a%l:%M:%S %p %Y-%m-%d'
 %endif
 
+# theming
+%if "#{==:#{host},desktop-arch}"
 set  -g default-terminal "tmux-256color"
+setw -g window-status-style fg=colour244,bg=default
+setw -g window-status-current-style fg=colour232,bg=default,bold
+set  -g message-style fg=colour232,bg=default
+setw -g clock-mode-colour colour235
+set  -g status-style bg=default
+set  -g pane-border-style fg=#cccccc
+set  -g pane-active-border-style fg=#555555
+set  -g message-style bg=#cccccc,fg=#000000
+%endif
+
+set-hook -g after-new-session 'if -F "#{==:#{session_name},ssh}" "source ${XDG_CONFIG_HOME}/tmux/hooks/tmux.ssh.conf" "source ${XDG_CONFIG_HOME}/tmux/hooks/tmux.regular.conf"'
 
 # Vi copypaste mode
 if-shell "test '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 4 \)'" 'bind-key -Tcopy-mode-vi v send -X begin-selection; bind-key -Tcopy-mode-vi y send -X copy-selection-and-cancel'
 if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 4\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'bind-key -t vi-copy v begin-selection; bind-key -t vi-copy y copy-selection'
 if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 2\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'set-option -g status-utf8 on'
-
-set -g allow-passthrough on
-set -s extended-keys on
-set -as terminal-features 'xterm*:extkeys'

dots/.config/tmux/tmux.regular.conf

@@ -0,0 +1 @@
+set  -g status-style bg=default

dots/.gitconfig

@@ -93,6 +93,3 @@
 
 [includeIf "gitdir:~/work/"]
   path = ~/.gitconfig.work
-
-[includeIf "gitdir:~/nix-dev-shells/"]
-  path = ~/.gitconfig.work

dots/.gitignore

@@ -84,9 +84,6 @@ dkms.conf
 
 # Dotenv
 .env
-.envrc
-.direnv/
-.pre-commit-config.yaml
 
 # Prevent module files from being ignored (e.g. NestJS)
 !*.module*

dots/.resticexclude

@@ -0,0 +1,44 @@
+# Restic ignore
+
+# General
+.trash
+Trash
+.cache
+cache
+Cache
+CachedData
+CachedExtension
+CacheStorage
+__pycache__
+GPUCache
+ShaderCache
+build
+.git
+node_modules
+venv
+env
+
+# Specifics
+$HOME/.android
+$HOME/.atom
+$HOME/.build
+$HOME/.cabal
+$HOME/.cargo
+$HOME/.conda
+$HOME/.config/BraveSoftware/Brave-Browser/Default/Local Storage
+$HOME/.config/BraveSoftware/Brave-Browser/Default/Local Extension Settings
+$HOME/.config/nvm/versions
+$HOME/.config/devcert
+$HOME/.espressif
+$HOME/.local/share/torbrowser
+$HOME/.mozilla
+$HOME/.nvm
+$HOME/.npm
+$HOME/.nuget
+$HOME/.yarn
+$HOME/.config/yarn
+$HOME/doc/disk-images
+$HOME/.stremio-server
+$HOME/Games
+!$HOME/Games/*/drive_c/users/h/AppData
+!$HOME/Games/rhino

dots/.resticinclude

@@ -0,0 +1,3 @@
+/etc
+/boot
+/home

dots/.zotero/bbt.json

@@ -1,11 +1,11 @@
 {
   "config": {
-    "options": {},
     "preferences": {
       "ascii": "",
       "asciiBibLaTeX": false,
       "asciiBibTeX": true,
       "autoAbbrev": false,
+      "autoAbbrevStyle": "",
       "autoExport": "immediate",
       "autoExportDelay": 5,
       "autoExportIdleWait": 10,
@@ -13,22 +13,18 @@
       "autoExportPathReplaceDirSep": "-",
       "autoExportPathReplaceSpace": " ",
       "automaticTags": true,
+      "autoPinDelay": 0,
       "auxImport": false,
       "baseAttachmentPath": "/home/h/doc/books",
       "biblatexExtendedDateFormat": true,
       "biblatexExtendedNameFormat": true,
       "biblatexExtractEprint": true,
-      "biblatexUsePrefix": true,
-      "bibtexEditionOrdinal": false,
       "bibtexParticleNoOp": false,
       "bibtexURL": "off",
       "cache": true,
-      "cacheDelete": false,
+      "cacheFlushInterval": 5,
       "charmap": "",
-      "chinese": false,
-      "chineseSplitName": true,
       "citeCommand": "cite",
-      "citekeyCaseInsensitive": true,
       "citekeyFold": true,
       "citekeyFormat": "zotero.clean",
       "citekeyFormatEditing": "zotero.clean",
@@ -38,35 +34,32 @@
       "DOIandURL": "both",
       "exportBibTeXStrings": "off",
       "exportBraceProtection": true,
-      "exportSort": "citekey",
       "exportTitleCase": true,
       "extraMergeCitekeys": false,
       "extraMergeCSL": false,
       "extraMergeTeX": false,
-      "fillKeyAfter": 1,
       "git": "config",
       "import": true,
       "importBibTeXStrings": true,
       "importCaseProtection": "as-needed",
       "importCitationKey": true,
-      "importDetectURLs": true,
       "importExtra": true,
       "importJabRefAbbreviations": true,
       "importJabRefStrings": true,
       "importNoteToExtra": "",
-      "importPlaceEvent": "inproceedings,conference,presentation,talk",
       "importSentenceCase": "on+guess",
-      "importSentenceCaseQuoted": true,
       "importUnknownTexCommand": "ignore",
       "itemObserverDelay": 5,
       "jabrefFormat": 0,
-      "japanese": false,
+      "jieba": false,
+      "keyConflictPolicy": "keep",
       "keyScope": "global",
+      "kuroshiro": false,
       "language": "langid",
       "logEvents": false,
       "mapMath": "",
       "mapText": "",
-      "packages": "",
+      "mapUnicode": "conservative",
       "parseParticles": true,
       "patchDates": "dateadded=dateAdded, date-added=dateAdded, datemodified=dateModified, date-modified=dateModified",
       "platform": "lin",
@@ -82,8 +75,7 @@
       "rawImports": false,
       "rawLaTag": "#LaTeX",
       "relativeFilePaths": false,
-      "remigrate": false,
-      "resetKeyOnChange": false,
+      "retainCache": false,
       "scrubDatabase": false,
       "separatorList": "and",
       "separatorNames": "and",
@@ -99,3 +91,4 @@
     }
   }
 }
+

flake.lock

@@ -1,141 +1,5 @@
 {
   "nodes": {
-    "arion": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "haskell-flake": "haskell-flake",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1770259557,
-        "narHash": "sha256-EvZ09k9+mzXAngPzU2K7oLLUDlKoT1numb4bDb3Gtl4=",
-        "owner": "hercules-ci",
-        "repo": "arion",
-        "rev": "9b24cf65c72cb0e9616e437d55e1ac8e5c6bc715",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "arion",
-        "type": "github"
-      }
-    },
-    "base16": {
-      "inputs": {
-        "fromYaml": "fromYaml"
-      },
-      "locked": {
-        "lastModified": 1755819240,
-        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "type": "github"
-      }
-    },
-    "base16-fish": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1765809053,
-        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
-        "type": "github"
-      }
-    },
-    "base16-helix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1776754714,
-        "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "type": "github"
-      }
-    },
-    "base16-vim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732806396,
-        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      }
-    },
-    "colmena": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "stable": "stable"
-      },
-      "locked": {
-        "lastModified": 1782904768,
-        "narHash": "sha256-tu/otndlmVoSxoQVkNL5cvMFAMyekO2mCVYTl0DRlfs=",
-        "owner": "zhaofengli",
-        "repo": "colmena",
-        "rev": "1ebe1b5526099a3b108a599c59ce0e6422a1a663",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli",
-        "repo": "colmena",
-        "type": "github"
-      }
-    },
-    "deploy-rs": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1781627888,
-        "narHash": "sha256-5yHuAh9k7rT7rtf3uRaXkiUyYvQE9oaCgzhprLm2mr8=",
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "rev": "6d3087eedff75a715b40c0e124ba15d2dd7bec28",
-        "type": "github"
-      },
-      "original": {
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -143,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768920986,
-        "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=",
+        "lastModified": 1746728054,
+        "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "de5708739256238fb912c62f03988815db89ec9a",
+        "rev": "ff442f5d1425feb86344c028298548024f21256d",
         "type": "github"
       },
       "original": {
@@ -165,11 +29,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1780200155,
-        "narHash": "sha256-cKpqEvRqxnCbp/2ZVczMHws31Qh4D/HTEuanWuJmySk=",
+        "lastModified": 1764561884,
+        "narHash": "sha256-vQ3iFPPhxsLqV3c5kgmYP53mVD6id6gsP0tN+oTmqok=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "d29c0c2692ced897777eca19c9bab1b34be0e0d6",
+        "rev": "aba4621459aec251d90d6452e3495b58a8a5e185",
         "type": "gitlab"
       },
       "original": {
@@ -179,133 +43,6 @@
         "type": "gitlab"
       }
     },
-    "firefox-gnome-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1779670703,
-        "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=",
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "arion",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "arion",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1778716662,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -324,112 +61,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "fromYaml": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731966426,
-        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "type": "github"
-      }
-    },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1782908218,
-        "narHash": "sha256-wLMOrPgVyeF3XmP+qfYcLqnVdTxikdcSvbIY7rA9jTA=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "9f7e99119ece7705299595299f3b031f39356de1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gnome-shell": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767737596,
-        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
-        "type": "github"
-      }
-    },
-    "haskell-flake": {
-      "locked": {
-        "lastModified": 1675296942,
-        "narHash": "sha256-u1X1sblozi5qYEcLp1hxcyo8FfDHnRUVX3dJ/tW19jY=",
-        "owner": "srid",
-        "repo": "haskell-flake",
-        "rev": "c2cafce9d57bfca41794dc3b99c593155006c71e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "ref": "0.1.0",
-        "repo": "haskell-flake",
-        "type": "github"
-      }
-    },
-    "hecuba-services": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1783927411,
-        "narHash": "sha256-TQkrVZmodYGdOJvBJy5hWPJs0JMq4t2fZo8Uq+G9O9k=",
-        "ref": "main",
-        "rev": "76b50cc50d7fadee7e18132d502fd51752583034",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@github.com/hektor/hecuba-services"
-      },
-      "original": {
-        "type": "git",
-        "url": "ssh://git@github.com/hektor/hecuba-services",
-        "ref": "main",
-        "shallow": true
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -437,11 +68,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780099287,
-        "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=",
+        "lastModified": 1764544324,
+        "narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d",
+        "rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612",
         "type": "github"
       },
       "original": {
@@ -450,53 +81,13 @@
         "type": "github"
       }
     },
-    "mcp-hub": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1755841689,
-        "narHash": "sha256-KakvXZf0vjdqzyT+LsAKHEr4GLICGXPmxl1hZ3tI7Yg=",
-        "owner": "ravitemer",
-        "repo": "mcp-hub",
-        "rev": "9c7670a4c341ed3cf738a6242c0fde1cea40bccf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ravitemer",
-        "repo": "mcp-hub",
-        "type": "github"
-      }
-    },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "colmena",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737420293,
-        "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
     "nix-secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1783872092,
-        "narHash": "sha256-Lg4kvJw3BxjeBEszQ9n1H+Oj/30u3N9N+TAwbmKhDPY=",
+        "lastModified": 1764371082,
+        "narHash": "sha256-yxFxEKXFuXFyFIDZY1gla2OyuqcIE3uT8KDDgTmm3cE=",
         "ref": "main",
-        "rev": "1900322e9ddd920986c5b31ef161fd1c3f977846",
+        "rev": "b9c2ce32cc4c95d7ff01372faea2668407ef8d27",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@github.com/hektor/nix-secrets"
@@ -510,11 +101,11 @@
     },
     "nixCats": {
       "locked": {
-        "lastModified": 1777273601,
-        "narHash": "sha256-xBUa8Tl9V7IXI+VmLEuDc81La/EhoSn1C3EVSnJ3cfU=",
+        "lastModified": 1764009888,
+        "narHash": "sha256-hJekfTiW1792txgRSM4LcHnz1lDSY87LYbsJEn2V378=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "f69ea013e328841a7def7037ed59788a76be8816",
+        "rev": "16ac3281f322ea15d39843829e42a44d22da3715",
         "type": "github"
       },
       "original": {
@@ -525,7 +116,7 @@
     },
     "nixgl": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -545,15 +136,12 @@
       }
     },
     "nixos-hardware": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
       "locked": {
-        "lastModified": 1780065812,
-        "narHash": "sha256-SCSLUKBmwlSLGQ8Xbr8PjRFtiHNk0l9ktqkcmqdBkfE=",
+        "lastModified": 1764440730,
+        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "b76b5639c0593e0aeb0b5879ad62d4b30596c144",
+        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
         "type": "github"
       },
       "original": {
@@ -565,24 +153,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767892417,
-        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1782723713,
-        "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=",
+        "lastModified": 1764517877,
+        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8",
+        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
         "type": "github"
       },
       "original": {
@@ -592,55 +167,14 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nur": {
-      "inputs": {
-        "flake-parts": [
-          "stylix",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1779766384,
-        "narHash": "sha256-P7Ohnlq8b8b2fU+Sgkrej7LBTM60LBTkHleLuYzmLmU=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "57800b7ab648725ccd33551d01484ee14952ad3f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
     "nvim": {
       "inputs": {
-        "mcp-hub": "mcp-hub",
         "nixCats": "nixCats",
         "nixpkgs": [
           "nixpkgs"
         ],
         "plugins-beancount-nvim": "plugins-beancount-nvim",
+        "plugins-crazy-node-movement": "plugins-crazy-node-movement",
         "plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
         "plugins-mcphub-nvim": "plugins-mcphub-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
@@ -673,14 +207,30 @@
         "type": "github"
       }
     },
+    "plugins-crazy-node-movement": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693654676,
+        "narHash": "sha256-hQcQEp39zFN2zphMfcr97yRVcuHhBsSkzKO7XNloDpQ=",
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "rev": "d5cf01cc44c5715501d3d6fe439af7c8b7fa5df2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "type": "github"
+      }
+    },
     "plugins-helm-ls-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1773934114,
-        "narHash": "sha256-8trqFsA7nTKSdtkiAL0Sa9bXjh5ONtAqN7XNE/B8ukM=",
+        "lastModified": 1761915179,
+        "narHash": "sha256-W9NRa84l5Cs62OsDeqb+LMxk8oYjhVBCB3o3UmE9a0I=",
         "owner": "qvalentin",
         "repo": "helm-ls.nvim",
-        "rev": "20df43509b02a3ce3c6b3eee254d6e2bffa9a370",
+        "rev": "d6f3a8d4ad59b4f54cd734267dfb5411679ea608",
         "type": "github"
       },
       "original": {
@@ -692,11 +242,11 @@
     "plugins-mcphub-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768730387,
-        "narHash": "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=",
+        "lastModified": 1759035242,
+        "narHash": "sha256-I6EbgY/2sAdtrxtmH0qbAAQvMCHhOsfolJfblV0fXOk=",
         "owner": "ravitemer",
         "repo": "mcphub.nvim",
-        "rev": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f",
+        "rev": "8ff40b5edc649959bb7e89d25ae18e055554859a",
         "type": "github"
       },
       "original": {
@@ -740,11 +290,11 @@
     "plugins-tailwind-fold-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1766077142,
-        "narHash": "sha256-SwcDLlygXUSV/dytPXA5Y45OpUhjnExc8SZg5a8MZ2k=",
+        "lastModified": 1752559116,
+        "narHash": "sha256-8uefZIVsn9USEd6FyiO3m3TRKAS/vigU4t9Tk5ijd3c=",
         "owner": "razak17",
         "repo": "tailwind-fold.nvim",
-        "rev": "e2ba5ee1ca9b74208709fe9d7314b8aa753b26a7",
+        "rev": "d9e7ca11691d252b35795726dff087bf013b2ebf",
         "type": "github"
       },
       "original": {
@@ -755,21 +305,15 @@
     },
     "root": {
       "inputs": {
-        "arion": "arion",
-        "colmena": "colmena",
-        "deploy-rs": "deploy-rs",
         "disko": "disko",
         "firefox-addons": "firefox-addons",
-        "git-hooks": "git-hooks",
-        "hecuba-services": "hecuba-services",
         "home-manager": "home-manager",
         "nix-secrets": "nix-secrets",
         "nixgl": "nixgl",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nvim": "nvim",
-        "sops-nix": "sops-nix",
-        "stylix": "stylix"
+        "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
@@ -779,11 +323,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777944972,
-        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
+        "lastModified": 1764483358,
+        "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
+        "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
         "type": "github"
       },
       "original": {
@@ -792,55 +336,6 @@
         "type": "github"
       }
     },
-    "stable": {
-      "locked": {
-        "lastModified": 1782851755,
-        "narHash": "sha256-91ODtG9bUk4AMsgPfGlHzHxh+3r64DClTRxaiTHevIQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f3fb8f32d52b627190abb82438bdcc75a9c77b4e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-26.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "stylix": {
-      "inputs": {
-        "base16": "base16",
-        "base16-fish": "base16-fish",
-        "base16-helix": "base16-helix",
-        "base16-vim": "base16-vim",
-        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_3",
-        "gnome-shell": "gnome-shell",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nur": "nur",
-        "systems": "systems_4",
-        "tinted-kitty": "tinted-kitty",
-        "tinted-schemes": "tinted-schemes",
-        "tinted-tmux": "tinted-tmux",
-        "tinted-zed": "tinted-zed"
-      },
-      "locked": {
-        "lastModified": 1780079634,
-        "narHash": "sha256-VVyCrzwLitvxZGx48FgzvlbLYGQU99GsaQnZmwqZoUo=",
-        "owner": "danth",
-        "repo": "stylix",
-        "rev": "ca07e0644716a7c13e91c6d92d169fc81889c589",
-        "type": "github"
-      },
-      "original": {
-        "owner": "danth",
-        "repo": "stylix",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -855,133 +350,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tinted-kitty": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735730497,
-        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "type": "github"
-      }
-    },
-    "tinted-schemes": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1777806186,
-        "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=",
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "type": "github"
-      }
-    },
-    "tinted-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1778379944,
-        "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "fe0203a198690e71a5ff11e08812a4673de3678d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "type": "github"
-      }
-    },
-    "tinted-zed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1778378178,
-        "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=",
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "rev": "9cd816033ff969415b190722cddf134e78a5665f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -5,6 +5,7 @@
     };
     nixos-hardware = {
       url = "github:NixOS/nixos-hardware/master";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     disko = {
       url = "github:nix-community/disko/latest";
@@ -18,30 +19,6 @@
       url = "git+ssh://git@github.com/hektor/nix-secrets?shallow=1&ref=main";
       flake = false;
     };
-    colmena = {
-      url = "github:zhaofengli/colmena";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    deploy-rs = {
-      url = "github:serokell/deploy-rs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    arion = {
-      url = "github:hercules-ci/arion";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hecuba-services = {
-      url = "git+ssh://git@github.com/hektor/hecuba-services?shallow=1&ref=main";
-      flake = false;
-    };
-    git-hooks = {
-      url = "github:cachix/git-hooks.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    stylix = {
-      url = "github:danth/stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -64,130 +41,42 @@
     {
       self,
       nixpkgs,
-      git-hooks,
+      nixos-hardware,
+      disko,
+      sops-nix,
+      nix-secrets,
       home-manager,
       nixgl,
-      ...
+      firefox-addons,
+      nvim,
     }@inputs:
     let
-      inherit (self) outputs;
-      inherit (inputs.nixpkgs) lib;
-      myUtils = import ./utils { inherit lib; };
-      hostDirNames = myUtils.dirNames ./hosts;
+      lib = inputs.nixpkgs.lib;
+      utils = import ./utils { inherit lib; };
+      hostDirNames = utils.dirNames ./hosts;
       system = "x86_64-linux";
-      dotsPath = ./dots;
-      gitHooks = import ./git-hooks.nix {
-        inherit nixpkgs git-hooks system;
-        src = ./.;
-      };
-    in
-    {
-      nixosConfigurations =
-        (lib.genAttrs hostDirNames (
-          host:
-          nixpkgs.lib.nixosSystem {
-            modules = [
-              ./hosts/${host}
-              {
-                nixpkgs.hostPlatform = (myUtils.hostMeta ./hosts/${host}).system;
-                host.name = host;
-              }
-            ];
-            specialArgs = {
-              inherit
-                inputs
-                outputs
-                dotsPath
-                myUtils
-                ;
-            };
-          }
-        ))
-        // {
-          sd-image-orange-pi-aarch64 = nixpkgs.lib.nixosSystem {
-            modules = [
-              "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
-              ./images/sd-image-orange-pi-aarch64.nix
-              {
-                nixpkgs.buildPlatform = "x86_64-linux";
-                nixpkgs.hostPlatform = "aarch64-linux";
-              }
-            ];
-            specialArgs = {
-              inherit
-                inputs
-                outputs
-                dotsPath
-                myUtils
-                ;
-            };
-          };
-          sd-image-raspberry-pi-aarch64 = nixpkgs.lib.nixosSystem {
-            modules = [
-              "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
-              ./images/sd-image-raspberry-pi-aarch64.nix
-              {
-                nixpkgs.buildPlatform = "x86_64-linux";
-                nixpkgs.hostPlatform = "aarch64-linux";
-              }
-            ];
-            specialArgs = {
-              inherit
-                inputs
-                outputs
-                dotsPath
-                myUtils
-                ;
-            };
-          };
-        };
-
-      homeConfigurations = {
-        work = home-manager.lib.homeManagerConfiguration {
       pkgs = import nixpkgs {
         inherit system;
         overlays = [ nixgl.overlay ];
       };
+    in
+    {
+      nix.nixPath = [
+        "nixpkgs=${inputs.nixpkgs}"
+      ]; # <https://github.com/nix-community/nixd/blob/main/nixd/docs/configuration.md>
+      nixosConfigurations = lib.genAttrs hostDirNames (
+        host:
+        nixpkgs.lib.nixosSystem {
+          modules = [ ./hosts/${host} ];
+          specialArgs = { inherit inputs; };
+        }
+      );
+      homeConfigurations = {
+        work = home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
           modules = [ ./home/hosts/work ];
-          extraSpecialArgs = {
-            osConfig = null;
-            inherit
-              inputs
-              outputs
-              dotsPath
-              myUtils
-              ;
+          extraSpecialArgs = { inherit inputs; };
         };
       };
     };
-
-      apps.${system}.colmena = inputs.colmena.apps.${system}.default // {
-        meta.description = "colmena";
-      };
-
-      colmenaHive = import ./deploy/colmena.nix {
-        inherit
-          self
-          inputs
-          ;
-      };
-
-      deploy = import ./deploy/deploy-rs.nix {
-        inherit
-          self
-          inputs
-          ;
-      };
-
-      checks.${system} = gitHooks.checks // inputs.deploy-rs.lib.${system}.deployChecks self.deploy;
-      formatter.${system} = gitHooks.formatter;
-      devShells.${system} = gitHooks.devShells;
-
-      legacyPackages.${system} = {
-        sd-image-orange-pi-aarch64 =
-          self.nixosConfigurations.sd-image-orange-pi-aarch64.config.system.build.sdImage;
-        sd-image-raspberry-pi-aarch64 =
-          self.nixosConfigurations.sd-image-raspberry-pi-aarch64.config.system.build.sdImage;
-      };
-    };
 }

git-hooks.nix

@@ -1,47 +0,0 @@
-{
-  nixpkgs,
-  git-hooks,
-  system,
-  src,
-}:
-let
-  pkgs = nixpkgs.legacyPackages.${system};
-
-  pre-commit-check = git-hooks.lib.${system}.run {
-    inherit src;
-    hooks = {
-      nixfmt = {
-        enable = true;
-        package = pkgs.nixfmt;
-      };
-      statix.enable = true;
-      deadnix.enable = true;
-    };
-  };
-in
-{
-  checks = {
-    inherit pre-commit-check;
-  };
-
-  formatter =
-    let
-      inherit (pre-commit-check) config;
-      inherit (config) package configFile;
-      script = ''
-        ${pkgs.lib.getExe package} run --all-files --config ${configFile}
-      '';
-    in
-    pkgs.writeShellScriptBin "pre-commit-run" script;
-
-  devShells = {
-    default =
-      let
-        inherit (pre-commit-check) shellHook enabledPackages;
-      in
-      pkgs.mkShell {
-        inherit shellHook;
-        buildInputs = enabledPackages;
-      };
-  };
-}

home/hosts/andromache/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  inputs,
   config,
   pkgs,
   ...
@@ -7,61 +8,12 @@
 
 {
   imports = [
-    ../../modules
+    (import ../astyanax {
+      inherit inputs;
+      inherit config;
+      inherit pkgs;
+    })
   ];
 
-  home = {
-    stateVersion = "25.05";
-    inherit (config.host) username;
-    homeDirectory = "/home/${config.host.username}";
-  };
-
-  xdg.userDirs.createDirectories = false;
-  xdg.userDirs.download = "${config.home.homeDirectory}/dl";
-
-  modules."3d" = {
-    printing.enable = true;
-    modeling.enable = true;
-  };
-  ai-tools = {
-    claude-code.enable = true;
-    opencode.enable = true;
-  };
-  desktop.niri.enable = true;
-  browser.enable = true;
-  browser.primary = "librewolf";
-  cloud.hetzner.enable = true;
-  comms.signal.enable = true;
-  git.enable = true;
-  git.github.enable = true;
-  shell = {
-    enable = true;
-    bash.aliases.lang-js = true;
-    bash.addBinToPath = true;
-  };
-  anki.enable = true;
-  k8s.k9s.enable = true;
-  secrets.enable = true;
-  taskwarrior.enable = true;
-  audio.enable = true;
-  ssh.enable = true;
-  deploy.enable = true;
-  music.enable = true;
-  terminal.enable = true;
-  devenv.enable = true;
-  keepassxc.enable = true;
-  direnv.enable = true;
-  nvim.enable = true;
-  pandoc.enable = true;
-  photography.enable = true;
-  torrenting.enable = true;
-  my.yubikey.enable = true;
-  zk.enable = true;
-
-  programs = {
-    home-manager.enable = true;
-    taskwarrior.config.recurrence = lib.mkForce "on";
-  };
-
-  home.packages = import ../packages.nix { inherit pkgs; };
+  programs.taskwarrior.config.recurrence = lib.mkForce "on";
 }

home/hosts/astyanax/default.nix

@@ -1,66 +1,77 @@
 {
+  inputs,
   config,
   pkgs,
   ...
 }:
 
+let
+  username = "h";
+in
 {
   imports = [
-    ../../modules
+    ../../modules/dconf.nix # TODO: Only enable when on Gnome?
+    ../../modules/git.nix
+    ../../modules/k9s.nix
+    (import ../../modules/taskwarrior.nix {
+      inherit config;
+      inherit pkgs;
+    })
   ];
 
-  home = {
-    stateVersion = "25.05";
-    inherit (config.host) username;
-    homeDirectory = "/home/${config.host.username}";
-  };
+  home.stateVersion = "25.05";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
 
-  xdg.userDirs = {
-    enable = false;
-    createDirectories = false;
-  };
-
-  modules."3d".printing.enable = true;
-  ai-tools = {
-    claude-code.enable = true;
-    opencode.enable = true;
-  };
-  anki.enable = true;
-  audio.enable = true;
-  browser.enable = true;
-  browser.primary = "librewolf";
-  cloud.hetzner.enable = true;
-  comms.signal.enable = true;
-  desktop.niri.enable = true;
-  devenv.enable = true;
-  direnv.enable = true;
-  git.enable = true;
-  git.github.enable = true;
-  k8s.k9s.enable = true;
-  keepassxc.enable = true;
-  music.enable = true;
-  my.yubikey.enable = true;
-  nfc.enable = true;
-  nvim.enable = true;
-  pandoc.enable = true;
-  secrets.enable = true;
-  shell = {
-    enable = true;
-    bash.aliases.lang-js = true;
-    bash.addBinToPath = true;
-  };
-  ssh.enable = true;
-  deploy.enable = true;
-  taskwarrior.enable = true;
-  terminal.enable = true;
-  reference-manager.enable = true;
+  xdg.userDirs.createDirectories = false;
+  xdg.userDirs.download = "${config.home.homeDirectory}/dl";
 
   programs = {
-    home-manager.enable = true;
-  };
+    bash = {
+      enable = true;
+      enableCompletion = true;
+      initExtra = ''
+        for f in /home/h/.bashrc.d/*; do
+          [ -f "$f" ] && source "$f"
+        done
 
-  home.packages = import ../packages.nix {
+        source /home/h/.bash_aliases/all
+        source /home/h/.bash_aliases/lang-js
+
+        # host-specific config goes here
+        # ...
+
+        export PATH=${../../../dots/.bin}:$PATH
+      '';
+    };
+    firefox = import ../../modules/firefox.nix {
+      inherit inputs;
       inherit pkgs;
       inherit config;
     };
+    fzf = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+    home-manager.enable = true;
+    keepassxc = import ../../modules/keepassxc.nix;
+  };
+
+  home.packages = import ./packages.nix {
+    inherit pkgs;
+    inherit config;
+  };
+
+  home.file = {
+    ".inputrc".source = ../../../dots/.inputrc;
+    ".bashrc.d/prompt".source = ../../../dots/.bashrc.d/prompt;
+    ".bashrc.d/editor".source = ../../../dots/.bashrc.d/editor;
+    ".bash_aliases/all".source = ../../../dots/.bash_aliases/all;
+    ".bash_aliases/lang-js".source = ../../../dots/.bash_aliases/lang-js;
+    ".config/kitty/kitty.conf".source = ../../../dots/.config/kitty/kitty.conf;
+    ".config/kitty/themes/zenwritten_light.conf".source =
+      ../../../dots/.config/kitty/themes/zenwritten_light.conf;
+    ".config/kitty/themes/zenwritten_dark.conf".source =
+      ../../../dots/.config/kitty/themes/zenwritten_dark.conf;
+  };
 }

home/hosts/astyanax/packages.nix

@@ -0,0 +1,52 @@
+{ pkgs, ... }:
+
+with pkgs;
+[
+  bash-completion
+  bash-language-server
+  bat
+  brightnessctl
+  entr
+  eslint_d
+  feh
+  fzf
+  gh
+  git
+  haskell-language-server
+  haskellPackages.pandoc-crossref
+  haskellPackages.hadolint
+  htop
+  jq
+  kitty
+  lua-language-server
+  nixfmt-rfc-style
+  nmap
+  nodejs_24
+  nvimpager
+  ormolu
+  pandoc
+  parallel
+  pass
+  pnpm
+  ripgrep
+  silver-searcher
+  sops
+  sshfs
+  stylelint
+  svelte-language-server
+  tailwindcss-language-server
+  tldr
+  tmux
+  tmuxp
+  tree
+  tree-sitter
+  typescript-language-server
+  unzip
+  vim-language-server
+  vimPlugins.vim-plug
+  vtsls
+  wget
+  xbanish
+  xclip
+  yaml-language-server
+]

home/hosts/packages.nix

@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-
-with pkgs;
-[
-  bat
-  curl
-  entr
-  fd
-  feh
-  fzf
-  htop
-  jq
-  nmap
-  nvimpager
-  parallel
-  pass
-  ripgrep
-  sops
-  tldr
-  tree
-  unzip
-  wget
-]

home/hosts/work/default.nix

@@ -5,100 +5,40 @@
   ...
 }:
 
+let
+  username = "hektor";
+in
 {
   imports = [
-    inputs.sops-nix.homeManagerModules.sops
-    inputs.stylix.homeModules.stylix
-    ../../modules
+    ../../modules/dconf.nix
+    ../../modules/git.nix
+    ../../modules/k9s.nix
   ];
 
-  sops.age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
-
   nixpkgs.config.allowUnfree = true;
 
-  xdg = {
-    systemDirs.config = [ "/etc/xdg" ];
-    userDirs = {
-      createDirectories = false;
-      download = "${config.home.homeDirectory}/dl";
-    };
-  };
-
-  home = {
-    stateVersion = "25.05";
-    username = "hektor";
-    homeDirectory = "/home/${config.home.username}";
-  };
+  home.stateVersion = "25.05";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
 
   targets.genericLinux.nixGL = {
-    inherit (inputs.nixgl) packages;
+    packages = inputs.nixgl.packages;
     defaultWrapper = "mesa";
   };
 
-  ai-tools = {
-    claude-code.enable = true;
-    tirith.enable = true;
-    opencode.enable = true;
-  };
-  anki.enable = true;
-  browser = {
-    enable = true;
-    primary = "firefox";
-    secondary = "chromium";
-  };
-  bruno.enable = true;
-  cloud.azure.enable = true;
-  comms.signal.enable = true;
-  comms.teams.enable = true;
-  database = {
-    mssql.enable = true;
-    postgresql.enable = true;
-    redis.enable = true;
-  };
-  desktop.niri.enable = true;
-  devenv.enable = true;
-  direnv.enable = true;
-  docker.enable = true;
-  git = {
-    enable = true;
-    github.enable = true;
-    gitlab.enable = true;
-  };
-  go.enable = true;
-  k8s.enable = true;
-  keepassxc.enable = true;
-  music.enable = true;
-  my.dconf.enable = true;
-  my.stylix.enable = true;
-  nvim.enable = true;
-  pandoc.enable = true;
-  shell.enable = true;
-  taskwarrior.enable = true;
-  terminal.enable = true;
-  infra.enable = true;
-  nodejs.enable = true;
-  secrets.enable = true;
-  secrets.vault.enable = true;
-  ticketing.enable = true;
-  vscode.enable = true;
-
-  services.home-manager.autoUpgrade = {
-    enable = true;
-    frequency = "weekly";
-  };
-
   programs = {
+    # editorconfig.enable = true;
+    firefox = import ../../modules/firefox.nix {
+      inherit inputs;
+      inherit pkgs;
+      inherit config;
+    };
     gh.enable = true;
+    keepassxc = import ../../modules/keepassxc.nix;
     kubecolor.enable = true;
   };
 
-  home.packages =
-    import ./packages.nix {
-      inherit inputs;
-      inherit config;
-      inherit pkgs;
-    }
-    ++ import ../packages.nix {
+  home.packages = import ./packages.nix {
     inherit inputs;
     inherit config;
     inherit pkgs;

home/hosts/work/packages.nix

@@ -13,4 +13,7 @@ let
       [ ];
 in
 
-localPackages
+(with pkgs; [
+  inputs.nvim.packages.x86_64-linux.nvim
+])
+++ localPackages

home/modules/3d/default.nix

@@ -1,32 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.modules."3d";
-in
-{
-  options.modules."3d" = {
-    printing.enable = lib.mkEnableOption "3D printing tools";
-    modeling.enable = lib.mkEnableOption "3D modeling tools";
-  };
-
-  config = lib.mkMerge [
-    (lib.mkIf cfg.printing.enable {
-      home.packages = with pkgs; [
-        bambu-studio
-        orca-slicer
-      ];
-    })
-    (lib.mkIf cfg.modeling.enable {
-      home.packages = with pkgs; [
-        blender
-        openscad-lsp
-        openscad-unstable
-      ];
-    })
-  ];
-}

home/modules/ai-tools/claude-code.nix

@@ -1,60 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.ai-tools.claude-code;
-  rtk-version = "0.18.1";
-in
-{
-  options.ai-tools.claude-code.enable = lib.mkEnableOption "claude code with rtk and ccline";
-
-  config = lib.mkIf cfg.enable {
-    programs.claude-code.enable = true;
-
-    home.packages = with pkgs; [
-      (stdenv.mkDerivation {
-        name = "ccline";
-        src = fetchurl {
-          url = "https://github.com/Haleclipse/CCometixLine/releases/download/v1.0.8/ccline-linux-x64.tar.gz";
-          hash = "sha256-Joe3Dd6uSMGi66QT6xr2oY/Tz8rA5RuKa6ckBVJIzI0=";
-        };
-        unpackPhase = "tar xzf $src";
-        installPhase = ''
-          mkdir -p $out/bin
-          cp ccline $out/bin/
-          chmod +x $out/bin/ccline
-        '';
-        meta = {
-          description = "CCometixLine Linux x64 CLI (Claude Code statusline)";
-          homepage = "https://github.com/Haleclipse/CCometixLine";
-          license = lib.licenses.mit;
-          platforms = [ "x86_64-linux" ];
-        };
-      })
-      (stdenv.mkDerivation {
-        name = "rtk-${rtk-version}";
-        version = rtk-version;
-        src = fetchurl {
-          url = "https://github.com/rtk-ai/rtk/releases/download/v${rtk-version}/rtk-x86_64-unknown-linux-gnu.tar.gz";
-          hash = "sha256-XoTia5K8b00OzcKYCufwx8ApkAS31DxUCpGSU0jFs2Q=";
-        };
-        unpackPhase = "tar xzf $src";
-        installPhase = ''
-          mkdir -p $out/bin
-          cp rtk $out/bin/
-          chmod +x $out/bin/rtk
-        '';
-        meta = {
-          description = "RTK - AI coding tool enhancer";
-          homepage = "https://www.rtk-ai.app";
-          license = lib.licenses.mit;
-          platforms = [ "x86_64-linux" ];
-        };
-      })
-      mcp-nixos
-    ];
-  };
-}

home/modules/ai-tools/default.nix

@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./claude-code.nix
-    ./opencode.nix
-    ./skills.nix
-    ./tirith.nix
-  ];
-}

home/modules/ai-tools/opencode.nix

@@ -1,40 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.ai-tools.opencode;
-in
-{
-  options.ai-tools.opencode = {
-    enable = lib.mkEnableOption "opencode";
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = [ pkgs.opencode ];
-
-    home.file.".config/opencode/opencode.json".text = builtins.toJSON {
-      "$schema" = "https://opencode.ai/config.json";
-      permission = {
-        external_directory = {
-          "/run/secrets/" = "deny";
-          "~/.config/sops/age/keys.txt" = "deny";
-          "~/.ssh/id_rsa" = "deny";
-          "~/.ssh/id_ed25519" = "deny";
-          "~/.ssh/id_ecdsa" = "deny";
-          "~/.ssh/id_dsa" = "deny";
-          "/etc/ssh/ssh_host_rsa_key" = "deny";
-          "/etc/ssh/ssh_host_ed25519_key" = "deny";
-          "/etc/ssh/ssh_host_ecdsa_key" = "deny";
-          "/etc/ssh/ssh_host_dsa_key" = "deny";
-        };
-        command = {
-          sops = "deny";
-        };
-      };
-      plugin = [ "@mohak34/opencode-notifier@latest" ];
-    };
-  };
-}

home/modules/ai-tools/skills.nix

@@ -1,49 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.ai-tools.claude-code;
-
-  skillType = lib.types.submodule {
-    options = {
-      owner = lib.mkOption { type = lib.types.str; };
-      repo = lib.mkOption { type = lib.types.str; };
-      rev = lib.mkOption { type = lib.types.str; };
-      hash = lib.mkOption { type = lib.types.str; };
-      skill = lib.mkOption { type = lib.types.str; };
-    };
-  };
-
-  fetchSkill =
-    skill:
-    let
-      src = pkgs.fetchFromGitHub {
-        inherit (skill)
-          owner
-          repo
-          rev
-          hash
-          ;
-      };
-    in
-    {
-      name = ".claude/skills/${skill.skill}";
-      value = {
-        source = "${src}/${skill.skill}";
-        recursive = true;
-      };
-    };
-in
-{
-  options.ai-tools.claude-code.skills = lib.mkOption {
-    type = lib.types.listOf skillType;
-    default = [ ];
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.file = builtins.listToAttrs (map fetchSkill cfg.skills);
-  };
-}

home/modules/ai-tools/tirith-check.py

@@ -1,190 +0,0 @@
-#!/usr/bin/env python3
-"""Claude Code PreToolUse hook — runs tirith check on Bash tool calls.
-
-Reads JSON from stdin (Claude Code hook protocol), extracts the command,
-and delegates to `tirith check --json` for security analysis.
-
-Exit codes:
-  0 — hook completed successfully (decision in stdout JSON)
-  Non-zero — hook error (fail-closed by default; set TIRITH_FAIL_OPEN=1 for fail-open)
-
-Output (stdout, only for deny):
-  {
-    "hookSpecificOutput": {
-      "hookEventName": "PreToolUse",
-      "permissionDecision": "deny",
-      "permissionDecisionReason": "..."
-    }
-  }
-
-Environment:
-  TIRITH_BIN              — path to tirith binary (default: "tirith")
-  TIRITH_HOOK_WARN_ACTION — "deny" (default) or "allow"
-"""
-
-import json
-import os
-import shutil
-import subprocess
-import sys
-
-
-def get(data, *keys):
-    """Return the first matching key from data (supports dual-case fields)."""
-    for k in keys:
-        if k in data:
-            return data[k]
-    return None
-
-
-def deny(reason):
-    """Print a deny decision using hookSpecificOutput and exit 0."""
-    print(
-        json.dumps(
-            {
-                "hookSpecificOutput": {
-                    "hookEventName": "PreToolUse",
-                    "permissionDecision": "deny",
-                    "permissionDecisionReason": reason,
-                }
-            }
-        )
-    )
-    sys.exit(0)
-
-
-def fail_action():
-    """Return the fail action: deny (default, fail-closed) or allow (fail-open via env)."""
-    return "allow" if os.environ.get("TIRITH_FAIL_OPEN") == "1" else "deny"
-
-
-def fail_closed(reason):
-    """Deny or allow based on TIRITH_FAIL_OPEN, for error/missing-binary paths."""
-    action = fail_action()
-    if action == "deny":
-        deny(reason)
-    else:
-        sys.exit(0)
-
-
-def main():
-    try:
-        raw = sys.stdin.read()
-        if not raw.strip():
-            # Empty input — cannot determine command, fail-closed
-            fail_closed("tirith: empty hook input — blocked for safety")
-            return
-        data = json.loads(raw)
-    except (json.JSONDecodeError, OSError):
-        fail_closed("tirith: failed to parse hook input — blocked for safety")
-        return
-
-    if not isinstance(data, dict):
-        fail_closed("tirith: invalid hook input format — blocked for safety")
-        return
-
-    # Dual-case field extraction (camelCase and snake_case)
-    event = get(data, "hook_event_name", "hookEventName")
-    tool = get(data, "tool_name", "toolName")
-    tool_input = get(data, "tool_input", "toolInput") or {}
-
-    # Only intercept PreToolUse + Bash
-    if event != "PreToolUse" or tool != "Bash":
-        sys.exit(0)
-
-    if not isinstance(tool_input, dict):
-        fail_closed("tirith: invalid tool_input format — blocked for safety")
-        return
-
-    command = tool_input.get("command")
-    if not isinstance(command, str) or not command.strip():
-        fail_closed("tirith: no command found in hook input — blocked for safety")
-        return
-
-    # Locate tirith binary
-    tirith_bin = os.environ.get("TIRITH_BIN") or shutil.which("tirith") or "tirith"
-
-    try:
-        result = subprocess.run(
-            [
-                tirith_bin,
-                "check",
-                "--json",
-                "--non-interactive",
-                "--shell",
-                "posix",
-                "--",
-                command,
-            ],
-            capture_output=True,
-            text=True,
-            timeout=10,
-        )
-    except FileNotFoundError:
-        fail_closed(f"tirith: {tirith_bin} not found — install tirith or set TIRITH_FAIL_OPEN=1")
-        return
-    except subprocess.TimeoutExpired:
-        fail_closed("tirith: check timed out — blocked for safety")
-        return
-    except OSError as e:
-        fail_closed(f"tirith: OS error running check — {e}")
-        return
-
-    # Unexpected exit code — fail-closed
-    if result.returncode not in (0, 1, 2):
-        fail_closed(f"tirith: unexpected exit code {result.returncode} — blocked for safety")
-        return
-    if result.returncode != 0 and not result.stdout.strip():
-        fail_closed("tirith: check returned non-zero with no output — blocked for safety")
-        return
-
-    # Exit 0 = clean, allow
-    if result.returncode == 0:
-        sys.exit(0)
-
-    # Exit 2 = warn — check TIRITH_HOOK_WARN_ACTION
-    if result.returncode == 2:
-        warn_action = os.environ.get("TIRITH_HOOK_WARN_ACTION", "deny").lower()
-        if warn_action == "allow":
-            sys.exit(0)
-
-    # Exit 1 = block, Exit 2 + deny = block
-    # Build reason from tirith JSON output
-    reason = "Tirith security check failed"
-    if result.stdout.strip():
-        try:
-            verdict = json.loads(result.stdout)
-            findings = verdict.get("findings", [])
-            if findings:
-                parts = []
-                for f in findings:
-                    title = f.get("title", f.get("rule_id", "unknown"))
-                    severity = f.get("severity", "")
-                    parts.append(f"[{severity}] {title}" if severity else title)
-                reason = "Tirith: " + "; ".join(parts)
-        except json.JSONDecodeError:
-            reason = result.stdout.strip()[:500]
-
-    deny(reason)
-
-
-if __name__ == "__main__":
-    try:
-        main()
-    except Exception:
-        # Fail-closed on unexpected errors (respects TIRITH_FAIL_OPEN)
-        if os.environ.get("TIRITH_FAIL_OPEN") == "1":
-            sys.exit(0)
-        # Deny — print structured output so Claude Code shows a message
-        print(
-            json.dumps(
-                {
-                    "hookSpecificOutput": {
-                        "hookEventName": "PreToolUse",
-                        "permissionDecision": "deny",
-                        "permissionDecisionReason": "tirith: unexpected hook error — blocked for safety",
-                    }
-                }
-            )
-        )
-        sys.exit(0)

home/modules/ai-tools/tirith.nix

@@ -1,30 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.ai-tools.tirith;
-in
-{
-  options.ai-tools.tirith = {
-    enable = lib.mkEnableOption "tirith";
-  };
-
-  config = lib.mkMerge [
-    (lib.mkIf cfg.enable {
-      home.packages = [ pkgs.tirith ];
-    })
-    (lib.mkIf (cfg.enable && config.ai-tools.claude-code.enable) {
-      home.file.".claude/hooks/tirith-check.py" = {
-        source = ./tirith-check.py;
-        executable = true;
-      };
-
-      home.activation.tirith-claude-code = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-        ${pkgs.tirith}/bin/tirith setup claude-code --with-mcp --scope user --force 2>/dev/null || true
-      '';
-    })
-  ];
-}

home/modules/anki.nix

@@ -0,0 +1,6 @@
+{
+  enable = true;
+  # sync = {
+  #   username = config.sops.secrets."email/personal".path;
+  # };
+}

home/modules/anki/default.nix

@@ -1,58 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  myUtils,
-  osConfig ? null,
-  inputs ? null,
-  ...
-}:
-
-let
-  cfg = config.anki;
-  sops = myUtils.sopsAvailability config osConfig;
-  standalone = osConfig == null;
-in
-{
-  options.anki.enable = lib.mkEnableOption "Anki";
-
-  config = lib.mkIf cfg.enable (
-    lib.optionalAttrs standalone {
-      sops.secrets = myUtils.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" {
-        anki = [
-          "sync-user"
-          "sync-key"
-        ];
-      };
-    }
-    // {
-      warnings = lib.optional (
-        !sops.available
-      ) "anki is enabled but sops secrets are not available. anki sync will not be configured.";
-
-      programs.anki = {
-        enable = true;
-        package = config.nixgl.wrap pkgs.anki;
-        addons = with pkgs.ankiAddons; [
-          (anki-connect.withConfig {
-            # https://git.sr.ht/~foosoft/anki-connect/tree/master/item/plugin/config.json
-            config = {
-              apiKey = null;
-              apiLogPath = null;
-              webBindAddress = "127.0.0.1";
-              webBindPort = 8765;
-              webCorsOriginList = [ "http://localhost" ];
-              ignoreOriginList = [ ];
-            };
-          })
-          puppy-reinforcement
-          review-heatmap
-        ];
-        profiles."User 1".sync = lib.mkIf sops.available {
-          usernameFile = "${sops.secrets."anki/sync-user".path}";
-          keyFile = "${sops.secrets."anki/sync-key".path}";
-        };
-      };
-    }
-  );
-}

home/modules/audio/default.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  osConfig,
-  ...
-}:
-
-let
-  cfg = config.audio;
-in
-{
-  options.audio.enable = lib.mkEnableOption "audio";
-
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [ pulsemixer ];
-    services.mpris-proxy.enable = osConfig.hardware.bluetooth.enable or false;
-  };
-}