Lock flake

git-subtree-dir: dots
git-subtree-mainline: 2ad98cde17
git-subtree-split: f64b634dd8

.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

README.md

@@ -1,4 +1,4 @@
-# NixOS flake
+# nixos
 
 ## Set up virtual machine ([`disko`](https://github.com/nix-community/disko/blob/master/docs/interactive-vm.md))
 

deploy/README.md

@@ -1,9 +0,0 @@
-# `colmena` deployments
-
-* tags: `local`, `cloud`
-* deployments can be made from `astyanax` and `andromache` hosts
-
-## References
-
-- [docs: `colmena`](https://colmena.cli.rs/)
-- [repo: `colmena`](https://github.com/zhaofengli/colmena)

deploy/colmena.nix

@@ -1,28 +0,0 @@
-{
-  self,
-  inputs,
-}:
-
-inputs.colmena.lib.makeHive {
-  meta = {
-    nixpkgs = import inputs.nixpkgs {
-      system = "x86_64-linux";
-    };
-
-    nodeNixpkgs = builtins.mapAttrs (_: v: v.pkgs) self.nixosConfigurations;
-    nodeSpecialArgs = builtins.mapAttrs (_: v: v._module.specialArgs or { }) self.nixosConfigurations;
-  };
-
-  astyanax.deployment.tags = [ "local" ];
-
-  andromache.deployment.tags = [ "local" ];
-
-  vm.deployment.tags = [ "local" ];
-
-  hecuba.deployment = {
-    targetHost = "hecuba";
-    targetUser = "username";
-    targetPort = 22;
-    tags = [ "cloud" ];
-  };
-}

dots/.bash_aliases/all

@@ -34,13 +34,10 @@ alias fzfpac="pacman -Slq | fzf -m --preview 'pacman -Si {1}' | xargs -ro sudo p
 alias path='echo -e ${PATH//:/\\n}' # Pretty print path variables
 
 # Programs
-alias h="history"
 alias o="xdg-open"
 alias v="nvim"
-alias vf="fzf --bind 'enter:become(nvim {})'"
 alias g='git'
-alias k="kubectl"
-alias t='task'
+alias t=' task'
 alias tsh='tasksh'
 alias z='zathura --fork'
 alias f='fzf'

dots/.bash_aliases/jira

@@ -0,0 +1,4 @@
+# shellcheck shell=bash
+# vim: set ft=bash :
+
+alias jira-me='jira issue list -a$(jira me)'

dots/.bashrc

@@ -15,6 +15,7 @@
 [ -f "$HOME/.bash_aliases/hosts/$HOSTNAME" ] && . "$HOME/.bash_aliases/hosts/$HOSTNAME"
 [ -f "$HOME/.bash_aliases/private" ] && . "$HOME/.bash_aliases/private"
 [ -f "$HOME/.bash_aliases/lang-js" ] && . "$HOME/.bash_aliases/lang-js"
+command -v jira >/dev/null && [ -f "$HOME/.bash_aliases/jira" ] && . "$HOME/.bash_aliases/jira"
 
 # Completions {{{
 [ -d "$HOME/.bash_completions" ] && for file in "$HOME/.bash_completions"/*; do

dots/.bashrc.d/editor

@@ -4,3 +4,16 @@
 # Set NeoVim as default editor
 export EDITOR=nvim
 export SUDO_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/README.md

@@ -1,6 +1,6 @@
 # Scripts
 
-Mostly tiny helper scripts \& experiments, some more useful than others.
+Mostly tiny helper scripts & experiments, some more useful than others.
 
 ## Setup
 

dots/.bin/dmenu-bluetooth

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+options="Mouse\nHeadphones"
+
+selected="$(echo -e "$options" | dmenu -i)"
+
+case "$selected" in
+  "Mouse")      toggle-bt-device E4:19:21:56:C8:70;;
+  "Headphones") toggle-bt-device 38:18:4C:D4:74:42;;
+esac

dots/.bin/dmenu-read

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# Open pdf by title
+# Note: does not handle incorrect metadata
+
+dir=/home/h/doc/books
+
+ag -g ".pdf$" $dir \
+  | xargs -n1 -d '\n' pdfinfo 2> /dev/null \
+  | grep "Title: " \
+  | awk '{for (i=2; i<NF; i++) printf $i " "; printf $NF; printf "\n"}' \
+  | grep -v "Title:"\
+  | dmenu -i -p "Read:"

dots/.bin/dmenu-spot

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+options="Play\nPause\nNext\nPrevious"
+
+selected=$(echo -e "$options" | dmenu -i)
+
+case "$selected" in
+  "Play") playerctl --player=ncspot play;;
+  "Pause") playerctl --player=ncspot pause;;
+  "Next") playerctl --player=ncspot next;;
+  "Previous") playerctl --player=ncspot previous;;
+esac

dots/.bin/git-cb

@@ -1,110 +1,25 @@
 #!/usr/bin/env bash
-set -euo pipefail
 
-readonly ALLOWED_MAIN_BRANCHES=("main" "master" "develop")
-readonly BRANCH_TYPES=(
-  "feat      For new features"
+types=(
+  "feature   For new features"
+  "bugfix    For bug fixes"
   "hotfix    For urgent fixes"
-  "fix       For fixes"
   "release   For preparing releases"
   "chore     For non-code tasks"
 )
 
-error() {
-  echo "Error: $1" >&2
-  exit 1
-}
+selected=$(printf '%s\n' "${types[@]}" | fzf --prompt="Select branch type: ") || exit 1
+type=${selected%% *}
 
-warn() {
-  echo "Warning: $1" >&2
-}
+echo "Fetching Jira tickets..."
+jira_data=$(jira issue list --assignee=hektor.misplon@rightcrowd.com --order-by=priority --plain --no-headers 2>/dev/null)
 
-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
+if [[ $? -ne 0 || -z "$jira_data" ]]; then
+  echo "Warning: Could not fetch Jira tickets or no tickets found."
+  echo "Proceeding without ticket ID..."
+  ticket_id=""
+else
+  # Create formatted list for fzf: "TICKET-123 - Issue description"
   formatted_tickets=$(echo "$jira_data" | awk '{
     ticket_id = $2
     $1 = $2 = ""
@@ -117,105 +32,59 @@ select_jira_ticket() {
   }')
 
   if [[ -z "$formatted_tickets" ]]; then
-    warn "No tickets to display. Proceeding without ticket ID."
-    return 0
+    echo "No tickets found. Proceeding without ticket ID..."
+    ticket_id=""
+  else
+    # Let user select a ticket or skip
+    echo ""
+    selected_ticket=$(echo -e "SKIP - Create branch without ticket ID\n$formatted_tickets" | \
+      fzf --prompt="Select Jira ticket (or skip): " --height=40%) || exit 1
+
+    if [[ "$selected_ticket" == "SKIP"* ]]; then
+      ticket_id=""
+    else
+      ticket_id=${selected_ticket%% -*}
+    fi
   fi
+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"
+editor="${EDITOR:-vi}"
+tmpfile=$(mktemp)
 
-  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
+if [[ -n "$ticket_id" ]]; then
+  cat > "$tmpfile" << EOF
 # Selected ticket: $ticket_id
-# Enter your branch description below in kebab-case (e.g., my-description):
+# 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.
-
+else
+  cat > "$tmpfile" << 'EOF'
+# Enter your branch description below in kebab case (e.g. `my-description`):
 EOF
-  fi
-  
-  "$editor" "$tmpfile" < /dev/tty > /dev/tty
+fi
 
-  local desc
-  desc=$(grep -v '^#' "$tmpfile" | tr -d '\n' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+"$editor" "$tmpfile"
 
-  echo "$desc"
-}
+desc=$(grep -v '^#' "$tmpfile" | tr -d '\n' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+rm "$tmpfile"
 
-validate_description() {
-  local desc=$1
+if [[ -z "$desc" ]]; then
+  echo "No description provided."
+  exit 1
+fi
 
-  if [[ -z "$desc" ]]; then
-    error "No description provided"
-  fi
+if [[ ! "$desc" =~ ^[a-z0-9]+(-[a-z0-9]+)*$ ]]; then
+  echo "Invalid branch description format."
+  echo "Use lowercase letters, numbers, and hyphens only."
+  echo "No trailing or consecutive hyphens allowed."
+  exit 1
+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
-}
+if [[ -n "$ticket_id" ]]; then
+  branch="$type/$ticket_id-$desc"
+else
+  branch="$type/$desc"
+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 "$@"
+echo "Creating branch: $branch"
+git checkout -b "$branch"

dots/.bin/pomo

@@ -8,23 +8,17 @@ 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"
-)
-
 
 @atexit.register
 def clear():
-    if os.path.exists(POMO_PATH):
-        os.remove(POMO_PATH)
-
+    if os.path.exists('/home/h/.local/share/pomo'):
+        os.remove('/home/h/.local/share/pomo')
 
 def format_mins_secs(mins, secs):
     return f"{mins:02d}:{secs:02d}"
@@ -36,21 +30,24 @@ def make_countdown():
             mins = duration // 60
             secs = duration % 60
             time_str = format_mins_secs(mins, secs)
-            os.system(f'echo -n "{time_str}" > {POMO_PATH}')
+            os.system(f'echo -n "{time_str}" > /home/h/.local/share/pomo')
             sleep(1)
             duration -= 1
-
     return countdown
 
 
 def main(args):
+    prep_duration = args.prep_duration * 60
     work_duration = args.work_duration * 60
     break_duration = args.break_duration * 60
     repeats = args.repeats
 
+    prep_countdown = make_countdown()
     work_countdown = make_countdown()
     break_countdown = make_countdown()
 
+    prep_countdown(prep_duration)
+
     while repeats != 0:
         notification.notify(title="Get started")
         work_countdown(work_duration)
@@ -64,23 +61,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

@@ -22,5 +22,4 @@ restic -r "$RESTIC_REPOSITORY:$HOSTNAME" backup \
   --one-file-system \
   --files-from="$HOME/.resticinclude" \
   --exclude-file="$HOME/.resticexclude" \
-  --exclude-if-present=".nobackup" \
   --verbose=3

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/zk

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 
-current_zettel_path="$ZK_PATH/$(cat "$ZK_PATH/current-zettel.txt")"
-
 if [ "$TERM_PROGRAM" = tmux ]; then
-  cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
+  cd ~/.zk && $EDITOR "$(cat ~/.zk/current-zettel.txt)"
 else
   echo 'Not in tmux'
   echo 'Choose an option:'
@@ -20,12 +18,12 @@ else
       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_PATH && $EDITOR $current_zettel_path" Enter
+        tmux send-keys -t zk:zk "cd ~/.zk && $EDITOR \"\$(cat ~/.zk/current-zettel.txt)\"" Enter
         tmux attach -t zk
       fi
       ;;
     2)
-      cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
+      cd ~/.zk && $EDITOR "$(cat ~/.zk/current-zettel.txt)"
       ;;
     *)
       echo 'Not opening Zettelkasten'

dots/.config/firefox/setup

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+for i in ~/.mozilla/firefox/*.*default*
+  do ln -s "$XDG_CONFIG_HOME"/firefox/user.js "$i/user.js"
+done

dots/.config/firefox/user.js

@@ -0,0 +1,15 @@
+/*
+ * Note: has to be symlinked to profile directories for your
+ *       firefox release
+ *
+ * E.g.
+ *
+ * ```sh
+ * ln -s user.js ~/.mozilla/firefox/*.default-release/user.js
+ * ```
+ * Or check out the `setup` script
+ *
+ */
+
+// Set default download directory
+user_pref("browser.download.dir", "/home/h/dl");

dots/.config/home-manager/flake.lock

@@ -0,0 +1,48 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1756991914,
+        "narHash": "sha256-4ve/3ah5H/SpL2m3qmZ9GU+VinQYp2MN1G7GamimTds=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "b08f8737776f10920c330657bee8b95834b7a70f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1756787288,
+        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

dots/.config/home-manager/flake.nix

@@ -0,0 +1,30 @@
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nixgl.url = "github:nix-community/nixGL";
+  };
+  outputs = { nixpkgs, home-manager, nixgl, ... }:
+    let
+      lib = nixpkgs.lib;
+      system = "x86_64-linux";
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [ nixgl.overlay ];
+        config.allowUnfree = true;
+      };
+    in {
+      homeConfigurations = {
+        work = home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+          extraSpecialArgs = {
+            inherit nixgl;
+          };
+          modules = [ ./hosts/work ];
+        };
+      };
+    };
+}

dots/.config/home-manager/hosts/work/default.nix

@@ -0,0 +1,17 @@
+{ pkgs, config, nixgl, ... }:
+
+{
+  nixGL = {
+    packages = nixgl.packages;
+    defaultWrapper = "mesa";
+  };
+
+  home.username = "hektor";
+  home.homeDirectory = "/home/hektor";
+  home.stateVersion = "25.05";
+
+  home.packages = import ./packages.nix {
+    inherit pkgs;
+    inherit config;
+  };
+}

dots/.config/home-manager/hosts/work/packages.nix

@@ -0,0 +1,3 @@
+{ pkgs, config, ... }:
+
+with pkgs; [ ]

dots/.config/kitty/kitty.conf

@@ -1,167 +1,27 @@
-#: Fonts {{{
+# Fonts
 
 font_family Iosevka Term SS08
-bold_font auto
-italic_font auto
-bold_italic_font auto
-font_size 12.0
-disable_ligatures never
-
-# }}}
-
-#: Cursor {{{
+font_size 24.0
 
+# Cursor
 cursor_shape block
 cursor_blink_interval 0
+shell_integration no-cursor
 
-#: }}}
-
-#: Scrollback {{{
-
-scrollback_lines 8192
-scrollbar scrolled
-scrollback_pager_history_size 1024
-
-#: }}}
-
-#: Mouse {{{
-
-mouse_hide_wait 0.0
-paste_actions quote-urls-at-prompt,confirm
-
-#: }}}
-
-#: Performance tuning {{{
+# Performance tuning
 
 repaint_delay 8
-input_delay 2
 
-#: }}}
+# Transparency
 
-#: Terminal bell {{{
+# dynamic_background_opacity yes
+# background_opacity 0.0
 
-enable_audio_bell yes
-window_alert_on_bell yes
+enable_audio_bell no
 
-#: }}}
+# Scrollback
 
-#: Window layout {{{
+scrollback_lines 16384
+scrollback_pager nvimpager
 
-remember_window_size  no
-remember_window_position no
-enabled_layouts *
-hide_window_decorations yes
-
-#: }}}
-
-#: Tab bar {{{
-
-tab_bar_edge bottom
-tab_bar_style powerline
-tab_bar_min_tabs 1
-tab_powerline_style slanted
-tab_activity_symbol !
-tab_title_template "{index}{fmt.fg.red}{bell_symbol}{fmt.fg.tab}{activity_symbol}:{tab.last_focused_progress_percent}{title}"
-
-#: }}}
-
-#: Advanced {{{
-
-notify_on_cmd_finish unfocused
-
-#: }}}
-
-#: OS specific tweaks {{{
-
-linux_display_server auto
-wayland_enable_ime no
-
-#: }}}
-
-#: Keyboard shortcuts {{{
-
-kitty_mod ctrl+shift
-map kitty_mod+c copy_to_clipboard
-map kitty_mod+v paste_from_clipboard
-map cmd+v
-# map kitty_mod+o pass_selection_to_program
-# map kitty_mod+o pass_selection_to_program firefox
-# map kitty_mod+y new_window less @selection
-map kitty_mod+z scroll_to_prompt -1
-map kitty_mod+x scroll_to_prompt 1
-map kitty_mod+h show_scrollback
-# map f1 launch --stdin-source=@screen_scrollback --stdin-add-formatting --type=overlay less +G -R
-#::  For more details on piping screen and buffer contents to external
-#::  programs, see launch <https://sw.kovidgoyal.net/kitty/launch/>.
-# map kitty_mod+g show_last_command_output
-# map kitty_mod+enter launch --cwd=current
-# map cmd+enter
-# map ctrl+n launch --location=neighbor
-# map ctrl+f launch --location=first
-map kitty_mod+n
-map cmd+n
-map kitty_mod+w
-map shift+cmd+d
-map kitty_mod+]
-map kitty_mod+[
-map kitty_mod+f
-map kitty_mod+b
-map kitty_mod+`
-map kitty_mod+r
-map cmd+r
-map kitty_mod+1
-map cmd+1
-map kitty_mod+2
-map cmd+2
-map kitty_mod+3
-map cmd+3
-map kitty_mod+4
-map cmd+4
-map kitty_mod+5
-map cmd+5
-map kitty_mod+6
-map cmd+6
-map kitty_mod+7
-map cmd+7
-map kitty_mod+8
-map cmd+8
-map kitty_mod+9
-map cmd+9
-map kitty_mod+0
-map f1 goto_tab 1
-map f2 goto_tab 2
-map f3 goto_tab 3
-map f4 goto_tab 4
-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 cmd+t
-map kitty_mod+q
-map cmd+w
-map kitty_mod+.
-map kitty_mod+,
-map kitty_mod+alt+t
-map shift+cmd+i
-map kitty_mod+f1
-map kitty_mod+f11
-map ctrl+cmd+f
-map kitty_mod+f10
-map opt+cmd+s
-map kitty_mod+u    kitten unicode_input
-map ctrl+cmd+space
-map kitty_mod+/ kitty_shell window
-map kitty_mod+f5
-map kitty_mod+r load_config_file
-
-map shift+cmd+/
-map cmd+h
-map opt+cmd+
-map cmd+m
-map cmd+q
-
-#: }}}
-
-include ./themes/zenwritten_dark.conf
-include ./nvim.conf
+include ./themes/zenwritten_light.conf

dots/.config/kitty/nvim.conf

@@ -1,8 +0,0 @@
-allow_remote_control socket-only
-listen_on unix:/tmp/kitty
-shell_integration enabled
-
-action_alias kitty_scrollback_nvim kitten ~/.local/share/nvim/site/pack/paqs/start/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py
-map kitty_mod+h kitty_scrollback_nvim
-map kitty_mod+g kitty_scrollback_nvim --config ksb_builtin_last_cmd_output
-mouse_map ctrl+shift+right press ungrabbed combine : mouse_select_command_output : kitty_scrollback_nvim --config ksb_builtin_last_visited_cmd_output

dots/.config/nvim/README.md

@@ -3,4 +3,4 @@
 My neovim configuration. Available as a Nix flake [^nixcats]. When installing manually,
 `paq.nvim` is used as a fallback plugin manager.
 
-[^nixcats]: Based on [this nixCats `example` template](https://github.com/BirdeeHub/nixCats-nvim/tree/77dffad8235eb77684fcb7599487c8e9f23d5b8f/templates/example)
+[^nixcats] Based on [this nixCats `example` template](https://github.com/BirdeeHub/nixCats-nvim/tree/77dffad8235eb77684fcb7599487c8e9f23d5b8f/templates/example)

dots/.config/nvim/after/plugin/auto-session.lua

@@ -1,3 +0,0 @@
-require("auto-session").setup({
-  auto_session_enabled = vim.env.KITTY_SCROLLBACK_NVIM ~= "true", -- See kitty-scrollback.nvim
-})

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,22 +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 {}
-
-  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

@@ -1,6 +1,6 @@
 require("conform").setup({
-  format_after_save = {
-    lsp_fallback = false,
+  format_on_save = {
+    lsp_fallback = true,
     async = false,
     timeout_ms = 500,
   },
@@ -13,18 +13,16 @@ require("conform").setup({
     gdscript = { "gdformat" },
     haskell = { "ormolu" },
     html = { "prettierd", "prettier", stop_after_first = true },
-    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" },
+    javascript = { "prettierd", "prettier", stop_after_first = true },
+    javascriptreact = { "prettierd", "prettier", stop_after_first = true },
+    json = { "prettierd", "prettier", stop_after_first = true },
+    jsonc = { "prettierd", "prettier", stop_after_first = true },
     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 },
-    -- yaml = { "prettierd", "prettier", stop_after_first = true },
+    svelte = { "prettierd", "prettier", stop_after_first = true },
+    typescript = { "prettierd", "prettier", stop_after_first = true },
+    typescriptreact = { "prettierd", "prettier", stop_after_first = true },
+    yaml = { "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/gitsigns.nvim.lua

@@ -1,12 +1,8 @@
 local gitsigns = require("gitsigns")
 
 gitsigns.setup({
+  current_line_blame_opts = { delay = 0 },
   current_line_blame_formatter = "<author>, <author_time:%R> - <summary>",
-  linehl = true,
-  current_line_blame_opts = {
-    delay = 0,
-    virt_text_pos = "right_align",
-  },
 })
 
 vim.api.nvim_create_user_command("Blame", gitsigns.toggle_current_line_blame, { nargs = "?" })

dots/.config/nvim/after/plugin/kitty-scrollback.nvim.lua

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

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

@@ -1,5 +1,10 @@
 require("neodev").setup() -- should setup before lspconfig
 
+local lspconfig = require("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()
 
@@ -29,62 +34,8 @@ local servers = {
       },
     },
   },
-  lua_ls = {
-    on_init = function(client)
-      if client.workspace_folders then
-        local path = client.workspace_folders[1].name
-        if
-          path ~= vim.fn.stdpath("config")
-          and (vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc"))
-        then
-          return
-        end
-      end
-
-      client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, {
-        runtime = {
-          version = "LuaJIT",
-          path = {
-            "lua/?.lua",
-            "lua/?/init.lua",
-          },
-        },
-        workspace = {
-          checkThirdParty = false,
-          library = {
-            vim.env.VIMRUNTIME,
-          },
-        },
-      })
-    end,
-    settings = {
-      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',
-        },
-      },
-    },
-  },
+  lua_ls = {},
+  -- marksman = {},
   pyright = {},
   -- tsserver = {},
   svelte = {
@@ -152,11 +103,9 @@ local servers = {
 
 for server, config in pairs(servers) do
   config.capabilities = capabilities
-  vim.lsp.config(server, config)
+  lspconfig[server].setup(config)
 end
 
-vim.lsp.enable(vim.tbl_keys(servers))
-
 vim.api.nvim_create_autocmd("LspAttach", {
   callback = function(e)
     local opts = { buffer = e.bufnr }

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

@@ -1,9 +0,0 @@
-require("m_taskwarrior_d").setup()
-
-vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost" }, {
-  group = vim.api.nvim_create_augroup("TWTask", { clear = true }),
-  pattern = "*.md",
-  callback = function()
-    vim.cmd("TWSyncTasks")
-  end,
-})

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

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

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

@@ -1,5 +1,3 @@
-vim.env.ESLINT_D_PPID = vim.fn.getpid()
-
 local eslint_linter = "eslint_d"
 
 require("lint").linters_by_ft = {

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 = {

dots/.config/nvim/after/syntax/pandoc.lua

@@ -1,19 +0,0 @@
-vim.cmd([[
-" Override the pandoc-syntax highlighting colors for more subtle citations
-hi! link pandocPCite Comment
-hi! link pandocICite Comment
-hi! link pandocCiteKey Comment
-hi! link pandocCiteAnchor Comment
-hi! link pandocCiteLocator Comment
-
-" Match cloze delimiters e.g. `{{c1::` and `}}`
-syn match ClozeDelimiter /{{c\d\+::/ conceal containedin=pandocUListItem,pandocListItem
-syn match ClozeDelimiter /}}/ conceal containedin=pandocUListItem,pandocListItem
-" Match text between cloze delimiters
-syn match Cloze /\({{c\d\+::\)\@<=\(\_[A-Za-z0-9$\ \\\-\*,_`()]*\)\(}}\)\@=/ containedin=pandocUListItem,pandocListItem
-
-hi! link ClozeDelimiter Special
-hi! link Cloze Special
-]])
-
-vim.cmd.runtime("syntax/_comment_keywords.lua")

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": 1769578476,
-        "narHash": "sha256-4+KbiBcC6hQ3sh0UbPXjy6TOfLh9yhskRlfPzyZ2FH4=",
+        "lastModified": 1759730664,
+        "narHash": "sha256-boRlBQ/c4CaHsK/z04QL6+t81mcar37Io94HBX2GflY=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "48f8be4bdafccfa19ceaaf08071a15eca36fdb1d",
+        "rev": "77dffad8235eb77684fcb7599487c8e9f23d5b8f",
         "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": 1769740369,
-        "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=",
+        "lastModified": 1760256791,
+        "narHash": "sha256-uTpzDHRASEDeFUuToWSQ46Re8beXyG9dx4W36FQa0/c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a",
+        "rev": "832e3b6db48508ae436c2c7bfc0cf914eac6938e",
         "type": "github"
       },
       "original": {
@@ -103,46 +47,46 @@
         "type": "github"
       }
     },
-    "plugins-helm-ls-nvim": {
+    "plugins-crazy-node-movement": {
       "flake": false,
       "locked": {
-        "lastModified": 1768584652,
-        "narHash": "sha256-jnMc87OjURNcqsva0npYgVyUrWc5C6L7yHpNvt9eSmg=",
-        "owner": "qvalentin",
-        "repo": "helm-ls.nvim",
-        "rev": "f0b9a1723890971a6d84890b50dbf5f40974ea1b",
+        "lastModified": 1693654676,
+        "narHash": "sha256-hQcQEp39zFN2zphMfcr97yRVcuHhBsSkzKO7XNloDpQ=",
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "rev": "d5cf01cc44c5715501d3d6fe439af7c8b7fa5df2",
         "type": "github"
       },
       "original": {
-        "owner": "qvalentin",
-        "repo": "helm-ls.nvim",
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
         "type": "github"
       }
     },
-    "plugins-m-taskwarrior-d-nvim": {
+    "plugins-helm-ls-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1767960157,
-        "narHash": "sha256-ov0qi4LhIlwqrBzSbTJ6APC5qjl2d/vlKWJfW5ZiDrg=",
-        "owner": "huantrinh1802",
-        "repo": "m_taskwarrior_d.nvim",
-        "rev": "107247387cd81823046bc2b8e71150c8edf041d3",
+        "lastModified": 1757598429,
+        "narHash": "sha256-nzuJxAAaEmuVYg9k0B8OKslxsihhg6RKlhz6E7xJTQU=",
+        "owner": "qvalentin",
+        "repo": "helm-ls.nvim",
+        "rev": "f36ecbd3e7b0b2ac8358a9d6a3213888e29943db",
         "type": "github"
       },
       "original": {
-        "owner": "huantrinh1802",
-        "repo": "m_taskwarrior_d.nvim",
+        "owner": "qvalentin",
+        "repo": "helm-ls.nvim",
         "type": "github"
       }
     },
     "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": {
@@ -186,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": {
@@ -201,12 +145,11 @@
     },
     "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-m-taskwarrior-d-nvim": "plugins-m-taskwarrior-d-nvim",
         "plugins-mcphub-nvim": "plugins-mcphub-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
         "plugins-shipwright-nvim": "plugins-shipwright-nvim",

dots/.config/nvim/flake.nix

@@ -2,14 +2,13 @@
   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";
+    plugins-crazy-node-movement = {
+      url = "github:theHamsta/crazy-node-movement";
       flake = false;
     };
     plugins-beancount-nvim = {
@@ -48,11 +47,8 @@
       forEachSystem = utils.eachSystem nixpkgs.lib.platforms.all;
       extra_pkg_config = { };
 
-      mkDependencyOverlays = system: [
+      dependencyOverlays = [
         (utils.standardPluginOverlay inputs)
-        (final: prev: {
-          mcp-hub = inputs.mcp-hub.packages.${system}.default;
-        })
       ];
 
       categoryDefinitions =
@@ -63,63 +59,12 @@
         {
           lspsAndRuntimeDeps = with pkgs; {
             general = [
-              black
-              clang
-              clang-tools
-              delta
-              emmet-language-server
-              eslint_d
-              fd
-              gawk
-              gdtoolkit_4
-              hadolint
-              helm-ls
-              isort
-              lua-language-server
-              mcp-hub
-              nixd
-              nixfmt
-              nodePackages.prettier
-              nodePackages.typescript-language-server
-              ormolu
-              prettierd
-              rust-analyzer
-              rustfmt
-              shellcheck-minimal
-              stylelint
-              stylua
               tree-sitter
-              vscode-langservers-extracted
-              vtsls
-              yaml-language-server
-              yamllint
             ];
           };
 
           startupPlugins = {
             general = with pkgs.vimPlugins; [
-              ## plug
-              vim-plug
-              vim-sandwich
-              context_filetype-vim
-              editorconfig-vim
-              vim-snippets
-              unicode-vim
-              vim-css-color
-              quarto-nvim
-              vimtex
-              wiki-vim
-              vim-pandoc
-              vim-pandoc-syntax
-              # TODO: ferrine/md-img-paste.vim
-              # TODO: supercollider/scvim
-              # TODO: tidalcycles/vim-tidal
-              vim-glsl
-              # TODO: timtro/glslView-nvim
-              # TODO: sirtaj/vim-openscad
-              jupytext-nvim
-              vim-openscad
-              ## paq
               eyeliner-nvim
               fzf-lua
               ltex_extra-nvim
@@ -142,6 +87,7 @@
               pkgs.neovimPlugins.shipwright-nvim
               lush-nvim
               zenbones-nvim
+              pkgs.neovimPlugins.crazy-node-movement
               nvim-treesitter.withAllGrammars
               nvim-treesitter-textobjects
               # nvim-treesitter-context
@@ -161,11 +107,6 @@
               copilot-lua
               copilot-cmp
               pkgs.neovimPlugins.helm-ls-nvim
-              kitty-scrollback-nvim
-              fidget-nvim
-              rustaceanvim
-              pkgs.neovimPlugins.m-taskwarrior-d-nvim
-              claude-code-nvim
             ];
           };
 
@@ -182,17 +123,19 @@
         };
 
       packageDefinitions = {
-        nvim = _: {
-          settings = {
-            suffix-path = true;
-            suffix-LD = true;
-            wrapRc = true;
-            aliases = [ "vim" ];
+        nvim =
+          { ... }:
+          {
+            settings = {
+              suffix-path = true;
+              suffix-LD = true;
+              wrapRc = true;
+              aliases = [ "vim" ];
+            };
+            categories = {
+              general = true;
+            };
           };
-          categories = {
-            general = true;
-          };
-        };
       };
       defaultPackageName = "nvim";
     in
@@ -200,7 +143,6 @@
     forEachSystem (
       system:
       let
-        dependencyOverlays = mkDependencyOverlays system;
         nixCatsBuilder = utils.baseBuilder luaPath {
           inherit
             nixpkgs
@@ -220,7 +162,7 @@
             name = defaultPackageName;
             packages = [ defaultPackage ];
             inputsFrom = [ ];
-            shellHook = "";
+            shellHook = '''';
           };
         };
 
@@ -232,32 +174,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/javascript.lua

@@ -1 +0,0 @@
-vim.opt.matchpairs:append("=:;")

dots/.config/nvim/ftplugin/pandoc.lua

@@ -0,0 +1,15 @@
+-- NOTE: May want to move this, as it is more specific to wiki than to pandoc
+vim.api.nvim_create_user_command("AnkiDeck", function()
+  local handle = io.popen("get-anki-decks")
+  local decks = {}
+  for line in handle:lines() do
+    table.insert(decks, line)
+  end
+  handle:close()
+
+  vim.ui.select(decks, { prompt = "Select Anki deck" }, function(choice)
+    if choice then
+      vim.api.nvim_put({ choice }, "", true, true)
+    end
+  end)
+end, {})

dots/.config/nvim/init.lua

@@ -1,23 +1,12 @@
 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" })
-
-require("base")
-require("cursor")
-require("fold")
-require("netrw")
+require("vim")
 require("ftdetect")
-require("plug")
-require("pandoc")
 require("keymaps")
 require("highlight")
-require("paq-setup")
-require("statusline")
 require("diagnostic")
-require("utils")
-require("zk")
-require("reload")
 
-vim.opt.background = "dark"
-vim.opt.laststatus = 3
+require("paq-setup") -- when not on nixCats
+
+-- vim.opt.background = "dark"
+-- vim.opt.laststatus = 3

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

@@ -7,7 +7,5 @@ vim.filetype.add({
     [".*/%.vscode/.*%.json"] = "jsonc",
     [".*/%.ssh/config%.d/.*"] = "sshconfig",
     ["%.env.*"] = "dotenv",
-    ["%.pl$"] = "prolog",
-    [".*.containerfile.*"] = "dockerfile",
   },
 })

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

@@ -1,50 +1,3 @@
-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
 
 set("n", "<leader>cx", "<cmd>!chmod +x %<CR>", { silent = true, desc = "Run `chmod +x` on current file" })

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

@@ -42,6 +42,4 @@ require("nixCatsUtils.catPacker").setup({
   { "zbirenbaum/copilot.lua" },
   { "zbirenbaum/copilot-cmp" },
   { "qvalentin/helm-ls.nvim", ft = "helm" },
-  { "mikesmithgh/kitty-scrollback.nvim" },
-  { "greggh/claude-code.nvim" },
 })

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

@@ -1,35 +0,0 @@
-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

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

dots/.config/nvim/lua/vim.lua

@@ -0,0 +1,5 @@
+vim.cmd([[
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
+source ~/.vimrc"
+]])

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

@@ -1,49 +0,0 @@
-local cmp = require("cmp")
-
-local source = {}
-
-local function get_markdown_files(base)
-  local items = {}
-  local pattern = base .. "/**/*.md"
-  local files = vim.fn.glob(pattern, false, true)
-  for _, file in ipairs(files) do
-    local label = file:gsub("^%./", ""):gsub("%.md$", "")
-    table.insert(items, { label = label })
-  end
-  return items
-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 ""
-
-  local trigger = cursor_before_line:match("%[[^%]]*%]%(([^)]*)$")
-
-  if trigger ~= nil then
-    local items = get_markdown_files(".")
-    local next_char = cursor_after_line:sub(1, 1)
-
-    for _, item in ipairs(items) do
-      if next_char == ")" then
-        item.insertText = item.label
-      else
-        item.insertText = item.label .. ")"
-      end
-    end
-
-    callback(items)
-  else
-    callback({})
-  end
-end
-
-function source:get_trigger_characters()
-  return { "(" }
-end
-
-function source:is_available()
-  local ft = vim.bo.filetype
-  return ft == "markdown" or ft == "pandoc"
-end
-
-cmp.register_source("zk", source)

dots/.config/nvim/skeletons/flake.nix

@@ -1,10 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-  };
-
-  outputs =
-    { self, nixpkgs }:
-    {
-    };
-}

dots/.config/nvim/skeletons/shell.nix

@@ -1,4 +0,0 @@
-{
-  pkgs ? import <nixpkgs> { },
-}:
-pkgs.mkShell { nativeBuildInputs = with pkgs.buildPackages; [ ]; }

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

@@ -27,7 +27,7 @@ return {
     t("flex-wrap: wrap;"),
     i(0),
   }),
-  s({ trig = "dfc", dscr = "Add 'flex-direction: column;'" }, {
+  s({ trig = "dfc", dscr = "Display flex column" }, {
     t("display: flex;"),
     t("flex-direction: column;"),
     i(0),

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

@@ -1,12 +0,0 @@
-local ls = require("luasnip")
-local s = ls.snippet
-local t = ls.text_node
-local i = ls.insert_node
-
-return {
-  s({ trig = "^M.", regTrig = true, snippetType = "autosnippet" }, {
-    t("local M = {"),
-    i(1),
-    t({ "}", "", "", "return M" }),
-  }),
-}

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

@@ -5,905 +5,6 @@ local d = ls.dynamic_node
 local sn = ls.snippet_node
 local fmta = require("luasnip.extras.fmt").fmta
 
--- Original .snippets file - TODO: Migrate to lua snippets
--- ```viml
--- global !p
--- from datetime import datetime
--- from math import factorial
--- import subprocess
--- import re
--- import sys
---
--- ZOTERO_BASE = "http://127.0.0.1:23119/better-bibtex/cayw"
--- FENCES = {
--- 	"i": "idea",
--- 	"q": "question",
--- 	"n": "note",
--- 	"t": "thought",
--- }
---
--- def math_inline():
--- 	return vim.command_output('GetContext') == 'math_inline'
---
--- def math_block():
--- 	return vim.command_output('GetContext') == 'math_block'
---
--- def math():
--- 	return math_inline() or math_block()
---
--- def code_block():
--- 	return vim.command_output('GetContext') == 'pandocDelimitedCodeBlock'
---
--- def code_inline():
--- 	return vim.command_output('GetContext') == 'pandocNoFormatted'
---
--- def code():
--- 	return code_inline() or code_block()
---
--- def slugify(text):
--- 	return re.sub('\s+', '-', text.lower())
---
--- def linkify(text, link):
--- 	return f"[{text}]({link})"
---
--- def zot(action):
--- 		if action == "get_title":
--- 			cmd = f"curl -s '{ZOTERO_BASE}?format=json&selected=1' | jq '.[].title' -r"
--- 		elif action == "get_citekey":
--- 			cmd = f"curl -s '{ZOTERO_BASE}?format=pandoc&selected=1'"
--- 		elif action == "get_citekey_brackets":
--- 			cmd = f"curl -s '{ZOTERO_BASE}?format=pandoc&selected=1&brackets=1'"
--- 		elif action == "get_link":
--- 			link_path = re.sub("^@", "", zot("get_citekey"))
--- 			link_title = zot("get_title")
--- 			link = linkify(link_title, link_path)
--- 			return link
--- 		elif action == "get_file":
--- 			link_path = re.sub("^@", "", zot("get_citekey"))
--- 			link_title = zot("get_title")
--- 			link = linkify(link_title, f"file://{link_path}.pdf")
--- 			return link
--- 		else:
--- 			return "Zotero action not found"
--- 		return subprocess.check_output(cmd, shell=True).decode("utf-8").strip()
--- endglobal
---
--- snippet ctx "Context" i
--- `!p snip.rv = vim.command_output('GetContext')`
--- endsnippet
---
--- # General markdown
---
--- snippet ^h "Markdown header" r
--- # $1
--- endsnippet
---
--- snippet ^sec "Markdown section" r
--- ## $1
--- endsnippet
---
--- snippet ^ssec "Markdown subsection" r
--- ### $1
--- endsnippet
---
--- snippet ^sex "Markdown example section" r
--- ## Example: $1
--- endsnippet
---
--- snippet ^ssex "Markdown example subsection" r
--- ### Example: $1
--- endsnippet
---
--- # Zettelkasten templating
---
--- snippet nl
--- *nld*: $1
--- endsnippet
---
--- snippet eng
--- *eng*: $1
--- endsnippet
---
--- snippet fr
--- *fra*: $1
--- endsnippet
---
--- snippet (de
--- *deu*: $1
--- endsnippet
---
--- snippet (nl
--- (*nld*: $1)
--- endsnippet
---
--- snippet (eng
--- (*eng*: $1)
--- endsnippet
---
--- snippet (fr
--- (*fra*: $1)
--- endsnippet
---
--- snippet (de
--- (*deu*: $1)
--- endsnippet
---
--- snippet in
--- (In [$1]($2))$3
--- endsnippet
---
--- snippet liwhat "What?" A
--- `!p snip.rv = "* [What?](" + snip.basename + "_what)"`$1
--- endsnippet
---
--- snippet liwhy "Why?" A
--- `!p snip.rv = "* [Why?](" + snip.basename + "_why)"`$1
--- endsnippet
---
--- snippet < "Comment (html)"
--- <!-- $1 -->$2
--- endsnippet
---
--- snippet <. "Comment (html) ..." i
--- <!-- ... -->$1
--- endsnippet
---
--- snippet <t "Thought (html)" i
--- <!--:::thought
--- $1
--- :::-->
--- endsnippet
---
--- snippet <q "Question (html)" i
--- <!--:::question
--- $1
--- :::-->
--- endsnippet
---
--- snippet <i "Idea (html)" i
--- <!--:::idea
--- $1
--- :::-->
--- endsnippet
---
--- snippet <n "Note (html)" i
--- <!--:::note
--- $1
--- :::-->
--- endsnippet
---
--- snippet td "Todo"
--- TODO${1:: $2}
--- endsnippet
---
--- snippet ref "References"
--- <!--references-->
--- endsnippet
---
--- snippet sort "Sort"
--- <!--sort-->
--- endsnippet
---
--- snippet foot "Footnotes"
--- <!--footnotes-->
--- [^0]:
--- endsnippet
---
--- snippet def "Definition"
--- **Definition${1:: $2}**${3: [${4:citation}${5:, ${6:pointer}}]}
---
--- $7
---
--- ___
--- endsnippet
---
--- snippet theo "Theorem"
--- **Theorem${1:: $2}**${3: [${4:citation}${5:, ${6:pointer}}]}
---
--- $7
---
--- ${8/(\w+).*/**Theorem** \n\n.../}
---
--- ___
--- endsnippet
---
--- snippet prop "Property"
--- **Property $1** [@]
---
--- $2
---
--- ___
--- endsnippet
---
--- snippet lemm "Lemma"
--- **Lemma $1** [@]
---
--- $2
---
--- ___
--- endsnippet
---
--- snippet coro "Corollary"
--- **Corollary $1** [@]
---
--- $2
---
--- ___
--- endsnippet
---
--- # Greek symbols
---
--- context "math()"
--- snippet alpha "Alpha"
--- \\alpha
--- endsnippet
---
--- context "math()"
--- snippet beta "Beta"
--- \\beta
--- endsnippet
---
--- context "math()"
--- snippet gamma "Gamma"
--- \\gamma
--- endsnippet
---
--- context "math()"
--- snippet delta "Delta"
--- \\delta
--- endsnippet
---
--- context "math()"
--- snippet epsilon "Epsilon"
--- \\epsilonilon
--- endsnippet
---
--- context "math()"
--- snippet zeta "Zeta"
--- \\zeta
--- endsnippet
---
--- context "math()"
--- snippet eta "Eta"
--- \\eta
--- endsnippet
---
--- context "math()"
--- snippet theta "Theta"
--- \\theta
--- endsnippet
---
--- context "math()"
--- snippet iota "Iota"
--- \\iota
--- endsnippet
---
--- context "math()"
--- snippet kappa "Kappa"
--- \\kappa
--- endsnippet
---
--- context "math()"
--- snippet lambda "Lambda" i
--- \\lambda
--- endsnippet
---
--- context "math()"
--- snippet mu "Mu"
--- \\mu
--- endsnippet
---
--- context "math()"
--- snippet nu "Nu"
--- \\nu
--- endsnippet
---
--- context "math()"
--- snippet xi "Xi"
--- \\xi
--- endsnippet
---
--- context "math()"
--- snippet omicron "Omicron"
--- \\omicron
--- endsnippet
---
--- context "math()"
--- snippet pi "Pi"
--- \\pi
--- endsnippet
---
--- context "math()"
--- snippet rho "Rho"
--- \\rho
--- endsnippet
---
--- context "math()"
--- snippet sigma "Sigma"
--- \\sigma
--- endsnippet
---
--- context "math()"
--- snippet tau "Tau"
--- \\tau
--- endsnippet
---
--- context "math()"
--- snippet upsilon "Upsilon"
--- \\upsilon
--- endsnippet
---
--- context "math()"
--- snippet phi "Phi"
--- \\phi
--- endsnippet
---
--- context "math()"
--- snippet chi "Chi"
--- \\chi
--- endsnippet
---
--- context "math()"
--- snippet psi "Psi"
--- \\psi
--- endsnippet
---
--- context "math()"
--- snippet omega "Omega"
--- \\omega
--- endsnippet
---
--- context "math()"
--- snippet Gamma "Gamma"
--- \\Gamma
--- endsnippet
---
--- context "math()"
--- snippet Delta "Delta"
--- \\Delta
--- endsnippet
---
--- context "math()"
--- snippet Theta "Theta"
--- \\Theta
--- endsnippet
---
--- context "math()"
--- snippet Lambda "Lambda"
--- \\Lambda
--- endsnippet
---
--- context "math()"
--- snippet Xi "Xi"
--- \\Xi
--- endsnippet
---
--- context "math()"
--- snippet Pi "Pi"
--- \\Pi
--- endsnippet
---
--- context "math()"
--- snippet Sigma "Sigma"
--- \\Sigma
--- endsnippet
---
--- context "math()"
--- snippet Upsilon "Upsilon"
--- \\Upsilon
--- endsnippet
---
--- context "math()"
--- snippet Phi "Phi"
--- \\Phi
--- endsnippet
---
--- context "math()"
--- snippet Psi "Psi"
--- \\Psi
--- endsnippet
---
--- context "math()"
--- snippet Omega "Omega"
--- \\Omega
--- endsnippet
---
--- snippet asaw "Als en slechts als (woorden)" i
--- als en slechts als
--- endsnippet
---
--- snippet iffw "If and only if (words)" i
--- if and only if
--- endsnippet
---
--- snippet asas "Als en slechts als (shorthand)" i
--- **asa**
--- endsnippet
---
--- snippet iffs "If and only if (shorthand)" i
--- **iff**
--- endsnippet
---
--- snippet beg "Begin"
--- \begin{$1}
--- $2
--- \end{$1}
--- endsnippet
---
--- snippet align "" i
--- \begin{align}
--- $1
--- \end{align}
--- endsnippet
---
--- snippet cases "" i
--- \begin{cases}
--- $1 \\\\
--- $2
--- \end{cases}
--- $3
--- endsnippet
---
--- snippet tik "Tikzpicture" i
--- \begin{tikzpicture}
--- $1
--- \end{tikzpicture}
--- endsnippet
---
--- snippet matrix "Matrix" i
--- \begin{bmatrix}
--- $1
--- \end{bmatrix}
--- endsnippet
---
--- # Insert anything after m/M in math mode
---
--- snippet "(\b)m(.*)" "MathJax" r
--- `!p snip.rv = match.group(1) + "$" + match.group(2) + "$"`
--- endsnippet
---
--- snippet (\b)M(.*) "MathJax block" irw
--- $$
--- `!p snip.rv = match.group(2)`
--- $$
--- endsnippet
---
--- # Calligraphic letters
---
--- context "math()"
--- snippet c([A-z]) "Calligraphic A" r
--- `!p snip.rv = "\\mathcal{" + match.group(1) + "}"`$1
--- endsnippet
---
--- # Subscripts
---
--- context "math()"
--- snippet '([A-z])(\w+)' "Subscripts" irw
--- `!p snip.rv = match.group(1) + '_' + match.group(2) if len(match.group(2)) == 1 else match.group(1) + '_{' + match.group(2) + '}'`$1
--- endsnippet
---
--- # MathJax
---
--- snippet fa "For all" i
--- \forall
--- endsnippet
---
--- snippet frac "" i
--- \frac{$1}{$2}$3
--- endsnippet
---
--- snippet set "" i
--- \\{$1\\}$2
--- endsnippet
---
--- snippet N "" i
--- \mathbb{N}
--- endsnippet
---
--- snippet N0 "" i
--- \mathbb{N}_0
--- endsnippet
---
--- snippet N+ "" i
--- \mathbb{N}^+
--- endsnippet
---
--- snippet Z "" i
--- \mathbb{Z}
--- endsnippet
---
--- snippet Z0 "" i
--- \mathbb{Z}_0
--- endsnippet
---
--- snippet Z+ "" i
--- \mathbb{Z}^+
--- endsnippet
---
--- snippet R "" i
--- \mathbb{R}
--- endsnippet
---
--- snippet R0 "" i
--- \mathbb{R}_0
--- endsnippet
---
--- snippet R+ "" i
--- \mathbb{R}^+
--- endsnippet
---
--- snippet C "" i
--- \mathbb{C}
--- endsnippet
---
--- snippet lim "" i
--- \lim_{$1}$2
--- endsnippet
---
--- snippet limn "" i
--- \lim_{n \to \infty}$2
--- endsnippet
---
--- snippet binom "" i
--- \binom{$1}{$2}$3
--- endsnippet
---
--- snippet andmath "description" i
--- \text{ and }
--- endsnippet
---
--- snippet enmath "description" i
--- \text{ en }
--- endsnippet
---
--- snippet lra "MathJax: long right arrow" i
--- \longrightarrow
--- endsnippet
---
--- snippet Ra "MathJax: right arrow" i
--- \Rightarrow
--- endsnippet
---
--- snippet Im "MathJax: image operator" i
--- \operatorname{Im}
--- endsnippet
---
--- snippet ggd "Grootste gemene deler" i
--- \operatorname{ggd}
--- endsnippet
---
--- snippet fl "Floating point" i
--- \operatorname{fl}
--- endsnippet
---
--- snippet Var "Variance" i
--- \operatorname{Var}
--- endsnippet
---
--- snippet E "Expectation" i
--- \operatorname{E}
--- endsnippet
---
--- snippet Cov "Covariance" i
--- \operatorname{Cov}
--- endsnippet
---
--- context "math()" i
--- snippet ntup "Alpha"
--- (x_1, \ldots, x_n)
--- endsnippet
---
--- snippet mxn "Matrix" i
--- m \times n
--- endsnippet
---
--- snippet mxn- "Matrix" i
--- $m \times n$-matrix
--- endsnippet
---
--- snippet nxn "Matrix" i
--- n \times n
--- endsnippet
---
--- snippet det "Determinant" i
--- \operatorname{det}(${1:A})$2
--- endsnippet
---
--- snippet det| "Determinant alternative notation" i
--- |${1:A}|$2
--- endsnippet
---
--- snippet Span "Span" i
--- \operatorname{Span}\\{$1\\}$2
--- endsnippet
---
--- snippet Nul "Null" i
--- \operatorname{Nul}($1)$2
--- endsnippet
---
--- snippet Col "Column space" i
--- \operatorname{Col}($1)$2
--- endsnippet
---
--- snippet kern "Kernel" i
--- \operatorname{kern}($1)$2
--- endsnippet
---
--- context "math()"
--- snippet vec "Vector" i
--- \mathbf{$1}$2
--- endsnippet
---
--- context "math()"
--- snippet vec([A-z]) "Vector ..." r
--- `!p snip.rv = "\\mathbf{" + match.group(1) + "}"`$1
--- endsnippet
---
--- snippet v1tovp "Vectors v indexed from 1 to p"
--- \mathbf{v_1},...,\mathbf{v_p}$2
--- endsnippet
---
--- snippet a1toan "Vectors a indexed from 1 to n"
--- \mathbf{a_1},...,\mathbf{v_n}$2
--- endsnippet
---
--- snippet .. "Dot dot dot" i
--- \dots $1
--- endsnippet
---
--- snippet text "MathJax text" i
--- \text{$1}$2
--- endsnippet
---
--- snippet leq "Less than or equal to" i
--- \leq
--- endsnippet
---
--- snippet leq "Greater than or equal to" i
--- \geq
--- endsnippet
---
--- snippet eat "Evaluated at" i
--- {\biggr\rvert}_{$1}$2
--- endsnippet
---
--- snippet sketch "Link a sketch" i
--- [$1](file:///home/h/sketches/$2)
--- endsnippet
---
--- snippet deck "Get anki deck"
--- `get-anki-decks`
--- endsnippet
---
--- # snippet ` "Inline code" i
--- # `$1`
--- # endsnippet
---
--- # Escape backticks
--- snippet `` "Code block" bA
--- \`\`\`$1
--- $2
--- \`\`\`
--- endsnippet
---
--- snippet `tex "Latex block (see latex filter)" bA
--- \`\`\`{.tex}
--- $1
--- \`\`\`
--- endsnippet
---
--- snippet `tik "Tikz block (see tikz filter)" bA
--- \`\`\`{.tex}
--- \\begin{tikzpicture}
--- $1
--- \\end{tikzpicture}
--- \`\`\`
--- endsnippet
---
--- snippet "(\b)fn(\d+)" "" ir
--- `!p snip.rv = snip.basename + "_" + match.group(2).zfill(2)`$1
--- endsnippet
---
--- snippet "ch(\d+)" "Link chapter" ir
--- `!p
--- num_str = match.group(1).zfill(2)
--- title = 3*"."
--- link = snip.basename + "_" + num_str
--- snip.rv = num_str + ". " + linkify(title, link)
--- `
--- endsnippet
---
--- snippet "ch(\d+)to(\d+)" "Link chapters ... to ..." irA
--- `!p
--- for i in range(int(match.group(1)), int(match.group(2)) + 1):
--- 	num_str = str(i).zfill(2)
--- 	title = 3*"."
--- 	link = snip.basename + "_" + num_str
--- 	snip.rv += num_str + ". " + linkify(title, link) + "\n"
--- `
--- endsnippet
---
--- snippet "sec([\sA-z]+)" "Link section titled ..." r
--- `!p
--- snip.rv = "* " + linkify(match.group(1), f"{snip.basename}_{slugify(match.group(1))}")
--- `
--- endsnippet
---
--- snippet cp(\d+) "Comment current page (and date)" r
--- `!p snip.rv = "<!--" + datetime.now().strftime("%Y-%m-%d") + " p. " + match.group(1) + "-->"`
--- endsnippet
---
--- snippet (\d+)! "Factorial of ..." r
--- `!p snip.rv = factorial(int(match.group(1)))`
--- endsnippet
---
--- snippet d "Date"
--- `!p snip.rv = datetime.now().strftime("%Y-%m-%d")`
--- endsnippet
---
--- snippet :(\w*) "Fence" r
--- `!p snip.rv += ":::" + FENCES.get(match.group(1) or "", "") + "\n" `$1
--- `!p snip.rv += ":::"`$2
--- endsnippet
---
--- snippet \[(\w*) "Fence inline" ir
--- `!p snip.rv += "["`$1`!p snip.rv += "]{." + FENCES.get(match.group(1) or "", "") + "}"`$2
--- endsnippet
---
--- snippet ^eg "Example" r
--- E.g. $1
--- endsnippet
---
--- # E.g. after list (or list preceded by space)
--- snippet (\*\s|\*)eg "Example" r
--- * E.g. $1
--- endsnippet
---
--- # E.g. after dot (or dot preceded by space)
--- snippet (\.\s|\.)eg "Example" r
--- . E.g. $1
--- endsnippet
---
--- snippet (?<!^|\*\s|\*|\.\s|\.)eg "Example" r
--- e.g. $1
--- endsnippet
---
--- # Zettelkasten to Anki
---
--- snippet td "TARGET DECK: <Deck name>"
--- TARGET DECK: $1::$2
--- endsnippet
---
--- snippet clo "Cloze"
--- START
--- Cloze
--- ${0:${VISUAL}}$1
--- END
--- $2
--- endsnippet
---
--- snippet clos "Cloze start"
--- START
--- Cloze
--- $1
--- endsnippet
---
--- snippet cloe "Cloze end"
--- END
--- endsnippet
---
--- snippet clod
--- START
--- Cloze
--- **Definition$1**
---
--- $2
--- END
--- endsnippet
---
--- snippet clop
--- START
--- Cloze
--- **Property$1**
---
--- $2
--- END
--- endsnippet
---
--- snippet clot
--- START
--- Cloze
--- **Theorem$1**
---
--- $2
--- END
--- endsnippet
---
--- snippet clol
--- START
--- Cloze
--- **Lemma$1**
---
--- $2
--- END
--- endsnippet
---
--- snippet "c(\d+)" "Cloze <number>" r
--- {{c`!p snip.rv = int(match.group(1))`::${0:${VISUAL}}$1}}$2
--- endsnippet
---
--- # Match preceded by whitespace or start of line
--- snippet (?<!\S)z($|t|l|z|o|\.) "Zotero" r
--- `!p
---
--- ACTIONS = {
--- 	"": "get_citekey",
--- 	"t": "get_title",
--- 	"l": "get_link",
--- 	"z": "get_citekey_brackets",
--- 	"o": "get_file",
--- }
---
--- snip.rv = zot(ACTIONS.get(match.group(1)))
--- `
--- endsnippet
---
--- snippet zq "Zotero quote" r
--- `!p snip.rv = '>\n> --' + zot("get_citekey_brackets")`
--- endsnippet
---
--- snippet acz "According to ..."
--- `!p snip.rv = "According to " + zot("get_citekey")`
--- endsnippet
---
--- snippet azex "As ... explains"
--- `!p snip.rv = "As " + zot("get_citekey") + " explains, "`
--- endsnippet
---
--- snippet iz "In ..."
--- `!p snip.rv = "In " + zot("get_citekey")`
--- endsnippet
---
--- snippet izd "In ...'s definition"
--- `!p snip.rv = "In " + zot("get_citekey") + "'s definition, "`
--- endsnippet
---
--- snippet zintends "... intends to ..." A
--- `!p snip.rv = zot("get_citekey") + " intends to "`
--- endsnippet
---
--- snippet tfol "The following" wA
--- the following
--- endsnippet
---
--- snippet tfolt "It follows that" wA
--- it follows that
--- endsnippet
---
--- snippet ntfol "In the following" wA
--- in the following
--- endsnippet
---
--- snippet algos "algorithms" wA
--- algorithms
--- endsnippet
---
--- snippet algo "algorithm" wA
--- algorithm
--- endsnippet
---
--- # TODO: Make only available in tikzpicture
--- context "code()"
--- snippet q "State" w
--- \node[state] ($1) [] {$2};
--- endsnippet
---
--- context "code()"
--- snippet q0 "Initial state" w
--- \node[initial,state] ($1) {$2};
--- endsnippet
--- ```
-
 -- Taken from https://ejmastnak.com/tutorials/vim-latex/luasnip/#anatomy
 local get_visual = function(_, parent)
   if #parent.snippet.env.LS_SELECT_RAW > 0 then

dots/.config/nvim/snips/scheme.lua

@@ -1,24 +0,0 @@
-local ls = require("luasnip")
-local s = ls.snippet
-local t = ls.text_node
-local i = ls.insert_node
-
-return {
-  s("reqtrace", t({ "(#%require racket/trace)" })),
-  s("strln", t({ "(string-length " }), i(1), t({ ")" })),
-  s("impb", t({ "(import (rnrs base (6))", "        (rnrs io simple" }), i(0), t({ ")" })),
-  s("def", {
-    t("(define "),
-    i(1),
-    t(" "),
-    i(2),
-    t(")"),
-  }),
-  s("defp", {
-    t("(define ("),
-    i(1),
-    t(" "),
-    i(2),
-    t("))"),
-  }),
-}

dots/.config/nvim/snips/tex.lua

@@ -1,69 +0,0 @@
-local ls = require("luasnip")
-local s = ls.snippet
-local i = ls.insert_node
-local t = ls.text_node
-local f = ls.function_node
-
--- Inspired by https://castel.dev/post/lecture-notes-1/
-
-ls.add_snippets("tex", {
-  s("beg", {
-    t("\\begin{"),
-    i(1),
-    t({ "}", "\t" }),
-    i(0),
-    t({ "", "\\end{" }),
-    f(function(args)
-      return args[1][1]
-    end, { 1 }),
-    t("}"),
-  }),
-
-  s("def", {
-    t("\\begin{definition}"),
-    t({ "", "\t" }),
-    i(0),
-    t({ "", "\\end{definition}" }),
-  }),
-
-  s("fig", {
-    t("\\begin{figure}"),
-    t({ "", "\t" }),
-    i(0),
-    t({ "", "\\end{figure}" }),
-  }),
-
-  s(
-    "time",
-    f(function()
-      return os.date("%H:%M")
-    end)
-  ),
-
-  s("i", t("\\textit{"), i(0), t("}")),
-
-  s("b", t("\\textbf{"), i(0), t("}")),
-
-  s("center", {
-    t("\\begin{center}"),
-    t({ "", "" }),
-    i(0),
-    t({ "", "\\end{center}" }),
-  }),
-
-  s("pac", t("\\usepackage{"), i(0), t("}")),
-
-  s("foot", t("\\footnote{"), i(0), t("}")),
-
-  s("dm", {
-    t({ "\\[", "" }),
-    i(1),
-    t({ "", "\\]" }),
-    i(0),
-  }),
-
-  s("ch", t("\\chapter{"), i(0), t("}")),
-  s("sec", t("\\section{"), i(0), t("}")),
-  s("ssec", t("\\subsection{"), i(0), t("}")),
-  s("sssec", t("\\subsubsection{"), i(0), t("}")),
-})

dots/.config/nvim/snips/typescriptreact.lua

@@ -1,12 +0,0 @@
-local ls = require("luasnip")
-local s = ls.snippet
-local t = ls.text_node
-local i = ls.insert_node
-
-return {
-  s("preJ", {
-    t("<pre>{JSON.stringify("),
-    i(1, "object"), -- first tab stop
-    t(", null, 2)}</pre>"),
-  }),
-}

dots/.config/task/taskrc

@@ -1,5 +1,10 @@
+data.location=$XDG_DATA_HOME/task/
+hooks.location=$XDG_DATA_HOME/task/hooks
+
+include /usr/share/doc/task/rc/light-256.theme
 include ./taskrc.d/$HOSTNAME
 include ./taskrc.d/aliases
+include ./taskrc.d/sync
 include ./taskrc.d/urgency
 include ./taskrc.d/reports
 include ./taskrc.d/contexts
@@ -11,5 +16,3 @@ search.case.sensitive=no
 rc.json.array=on
 rc.verbose=nothing
 news.version=3.1.0
-
-recurrence=off

dots/.config/task/taskrc.d/desktop-arch

@@ -1,4 +1 @@
-include /usr/share/doc/task/rc/light-256.theme
-
-include ./locations
-include ./sync
+recurrence=off

dots/.config/task/taskrc.d/locations

@@ -1,2 +0,0 @@
-data.location=$XDG_DATA_HOME/task/
-hooks.location=$XDG_DATA_HOME/task/hooks

dots/.config/task/taskrc.d/z-arch

@@ -0,0 +1 @@
+recurrence=off

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,7 +53,7 @@ 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
@@ -87,5 +75,3 @@ set-hook -g after-new-session 'if -F "#{==:#{session_name},ssh}" "source ${XDG_C
 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

dots/.config/user-dirs.conf

@@ -1 +0,0 @@
-enabled=False

dots/.gitconfig

@@ -1,11 +1,9 @@
-[include]
-  path = ~/.gitconfig.email
-
 [core]
   editor = nvim
   excludesfile = ~/.gitignore
 
 [user]
+  email = hektor.misplon@pm.me
   name = Hektor Misplon
   username = hektor
   signingKey = AEB98353B8D72E465C4236435151AF79E723F21C
@@ -23,8 +21,6 @@
   sv = status --verbose
   co = checkout
   cob = checkout -b
-  pullr = "pull --rebase --autostash"
-  pushf = "push --force-with-lease"
   # Note these follow the naming convention of my `.bash_aliases`
   al = "!git config -l | grep alias | cut -c 7-"
   alf = "!git config -l | grep alias | cut -c 7- | fzf"
@@ -78,6 +74,8 @@
 [merge]
   tool = nvimdiff
   conflictstyle = diff3
+[pull]
+  rebase = true
 [diff]
   colorMoved = zebra
 [commit]
@@ -85,11 +83,3 @@
 
 [interactive]
   singleKey = true
-
-[pull]
-  rebase = true
-[rerere]
-  enabled = true
-
-[includeIf "gitdir:~/work/"]
-  path = ~/.gitconfig.work

dots/.gitconfig.email.example

@@ -1,2 +0,0 @@
-[user]
-  email = your.email@example.com

dots/.gitconfig.work

@@ -1,13 +0,0 @@
-[include]
-  path = ~/.gitconfig.work.email
-
-[core]
-  longpaths = true
-
-[user]
-  name = Hektor Misplon
-  username = hektor.misplon
-  signingKey = 1C88BE828184CEE6
-
-[commit]
-  gpgsign = false

dots/.gitconfig.work.email.example

@@ -1,2 +0,0 @@
-[user]
-  email = your.work.email@example.com

dots/.gitignore

@@ -9,7 +9,6 @@ log/
 # Node
 npm-debug.log
 node_modules
-.npm-cache
 
 # Python
 *.pyc
@@ -69,7 +68,6 @@ Thumbs.db
 
 # Kernel Module Compile Results
 *.mod*
-!*.mod*.*
 *.cmd
 .tmp_versions/
 modules.order

dots/.vim/after/ftplugin/pandoc/sandwich.vim

@@ -1,4 +1,3 @@
-vim.cmd([[
 function GetClozeNumber()
   let REGEX_CLOZE_START = '{{c\d\+::'
 
@@ -34,4 +33,3 @@ let g:sandwich#recipes += [
       \     'nesting':  1
       \   }
       \ ]
-]])

dots/.vim/after/plugin/md-img-paste.vim

@@ -1,5 +1,3 @@
-vim.cmd([[
 " Paste clipboard images
 au FileType pandoc nmap <buffer><silent> <leader>v :call mdip#MarkdownClipboardImage()<CR>
 au FileType markdown nmap <buffer><silent> <leader>v :call mdip#MarkdownClipboardImage()<CR>
-]])

dots/.vim/after/plugin/sandwich.vim

@@ -1,5 +1,3 @@
-vim.cmd([[
 nmap s <Nop>
 xmap s <Nop>
 let g:sandwich#recipes = deepcopy(g:sandwich#default_recipes)
-]])

dots/.vim/after/plugin/taskwiki.vim

@@ -0,0 +1,4 @@
+let g:taskwiki_taskrc_location='/home/h/.config/task/taskrc'
+let g:taskwiki_disable_concealcursor=1
+let g:taskwiki_dont_preserve_folds=1
+let g:taskwiki_dont_fold=1

dots/.vim/after/plugin/vim-javascript.vim

@@ -1,8 +1,6 @@
-vim.cmd([[
 let g:javascript_plugin_jsdoc = 1 " jsdoc syntax highlighting
 let g:javascript_plugin_flow = 1 " flow syntax highlighting
 let g:javascript_conceal_function = "ƒ"
 let g:javascript_conceal_return = "⇖"
 let g:svelte_indent_script = 0
 let g:svelte_indent_style = 0
-]])

dots/.vim/after/plugin/vim-pandoc-syntax.vim

@@ -1,4 +1,3 @@
-vim.cmd([[
 let g:pandoc#syntax#conceal#urls=1
 let g:pandoc#syntax#codeblocks#embeds#langs=[
   \ 'python',
@@ -14,4 +13,3 @@ let g:pandoc#syntax#codeblocks#embeds#langs=[
 let g:pandoc#syntax#style#emphases=0 " Bug workaround
 let g:pandoc#syntax#conceal#cchar_overrides = { "atx": " ", "li": "·" }
 let g:pandoc#syntax#conceal#blacklist=[]
-]])

dots/.vim/after/plugin/vim-pandoc.vim

@@ -1,4 +1,3 @@
-vim.cmd([[
 au FileType pandoc call pandoc#completion#Init()
 let g:pandoc#filetypes#pandoc_markdown=0
 let g:pandoc#spell#enabled=0
@@ -6,4 +5,3 @@ let g:pandoc#spell#default_langs=['en_us', 'nl_be']
 let g:pandoc#formatting#mode='a'
 let g:pandoc#formatting#textwidth=90
 let g:pandoc#modules#disabled = ["formatting", "dashes", "yaml", "metadata"]
-]])

dots/.vim/after/plugin/vim-tidal.vim

@@ -1,4 +1,3 @@
-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
@@ -13,4 +12,3 @@ au FileType tidal com! -nargs=0 H :TidalHush
 " SuperCollider
 au BufEnter,BufWinEnter,BufNewFile,BufRead *.sc,*.scd se filetype=supercollider
 au Filetype supercollider packadd scvim
-]])

dots/.vim/after/plugin/vimtex.vim

@@ -1,6 +1,4 @@
-vim.cmd([[
 let g:vimtex_view_method='zathura'
 let g:tex_flavor='latex'
 let g:tex_conceal='abdmgs'
 let g:vimtex_quickfix_mode=0
-]])

dots/.vim/after/plugin/wiki.vim

@@ -1,4 +1,3 @@
-vim.cmd([[
 " Change local buffer to directory of current file after the plugin has loaded
 autocmd VimEnter * lcd %:p:h
 
@@ -107,4 +106,3 @@ let g:wiki_write_on_nav=1
 let g:wiki_zotero_root='~/.local/share/zotero'
 " ... mappings and commands
 " ...
-]])

dots/.vim/after/syntax/_comment_keywords.vim

@@ -1,7 +1,5 @@
-vim.cmd([[
 syn match Todo /TODO/
 syn match Todo /FIXME/
 syn match Todo /FIX/
 syn match Todo /QUESTION/
 syn match Todo /NOTE/
-]])

dots/.vim/after/syntax/pandoc.vim

@@ -0,0 +1,26 @@
+" Override the pandoc-syntax highlighting colors for more subtle citations
+hi! link pandocPCite Comment
+hi! link pandocICite Comment
+hi! link pandocCiteKey Comment
+hi! link pandocCiteAnchor Comment
+hi! link pandocCiteLocator Comment
+
+" Don't show the CiteKey within the CiteLocator
+syn match pandocCiteKey /\v\[[^]]+\]/ contained
+
+" Match cloze delimiters e.g. `{{c1::` and `}}`
+syn match ClozeDelimiter /{{c\d\+::/ conceal containedin=pandocUListItem,pandocListItem
+syn match ClozeDelimiter /}}/ conceal containedin=pandocUListItem,pandocListItem
+" Match text between cloze delimiters
+syn match Cloze /\({{c\d\+::\)\@<=\(\_[A-Za-z0-9$\ \\\-\*,_`()]*\)\(}}\)\@=/ containedin=pandocUListItem,pandocListItem
+
+hi! link ClozeDelimiter Special
+hi! link Cloze Special
+
+" Fix task UUIDs not being highlighted correctly in pandoc lists
+syn match pandocUListItem /^>\=\s*[*+-]\s\+-\@!.*$/ nextgroup=pandocUListItem,pandocLaTeXMathBlock,pandocLaTeXInlineMath,pandocEscapedDollar,pandocDelimitedCodeBlock,pandocListItemContinuation contains=@Spell,pandocEmphasis,pandocStrong,pandocNoFormatted,pandocStrikeout,pandocSubscript,pandocSuperscript,pandocStrongEmphasis,pandocStrongEmphasis,pandocPCite,pandocICite,pandocCiteKey,pandocReferenceLabel,pandocLaTeXCommand,pandocLaTeXMathBlock,pandocLaTeXInlineMath,pandocEscapedDollar,pandocReferenceURL,pandocAutomaticLink,pandocFootnoteDef,pandocFootnoteBlock,pandocFootnoteID,pandocAmpersandEscape,TaskWikiTaskUuid skipempty display
+syn match TaskWikiTaskUuid containedin=TaskWikiTask /\v#([A-Z]:)?[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/
+syn match TaskWikiTaskUuid containedin=TaskWikiTask /\v#([A-Z]:)?[0-9a-fA-F]{8}$/
+highlight link TaskWikiTaskUuid Comment
+
+:runtime! syntax/_comment_keywords.vim

dots/.vim/after/syntax/prolog.vim

@@ -1,7 +1,5 @@
-vim.cmd([[
 syn keyword Operator \+ conceal cchar=¬
 syn keyword Operator ,  conceal cchar=∧
 syn keyword Operator ;  conceal cchar=∨
-]])
 
-vim.cmd.runtime("syntax/_comment_keywords.lua")
+:runtime! syntax/_comment_keywords.vim

dots/.vim/after/syntax/scheme.vim

@@ -1,4 +1,3 @@
-vim.cmd([[
 syntax keyword Statement define conceal cchar=≔
 
 syn keyword Operator not conceal cchar=¬
@@ -36,6 +35,5 @@ syn keyword Operator phi     conceal cchar=φ
 syn keyword Operator chi     conceal cchar=χ
 syn keyword Operator psi     conceal cchar=ψ
 syn keyword Operator omega   conceal cchar=ω
-]])
 
-vim.cmd.runtime("syntax/_comment_keywords.lua")
+:runtime! syntax/_comment_keywords.vim

dots/.vim/colors/yang.vim

@@ -0,0 +1,210 @@
+" YinYang - black/white color scheme
+
+if (&background ==# "dark" && get(g:, "colors_name", "") ==# "yang")
+    runtime! colors/yin.vim
+    finish
+endif
+
+highlight clear
+
+if exists("syntax_on")
+    syntax reset
+endif
+let g:colors_name = "yang"
+
+
+let s:palette = {}
+
+let s:palette.white = [254, '#f7f7f7']
+let s:palette.gray15 = [253, '#e4e4e4']
+let s:palette.gray14 = [250, '#bcbcbc']
+let s:palette.gray13 = [249, '#b2b2b2']
+let s:palette.gray12 = [248, '#a8a8a8']
+let s:palette.gray11 = [247, '#9e9e9e']
+let s:palette.gray10 = [246, '#949494']
+let s:palette.gray09 = [245, '#8a8a8a']
+let s:palette.gray08 = [244, '#808080']
+let s:palette.gray07 = [243, '#767676']
+let s:palette.gray06 = [242, '#666666']
+let s:palette.gray05 = [241, '#606060']
+let s:palette.gray04 = [240, '#585858']
+let s:palette.gray03 = [239, '#4e4e4e']
+let s:palette.gray02 = [238, '#444444']
+let s:palette.gray01 = [235, '#262626']
+let s:palette.black = [233, '#121212']
+
+let s:palette.purple = [98, '#875fd7']
+let s:palette.brown = [130, '#af5f00']
+let s:palette.blue = [67, '#5f87af']
+let s:palette.darkblue = [27, '#005fff']
+let s:palette.green = [65, '#5f875f']
+let s:palette.red = [88, '#870000']
+let s:palette.orange = [166, '#5f5fd7']
+
+if has("nvim")
+    let g:terminal_color_0 = s:palette.gray01[1]
+    let g:terminal_color_1 = s:palette.gray06[1]
+    let g:terminal_color_2 = s:palette.gray03[1]
+    let g:terminal_color_3 = s:palette.gray11[1]
+    let g:terminal_color_4 = s:palette.gray02[1]
+    let g:terminal_color_5 = s:palette.gray08[1]
+    let g:terminal_color_6 = s:palette.gray09[1]
+    let g:terminal_color_7 = s:palette.gray13[1]
+    let g:terminal_color_8 = s:palette.gray03[1]
+    let g:terminal_color_9 = s:palette.gray10[1]
+    let g:terminal_color_10 = s:palette.gray07[1]
+    let g:terminal_color_11 = s:palette.gray13[1]
+    let g:terminal_color_12 = s:palette.gray05[1]
+    let g:terminal_color_13 = s:palette.gray12[1]
+    let g:terminal_color_14 = s:palette.gray14[1]
+    let g:terminal_color_15 = s:palette.white[1]
+elseif has("terminal")
+    let g:terminal_ansi_colors = [
+                \ s:palette.gray01[1],
+                \ s:palette.gray06[1],
+                \ s:palette.gray03[1],
+                \ s:palette.gray11[1],
+                \ s:palette.gray02[1],
+                \ s:palette.gray08[1],
+                \ s:palette.gray09[1],
+                \ s:palette.gray13[1],
+                \ s:palette.gray03[1],
+                \ s:palette.gray10[1],
+                \ s:palette.gray07[1],
+                \ s:palette.gray13[1],
+                \ s:palette.gray05[1],
+                \ s:palette.gray12[1],
+                \ s:palette.gray14[1],
+                \ s:palette.white[1]
+                \ ]
+endif
+
+function! s:hi(group, fg_color, bg_color, style)
+    let highlight_command = ['hi', a:group]
+    if !empty(a:fg_color)
+        let [ctermfg, guifg] = a:fg_color
+        call add(highlight_command, printf('ctermfg=%d guifg=%s', ctermfg, guifg))
+    endif
+    if !empty(a:bg_color)
+        let [ctermbg, guibg] = a:bg_color
+        call add(highlight_command, printf('ctermbg=%d guibg=%s', ctermbg, guibg))
+    endif
+    if !empty(a:style)
+        call add(highlight_command, printf('cterm=%s gui=%s', a:style, a:style))
+    endif
+    execute join(highlight_command, ' ')
+endfunction
+
+
+call s:hi('Normal', s:palette.gray05, s:palette.white, '')
+set background=light
+
+call s:hi('Constant', s:palette.gray11, [], 'bold')
+call s:hi('String', s:palette.gray08, [], '')
+call s:hi('Number', s:palette.gray10, [], '')
+
+call s:hi('Identifier', s:palette.gray06, [], 'none')
+call s:hi('Function', s:palette.gray06, [], '')
+
+call s:hi('Statement', s:palette.gray08, [], 'bold')
+call s:hi('Operator', s:palette.gray03, [], 'none')
+call s:hi('Keyword', s:palette.gray10, [], '')
+
+call s:hi('PreProc', s:palette.gray10, [], 'none')
+
+call s:hi('Type', s:palette.gray09, [], 'bold')
+
+call s:hi('Special', s:palette.gray10, [], '')
+call s:hi('SpecialComment', s:palette.gray12, [], 'bold')
+
+call s:hi('Title', s:palette.gray10, [], 'bold')
+call s:hi('Todo', s:palette.purple, s:palette.white, '')
+if has("nvim") || has("gui_running")
+    call s:hi('Comment', s:palette.gray12, [], 'italic')
+else
+    call s:hi('Comment', s:palette.gray12, [], '')
+endif
+
+call s:hi('LineNr', s:palette.gray13, s:palette.gray15, 'none')
+call s:hi('FoldColumn', s:palette.gray08, s:palette.gray15, 'none')
+call s:hi('CursorLine', [], s:palette.gray15, 'none')
+call s:hi('CursorLineNr', s:palette.gray06, s:palette.gray15, 'none')
+
+call s:hi('Visual', s:palette.white, s:palette.gray06, '')
+call s:hi('Search', s:palette.gray15, s:palette.gray03, 'none')
+call s:hi('IncSearch', s:palette.white, s:palette.gray11, 'bold')
+
+call s:hi('SpellBad', s:palette.red, s:palette.white, 'undercurl')
+call s:hi('SpellCap', s:palette.red, s:palette.white, 'undercurl')
+call s:hi('SpellLocal', s:palette.red, s:palette.white, 'undercurl')
+call s:hi('SpellRare', s:palette.brown, s:palette.white, 'undercurl')
+
+call s:hi('Error', s:palette.red, s:palette.white, 'bold')
+call s:hi('ErrorMsg', s:palette.red, s:palette.white, '')
+call s:hi('WarningMsg', s:palette.brown, s:palette.white, '')
+call s:hi('ModeMsg', s:palette.gray10, [], '')
+call s:hi('MoreMsg', s:palette.gray10, [], '')
+
+call s:hi('MatchParen', s:palette.orange, s:palette.white, '')
+
+call s:hi('Cursor', [], s:palette.gray12, '')
+call s:hi('Underlined', s:palette.gray08, [], 'underline')
+call s:hi('SpecialKey', s:palette.gray13, [], '')
+call s:hi('NonText', s:palette.gray13, [], '')
+call s:hi('Directory', s:palette.gray08, [], '')
+
+call s:hi('Pmenu', s:palette.gray05, s:palette.gray14, 'none')
+call s:hi('PmenuSbar', s:palette.white, s:palette.gray01, 'none')
+call s:hi('PmenuSel', s:palette.gray14, s:palette.gray05, '')
+call s:hi('PmenuThumb', s:palette.gray14, s:palette.gray03, 'none')
+
+call s:hi('StatusLine', s:palette.gray03, s:palette.gray13, 'none')
+call s:hi('StatusLineNC', s:palette.gray13, s:palette.gray15, 'none')
+call s:hi('WildMenu', s:palette.gray08, [], '')
+call s:hi('VertSplit', s:palette.gray13, s:palette.white, 'none')
+
+call s:hi('DiffAdd', s:palette.white, s:palette.green, '')
+call s:hi('DiffChange', s:palette.white, s:palette.blue, '')
+call s:hi('DiffDelete', s:palette.white, s:palette.red, '')
+call s:hi('DiffText', s:palette.white, s:palette.darkblue, '')
+call s:hi('DiffAdded', s:palette.green, s:palette.white, '')
+call s:hi('DiffChanged', s:palette.blue, s:palette.white, '')
+call s:hi('DiffRemoved', s:palette.red, s:palette.white, '')
+
+
+highlight! link Character Constant
+highlight! link Float Number
+highlight! link Boolean Number
+
+highlight! link SignColumn FoldColumn
+highlight! link ColorColumn FoldColumn
+highlight! link CursorColumn CursorLine
+
+highlight! link Folded LineNr
+highlight! link Conceal Normal
+highlight! link ErrorMsg Error
+
+highlight! link Conditional Statement
+highlight! link Repeat Statement
+highlight! link Label Statement
+highlight! link Exception Statement
+
+highlight! link Include PreProc
+highlight! link Define PreProc
+highlight! link Macro PreProc
+highlight! link PreCondit PreProc
+
+highlight! link StorageClass Type
+highlight! link Structure Type
+highlight! link Typedef Type
+
+highlight! link SpecialChar Special
+highlight! link Tag Special
+highlight! link Delimiter Special
+highlight! link Debug Special
+highlight! link Question Special
+
+highlight! link VisualNOS Visual
+highlight! link TabLine StatusLineNC
+highlight! link TabLineFill StatusLineNC
+highlight! link TabLineSel StatusLine

dots/.vim/colors/yin.vim

@@ -0,0 +1,212 @@
+" YinYang - black/white color scheme
+
+if (&background ==# "light" && get(g:, "colors_name", "") ==# "yin")
+    runtime! colors/yang.vim
+    finish
+endif
+
+highlight clear
+
+if exists("syntax_on")
+    syntax reset
+endif
+let g:colors_name = "yin"
+
+
+let s:palette = {}
+
+let s:palette.blackest = [0, '#0c0c0c']
+let s:palette.black = [233, '#111111']
+let s:palette.gray01 = [235, '#1e1e1e']
+let s:palette.gray02 = [238, '#444444']
+let s:palette.gray03 = [239, '#4e4e4e']
+let s:palette.gray04 = [240, '#585858']
+let s:palette.gray05 = [242, '#666666']
+let s:palette.gray06 = [243, '#767676']
+let s:palette.gray07 = [244, '#808080']
+let s:palette.gray08 = [245, '#8a8a8a']
+let s:palette.gray09 = [246, '#949494']
+let s:palette.gray10 = [247, '#9e9e9e']
+let s:palette.gray11 = [248, '#a8a8a8']
+let s:palette.gray12 = [249, '#b2b2b2']
+let s:palette.gray13 = [250, '#bcbcbc']
+let s:palette.gray14 = [251, '#c6c6c6']
+let s:palette.gray15 = [254, '#e4e4e4']
+let s:palette.white = [255, '#eeeeee']
+
+let s:palette.comments = copy(s:palette.gray03)
+
+let s:palette.purple = [62, '#5f5fd7']
+let s:palette.brown = [94, '#875f00']
+let s:palette.blue = [24, '#005f87']
+let s:palette.lightblue = [31, '#00afff']
+let s:palette.green = [29, '#00875f']
+let s:palette.red = [88, '#870000']
+let s:palette.orange = [166, '#5f5fd7']
+
+if has("nvim")
+    let g:terminal_color_0 = s:palette.gray01[1]
+    let g:terminal_color_1 = s:palette.gray06[1]
+    let g:terminal_color_2 = s:palette.gray03[1]
+    let g:terminal_color_3 = s:palette.gray11[1]
+    let g:terminal_color_4 = s:palette.gray02[1]
+    let g:terminal_color_5 = s:palette.gray08[1]
+    let g:terminal_color_6 = s:palette.gray09[1]
+    let g:terminal_color_7 = s:palette.gray13[1]
+    let g:terminal_color_8 = s:palette.gray03[1]
+    let g:terminal_color_9 = s:palette.gray10[1]
+    let g:terminal_color_10 = s:palette.gray07[1]
+    let g:terminal_color_11 = s:palette.gray15[1]
+    let g:terminal_color_12 = s:palette.gray05[1]
+    let g:terminal_color_13 = s:palette.gray12[1]
+    let g:terminal_color_14 = s:palette.gray14[1]
+    let g:terminal_color_15 = s:palette.white[1]
+elseif has("terminal")
+    let g:terminal_ansi_colors = [
+                \ s:palette.gray01[1],
+                \ s:palette.gray06[1],
+                \ s:palette.gray03[1],
+                \ s:palette.gray11[1],
+                \ s:palette.gray02[1],
+                \ s:palette.gray08[1],
+                \ s:palette.gray09[1],
+                \ s:palette.gray13[1],
+                \ s:palette.gray03[1],
+                \ s:palette.gray10[1],
+                \ s:palette.gray07[1],
+                \ s:palette.gray15[1],
+                \ s:palette.gray05[1],
+                \ s:palette.gray12[1],
+                \ s:palette.gray14[1],
+                \ s:palette.white[1]
+                \ ]
+endif
+
+function! s:hi(group, fg_color, bg_color, style)
+    let highlight_command = ['hi', a:group]
+    if !empty(a:fg_color)
+        let [ctermfg, guifg] = a:fg_color
+        call add(highlight_command, printf('ctermfg=%d guifg=%s', ctermfg, guifg))
+    endif
+    if !empty(a:bg_color)
+        let [ctermbg, guibg] = a:bg_color
+        call add(highlight_command, printf('ctermbg=%d guibg=%s', ctermbg, guibg))
+    endif
+    if !empty(a:style)
+        call add(highlight_command, printf('cterm=%s gui=%s', a:style, a:style))
+    endif
+    execute join(highlight_command, ' ')
+endfunction
+
+
+call s:hi('Normal', s:palette.gray11, s:palette.black, '')
+set background=dark
+
+call s:hi('Constant', s:palette.gray05, [], 'bold')
+call s:hi('String', s:palette.gray10, [], '')
+call s:hi('Number', s:palette.gray06, [], '')
+
+call s:hi('Identifier', s:palette.gray08, [], 'none')
+call s:hi('Function', s:palette.gray08, [], '')
+
+call s:hi('Statement', s:palette.gray05, [], 'bold')
+call s:hi('Operator', s:palette.gray05, [], 'none')
+call s:hi('Keyword', s:palette.gray05, [], '')
+
+call s:hi('PreProc', s:palette.gray07, [], 'none')
+
+call s:hi('Type', s:palette.gray05, [], 'bold')
+
+call s:hi('Special', s:palette.gray05, [], '')
+call s:hi('SpecialComment', s:palette.comments, [], 'bold')
+
+call s:hi('Title', s:palette.gray07, [], 'bold')
+call s:hi('Todo', s:palette.purple, s:palette.black, '')
+if has("nvim") || has("gui_running")
+    call s:hi('Comment', s:palette.comments, [], 'italic')
+else
+    call s:hi('Comment', s:palette.comments, [], '')
+endif
+
+call s:hi('LineNr', s:palette.gray02, s:palette.black, 'none')
+call s:hi('FoldColumn', s:palette.gray07, s:palette.gray01, 'none')
+call s:hi('CursorLine', [], s:palette.gray01, 'none')
+call s:hi('CursorLineNr', s:palette.gray14, s:palette.gray01, 'none')
+
+call s:hi('Visual', s:palette.black, s:palette.gray06, '')
+call s:hi('Search', s:palette.gray01, s:palette.gray11, 'none')
+call s:hi('IncSearch', s:palette.black, s:palette.gray07, 'bold')
+
+call s:hi('SpellBad', s:palette.red, s:palette.black, 'undercurl')
+call s:hi('SpellCap', s:palette.red, s:palette.black, 'undercurl')
+call s:hi('SpellLocal', s:palette.red, s:palette.black, 'undercurl')
+call s:hi('SpellRare', s:palette.brown, s:palette.black, 'undercurl')
+
+call s:hi('Error', s:palette.red, s:palette.black, 'bold')
+call s:hi('ErrorMsg', s:palette.red, s:palette.black, '')
+call s:hi('WarningMsg', s:palette.brown, s:palette.black, '')
+call s:hi('ModeMsg', s:palette.gray10, [], '')
+call s:hi('MoreMsg', s:palette.gray10, [], '')
+
+call s:hi('MatchParen', s:palette.orange, s:palette.black, '')
+
+call s:hi('Cursor', [], s:palette.gray12, '')
+call s:hi('Underlined', s:palette.gray08, [], 'underline')
+call s:hi('SpecialKey', s:palette.gray04, [], '')
+call s:hi('NonText', s:palette.gray04, [], '')
+call s:hi('Directory', s:palette.gray08, [], '')
+
+call s:hi('Pmenu', s:palette.gray10, s:palette.gray03, 'none')
+call s:hi('PmenuSbar', s:palette.black, s:palette.gray15, 'none')
+call s:hi('PmenuSel', s:palette.gray03, s:palette.gray10, '')
+call s:hi('PmenuThumb', s:palette.gray03, s:palette.gray09, 'none')
+
+call s:hi('StatusLine', s:palette.gray12, s:palette.gray01, 'none')
+call s:hi('StatusLineNC', s:palette.black, s:palette.black, 'none')
+call s:hi('WildMenu', s:palette.gray08, [], '')
+call s:hi('VertSplit', s:palette.gray03, s:palette.black, 'none')
+
+call s:hi('DiffAdd', s:palette.blackest, s:palette.green, '')
+call s:hi('DiffChange', s:palette.blackest, s:palette.blue, '')
+call s:hi('DiffDelete', s:palette.blackest, s:palette.red, '')
+call s:hi('DiffText', s:palette.black, s:palette.lightblue, '')
+call s:hi('DiffAdded', s:palette.green, s:palette.black, '')
+call s:hi('DiffChanged', s:palette.blue, s:palette.black, '')
+call s:hi('DiffRemoved', s:palette.red, s:palette.black, '')
+
+highlight! link Character Constant
+highlight! link Float Number
+highlight! link Boolean Number
+
+highlight! link SignColumn FoldColumn
+highlight! link ColorColumn FoldColumn
+highlight! link CursorColumn CursorLine
+
+highlight! link Folded LineNr
+highlight! link Conceal Normal
+highlight! link ErrorMsg Error
+
+highlight! link Conditional Statement
+highlight! link Repeat Statement
+highlight! link Label Statement
+highlight! link Exception Statement
+
+highlight! link Include PreProc
+highlight! link Define PreProc
+highlight! link Macro PreProc
+highlight! link PreCondit PreProc
+
+highlight! link StorageClass Type
+highlight! link Structure Type
+highlight! link Typedef Type
+
+highlight! link SpecialChar Special
+highlight! link Tag Special
+highlight! link Delimiter Special
+highlight! link Debug Special
+highlight! link Question Special
+
+highlight! link VisualNOS Visual
+highlight! link TabLine StatusLineNC
+highlight! link TabLineFill StatusLineNC
+highlight! link TabLineSel StatusLine

dots/.vim/ftdetect/prolog.vim

@@ -0,0 +1 @@
+autocmd BufNewFile,BufReadPost *.pl set filetype=prolog

dots/.vim/ftplugin/javascript.vim

@@ -0,0 +1 @@
+set mps+==:;

dots/.vim/ftplugin/pandoc/anki.vim

@@ -1,4 +1,3 @@
-vim.cmd([[
 " Anki helper functions
 
 " Convert cloze note to regular text
@@ -21,4 +20,3 @@ vim.cmd([[
 
 au FileType pandoc com! -range AnkiRemoveAllClozes :%s/\%V{{c\d\+:://ge | :%s/\%V}}//ge | :%s/\%VSTART\nCloze\n//ge | :%s/\%VEND\n//ge
 au FileType pandoc com! -range AnkiRemoveSelectedClozes :%s/\%V{{c\d\+:://ge | :%s/\%V}}//ge | :%s/\%VSTART\nCloze\n//ge | :%s/\%VEND\n//ge
-]])

dots/.vim/ftplugin/pandoc/wiki.vim

@@ -1,20 +1,3 @@
--- NOTE: May want to move this, as it is more specific to wiki than to pandoc
-vim.api.nvim_create_user_command("AnkiDeck", function()
-  local handle = io.popen("get-anki-decks")
-  local decks = {}
-  for line in handle:lines() do
-    table.insert(decks, line)
-  end
-  handle:close()
-
-  vim.ui.select(decks, { prompt = "Select Anki deck" }, function(choice)
-    if choice then
-      vim.api.nvim_put({ choice }, "", true, true)
-    end
-  end)
-end, {})
-
-vim.cmd([[
 set cc=81
 set cocu=""
 func! GetContext()
@@ -34,4 +17,3 @@ func! GetContext()
   endif
 endfunc
 com! -nargs=0 GetContext :call GetContext()
-]])

dots/.vim/ftplugin/scheme/repl.vim

@@ -1,4 +1,3 @@
-vim.cmd([[
 "
 " Source: https://wiki.call-cc.org/vim / Jonathan Palardy
 "
@@ -24,4 +23,3 @@ fun! Scheme_eval_defun()
     call Scheme_send_sexp(@")
     call setpos('.', pos)
 endfun
-]])

dots/.vim/init/base.vim

@@ -1,5 +1,7 @@
-vim.cmd([[
+" General config {{{
+"
 " Tip: acronyms for overview, use `:h` for a quick lookup.
+
 set nocp                               " Disable vi incompatibility
 filetype plugin indent on              " Filetype recognition
 set enc=utf8                           " Default to UTF-8 encoding
@@ -26,5 +28,6 @@ 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
-]])
+set thesaurus+=~/.vim/thesaurus/mthesaur.txt
+
+" }}}

dots/.vim/init/colors.vim

@@ -0,0 +1,3 @@
+set termguicolors
+set bg=light
+hi Normal ctermbg=none guibg=NONE

dots/.vim/init/mappings.vim

@@ -0,0 +1,44 @@
+" 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>

dots/.vim/init/plugins.vim

@@ -0,0 +1,34 @@
+" Plugins {{{
+
+" Plug setup {{{
+
+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'
+Plug 'hektor/taskwiki'
+" 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'
+call plug#end()
+" }}}

dots/.vim/plugin/cursor.vim

@@ -1,4 +1,3 @@
-vim.cmd([[
 " Taken from /usr/share/vim/vim90/defaults.vim
 augroup vimStartup
   au!
@@ -13,4 +12,3 @@ augroup vimStartup
     \ | endif
 
 augroup END
-]])