Lock flake

Add minimal readme to my neovim configuration
2025-10-15 21:05:53 +02:00 · 2025-10-15 21:03:55 +02:00
124 changed files with 2206 additions and 2819 deletions
--- a/README.md
+++ b/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))

--- a/dots/.bash_aliases/all
+++ b/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'
--- a/dots/.bash_aliases/jira
+++ b/dots/.bash_aliases/jira
@ -0,0 +1,4 @@
+# shellcheck shell=bash
+# vim: set ft=bash :
+
+alias jira-me='jira issue list -a$(jira me)'
--- a/dots/.bashrc
+++ b/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
--- a/dots/.bin/README.md
+++ b/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

--- a/dots/.bin/dmenu-bluetooth
+++ b/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
--- a/dots/.bin/dmenu-read
+++ b/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:"
--- a/dots/.bin/dmenu-spot
+++ b/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
--- a/dots/.bin/git-cb
+++ b/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"
--- a/dots/.bin/pomo
+++ b/dots/.bin/pomo
@ -14,12 +14,11 @@ 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}"
@ -31,20 +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)
--- a/dots/.config/firefox/setup
+++ b/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
--- a/dots/.config/firefox/user.js
+++ b/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");
--- a/dots/.config/home-manager/flake.lock
+++ b/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
+}
--- a/dots/.config/home-manager/flake.nix
+++ b/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 ];
+        };
+      };
+    };
+}
--- a/dots/.config/home-manager/hosts/work/default.nix
+++ b/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;
+  };
+}
--- a/dots/.config/home-manager/hosts/work/packages.nix
+++ b/dots/.config/home-manager/hosts/work/packages.nix
@ -1,4 +1,3 @@
 { pkgs, config, ... }:

-with pkgs;
-[ ]
+with pkgs; [ ]
--- a/dots/.config/kitty/kitty.conf
+++ b/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 top
-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
-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
--- a/dots/.config/kitty/nvim.conf
+++ b/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
--- a/dots/.config/nvim/README.md
+++ b/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)
--- a/dots/.config/nvim/after/plugin/auto-session.lua
+++ b/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
-})
--- a/dots/.config/nvim/after/plugin/conform.lua
+++ b/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,
  },
@ -15,15 +15,14 @@ require("conform").setup({
    html = { "prettierd", "prettier", stop_after_first = true },
    lua = { "stylua" }, -- configured in stylua.toml
    markdown = { "prettierd", "prettier", stop_after_first = true },
-    nix = { "nixfmt" },
-    javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
-    javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
+    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" },
-    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 },
  },
 })
--- a/dots/.config/nvim/after/plugin/gitsigns.nvim.lua
+++ b/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 = "?" })
--- a/dots/.config/nvim/after/plugin/kitty-scrollback.nvim.lua
+++ b/dots/.config/nvim/after/plugin/kitty-scrollback.nvim.lua
@ -1 +0,0 @@
-require("kitty-scrollback").setup()
--- a/dots/.config/nvim/after/plugin/lspconfig.lua
+++ b/dots/.config/nvim/after/plugin/lspconfig.lua
@ -1,5 +1,7 @@
 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()

@ -32,40 +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 = {},
-    },
-  },
+  lua_ls = {},
  -- marksman = {},
-  nixd = {},
  pyright = {},
  -- tsserver = {},
  svelte = {
@ -133,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 }
--- a/dots/.config/nvim/after/plugin/nvim-cmp.lua
+++ b/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" },
--- a/dots/.config/nvim/after/plugin/nvim-lint.lua
+++ b/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 = {
--- a/dots/.config/nvim/after/syntax/pandoc.lua
+++ b/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")
--- a/dots/.config/nvim/flake.lock
+++ b/dots/.config/nvim/flake.lock
@ -2,11 +2,11 @@
  "nodes": {
    "nixCats": {
      "locked": {
-        "lastModified": 1763330129,
-        "narHash": "sha256-KbOeWIF52SV53BOeETGO2C5ewaV2Ex9iaXH7G72gOr8=",
+        "lastModified": 1759730664,
+        "narHash": "sha256-boRlBQ/c4CaHsK/z04QL6+t81mcar37Io94HBX2GflY=",
        "owner": "BirdeeHub",
        "repo": "nixCats-nvim",
-        "rev": "c81551ed87db2aefab30a12cf7425ff94dc0ad64",
+        "rev": "77dffad8235eb77684fcb7599487c8e9f23d5b8f",
        "type": "github"
      },
      "original": {
@ -17,11 +17,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1763464769,
-        "narHash": "sha256-AJHrsT7VoeQzErpBRlLJM1SODcaayp0joAoEA35yiwM=",
+        "lastModified": 1760256791,
+        "narHash": "sha256-uTpzDHRASEDeFUuToWSQ46Re8beXyG9dx4W36FQa0/c=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "6f374686605df381de8541c072038472a5ea2e2d",
+        "rev": "832e3b6db48508ae436c2c7bfc0cf914eac6938e",
        "type": "github"
      },
      "original": {
@ -66,11 +66,11 @@
    "plugins-helm-ls-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1761915179,
-        "narHash": "sha256-W9NRa84l5Cs62OsDeqb+LMxk8oYjhVBCB3o3UmE9a0I=",
+        "lastModified": 1757598429,
+        "narHash": "sha256-nzuJxAAaEmuVYg9k0B8OKslxsihhg6RKlhz6E7xJTQU=",
        "owner": "qvalentin",
        "repo": "helm-ls.nvim",
-        "rev": "d6f3a8d4ad59b4f54cd734267dfb5411679ea608",
+        "rev": "f36ecbd3e7b0b2ac8358a9d6a3213888e29943db",
        "type": "github"
      },
      "original": {
--- a/dots/.config/nvim/flake.nix
+++ b/dots/.config/nvim/flake.nix
@ -59,48 +59,12 @@
        {
          lspsAndRuntimeDeps = with pkgs; {
            general = [
-              black
-              clang
-              clang-tools
-              gawk
-              gdtoolkit_4
-              isort
              tree-sitter
-              ormolu
-              nodePackages.prettier
-              nixd
-              nixfmt
-              prettierd
-              shellcheck-minimal
-              stylua
-              vscode-langservers-extracted
            ];
          };

          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
@ -143,7 +107,6 @@
              copilot-lua
              copilot-cmp
              pkgs.neovimPlugins.helm-ls-nvim
-              pkgs.vimPlugins.kitty-scrollback-nvim
            ];
          };

--- a/dots/.config/nvim/ftplugin/javascript.lua
+++ b/dots/.config/nvim/ftplugin/javascript.lua
@ -1 +0,0 @@
-vim.opt.matchpairs:append("=:;")
--- a/dots/.config/nvim/ftplugin/pandoc.lua
+++ b/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, {})
--- a/dots/.config/nvim/init.lua
+++ b/dots/.config/nvim/init.lua
@ -1,28 +1,12 @@
 require("nixCatsUtils").setup({ non_nix_value = true }) -- https://github.com/BirdeeHub/nixCats-nvim/blob/77dffad8235eb77684fcb7599487c8e9f23d5b8f/templates/example/init.lua

-vim.cmd([[
-set termguicolors
-set bg=light
-hi Normal ctermbg=none guibg=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")

 require("paq-setup") -- when not on nixCats

-vim.opt.background = "dark"
-vim.opt.laststatus = 3
+-- vim.opt.background = "dark"
+-- vim.opt.laststatus = 3
--- a/dots/.config/nvim/lua/ftdetect.lua
+++ b/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",
  },
 })
--- a/dots/.config/nvim/lua/keymaps.lua
+++ b/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" })
--- a/dots/.config/nvim/lua/paq-setup.lua
+++ b/dots/.config/nvim/lua/paq-setup.lua
@ -42,5 +42,4 @@ require("nixCatsUtils.catPacker").setup({
  { "zbirenbaum/copilot.lua" },
  { "zbirenbaum/copilot-cmp" },
  { "qvalentin/helm-ls.nvim", ft = "helm" },
-  { "mikesmithgh/kitty-scrollback.nvim" },
 })
--- a/dots/.config/nvim/lua/plug.lua
+++ b/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
--- a/dots/.config/nvim/lua/skeleton/init.lua
+++ b/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",
-})
--- a/dots/.config/nvim/lua/vim.lua
+++ b/dots/.config/nvim/lua/vim.lua
@ -0,0 +1,5 @@
+vim.cmd([[
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
+source ~/.vimrc"
+]])
--- a/dots/.config/nvim/lua/zk/cmp.lua
+++ b/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)
--- a/dots/.config/nvim/skeletons/flake.nix
+++ b/dots/.config/nvim/skeletons/flake.nix
@ -1,10 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-  };
-
-  outputs =
-    { self, nixpkgs }:
-    {
-    };
-}
--- a/dots/.config/nvim/skeletons/shell.nix
+++ b/dots/.config/nvim/skeletons/shell.nix
@ -1,6 +0,0 @@
-{
-  pkgs ? import <nixpkgs> { },
-}:
-pkgs.mkShell {
-  nativeBuildInputs = with pkgs.buildPackages; [ ];
-}
--- a/dots/.config/nvim/snips/css.lua
+++ b/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),
--- a/dots/.config/nvim/snips/lua.lua
+++ b/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" }),
-  }),
-}
--- a/dots/.config/nvim/snips/pandoc.lua
+++ b/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
--- a/dots/.config/nvim/snips/scheme.lua
+++ b/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("))"),
-  }),
-}
--- a/dots/.config/nvim/snips/tex.lua
+++ b/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("}")),
-})
--- a/dots/.config/task/taskrc
+++ b/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
--- a/dots/.config/task/taskrc.d/desktop-arch
+++ b/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
--- a/dots/.config/task/taskrc.d/locations
+++ b/dots/.config/task/taskrc.d/locations
@ -1,2 +0,0 @@
-data.location=$XDG_DATA_HOME/task/
-hooks.location=$XDG_DATA_HOME/task/hooks
--- a/dots/.config/task/taskrc.d/z-arch
+++ b/dots/.config/task/taskrc.d/z-arch
@ -0,0 +1 @@
+recurrence=off
--- a/dots/.config/user-dirs.conf
+++ b/dots/.config/user-dirs.conf
@ -1 +0,0 @@
-enabled=False
--- a/dots/.gitconfig
+++ b/dots/.gitconfig
@ -21,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"
--- a/dots/.gitignore
+++ b/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
--- a/dots/.config/nvim/after/ftplugin/pandoc/sandwich.vim.lua
+++ b/dots/.config/nvim/after/ftplugin/pandoc/sandwich.vim.lua
@ -1,4 +1,3 @@
-vim.cmd([[
 function GetClozeNumber()
  let REGEX_CLOZE_START = '{{c\d\+::'

@ -34,4 +33,3 @@ let g:sandwich#recipes += [
      \     'nesting':  1
      \   }
      \ ]
-]])
--- a/dots/.config/nvim/after/plugin/md-img-paste.vim.lua
+++ b/dots/.config/nvim/after/plugin/md-img-paste.vim.lua
@ -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>
-]])
--- a/dots/.config/nvim/after/plugin/sandwich.vim.lua
+++ b/dots/.config/nvim/after/plugin/sandwich.vim.lua
@ -1,5 +1,3 @@
-vim.cmd([[
 nmap s <Nop>
 xmap s <Nop>
 let g:sandwich#recipes = deepcopy(g:sandwich#default_recipes)
-]])
--- a/dots/.vim/after/plugin/taskwiki.vim
+++ b/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
--- a/dots/.config/nvim/after/plugin/vim-javascript.vim.lua
+++ b/dots/.config/nvim/after/plugin/vim-javascript.vim.lua
@ -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
-]])
--- a/dots/.config/nvim/after/plugin/vim-pandoc-syntax.vim.lua
+++ b/dots/.config/nvim/after/plugin/vim-pandoc-syntax.vim.lua
@ -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=[]
-]])
--- a/dots/.config/nvim/after/plugin/vim-pandoc.vim.lua
+++ b/dots/.config/nvim/after/plugin/vim-pandoc.vim.lua
@ -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"]
-]])
--- a/dots/.config/nvim/after/plugin/vim-tidal.vim.lua
+++ b/dots/.config/nvim/after/plugin/vim-tidal.vim.lua
@ -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
-]])
--- a/dots/.config/nvim/after/plugin/vimtex.vim.lua
+++ b/dots/.config/nvim/after/plugin/vimtex.vim.lua
@ -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
-]])
--- a/dots/.config/nvim/after/plugin/wiki.vim.lua
+++ b/dots/.config/nvim/after/plugin/wiki.vim.lua
@ -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
 " ...
-]])
--- a/dots/.config/nvim/after/syntax/_comment_keywords.lua
+++ b/dots/.config/nvim/after/syntax/_comment_keywords.lua
@ -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/
-]])
--- a/dots/.vim/after/syntax/pandoc.vim
+++ b/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
--- a/dots/.config/nvim/after/syntax/prolog.lua
+++ b/dots/.config/nvim/after/syntax/prolog.lua
@ -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
--- a/dots/.config/nvim/after/syntax/scheme.lua
+++ b/dots/.config/nvim/after/syntax/scheme.lua
@ -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
--- a/dots/.vim/colors/yang.vim
+++ b/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
--- a/dots/.vim/colors/yin.vim
+++ b/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
--- a/dots/.vim/ftdetect/prolog.vim
+++ b/dots/.vim/ftdetect/prolog.vim
@ -0,0 +1 @@
+autocmd BufNewFile,BufReadPost *.pl set filetype=prolog
--- a/dots/.vim/ftplugin/javascript.vim
+++ b/dots/.vim/ftplugin/javascript.vim
@ -0,0 +1 @@
+set mps+==:;
--- a/dots/.config/nvim/ftplugin/pandoc/anki.lua
+++ b/dots/.config/nvim/ftplugin/pandoc/anki.lua
@ -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
-]])
--- a/dots/.config/nvim/ftplugin/pandoc/wiki.lua
+++ b/dots/.config/nvim/ftplugin/pandoc/wiki.lua
@ -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()
-]])
--- a/dots/.config/nvim/ftplugin/scheme/repl.vim
+++ b/dots/.config/nvim/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
-]])
--- a/dots/.config/nvim/lua/base.lua
+++ b/dots/.config/nvim/lua/base.lua
@ -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
+
+" }}}
--- a/dots/.vim/init/colors.vim
+++ b/dots/.vim/init/colors.vim
@ -0,0 +1,3 @@
+set termguicolors
+set bg=light
+hi Normal ctermbg=none guibg=NONE
--- a/dots/.vim/init/mappings.vim
+++ b/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>
--- a/dots/.vim/init/plugins.vim
+++ b/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()
+" }}}
--- a/dots/.config/nvim/lua/cursor.lua
+++ b/dots/.config/nvim/lua/cursor.lua
@ -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
-]])
--- a/dots/.config/nvim/lua/fold.lua
+++ b/dots/.config/nvim/lua/fold.lua
@ -1,4 +1,3 @@
-vim.cmd([[
 " Folds {{{
 set foldmethod=marker

@ -23,4 +22,3 @@ augroup filetype_snippets
 augroup END

 " }}}
-]])
--- a/dots/.config/nvim/lua/netrw.lua
+++ b/dots/.config/nvim/lua/netrw.lua
@ -1,5 +1,3 @@
-vim.cmd([[
 let g:netrw_winsize = 30
 let g:netrw_liststyle=3
 let g:netrw_banner = 0
-]])
--- a/dots/.config/nvim/lua/pandoc.lua
+++ b/dots/.config/nvim/lua/pandoc.lua
@ -1,4 +1,3 @@
-vim.cmd([[
 fu! Compile()
  if expand('%:e') == "md" 
    :silent exec "!pandoc % -s -o /tmp/op.pdf &"
@ -9,4 +8,3 @@ fu! Preview()
  :call Compile()
  :silent exec "!zathura /tmp/op.pdf &"
 endfu
-]])
--- a/dots/.config/nvim/lua/reload.lua
+++ b/dots/.config/nvim/lua/reload.lua
@ -1,7 +1,5 @@
-vim.cmd([[
 augroup Vim
  au!
  " Reload vim config when ~/.vimrc is changed
  au BufWritePost $HOME/.vimrc so $MYVIMRC | redraw | echo "Reloaded vimrc"
 augroup END
-]])
--- a/dots/.config/nvim/lua/statusline.lua
+++ b/dots/.config/nvim/lua/statusline.lua
@ -1,4 +1,3 @@
-vim.cmd([[
 se ls=2
 se stl=\ %0*%n
 se stl+=\ %m
@ -6,4 +5,3 @@ se stl+=\ %y%0*
 se stl+=\ %<%F
 se stl+=\ %0*%=%5l%*
 se stl+=%0*/%L%*
-]])
--- a/dots/.config/nvim/lua/utils.lua
+++ b/dots/.config/nvim/lua/utils.lua
@ -1,8 +1,6 @@
-vim.cmd([[
 function! SynGroup()
    let l:s = synID(line('.'), col('.'), 1)
    echo synIDattr(l:s, 'name') . ' -> ' . synIDattr(synIDtrans(l:s), 'name')
 endfun

 com! -nargs=0 Syn :call SynGroup()
-]])
--- a/dots/.config/nvim/lua/zk/init.lua
+++ b/dots/.config/nvim/lua/zk/init.lua
@ -1,6 +1,3 @@
-require("zk.cmp")
-
-vim.cmd([[
 let s:zk_preview_enabled = 0
 let s:live_server_job = -1
 au BufEnter /home/h/.zk/*.md silent exe '!echo "%" > /home/h/.zk/current-zettel.txt'
@ -21,4 +18,3 @@ endfunction
 command! ToggleZKPreview call ToggleZKPreview()

 nn <leader>o :ToggleZKPreview<cr> :!xdg-open http://localhost:8080/%:t:r.html & <cr>
-]])
--- a/dots/.vim/snips/all.snippets
+++ b/dots/.vim/snips/all.snippets
@ -0,0 +1,7 @@
+snippet fne "Filename (+extension)" i
+`!p snip.rv = snip.fn`
+endsnippet
+
+# snippet ^fn "Filename basename" ir
+# `!p snip.rv = snip.basename`
+endsnippet
--- a/dots/.vim/snips/css.snippets
+++ b/dots/.vim/snips/css.snippets
@ -0,0 +1,72 @@
+snippet b1(\w+) "Border (1px)" r
+`!p
+import re
+colors = {
+		'r': 'red',
+		'g': 'green',
+		'b': 'blue',
+		'y': 'yellow',
+		'o': 'orange',
+		'p': 'purple',
+		'c': 'cyan',
+		'm': 'magenta',
+		'w': 'white',
+}
+color = colors.get(match.group(1), 'black')
+snip.rv = f"border: 1px solid {color};"
+`$0
+endsnippet
+
+snippet df "Use flexbox layout"
+display: flex;
+$0
+endsnippet
+
+snippet fr "Use row direction (flex)"
+flex-direction: row;
+$0
+endsnippet
+
+snippet fc "Use column direction (flex)"
+flex-direction: column;
+$0
+endsnippet
+
+snippet dfr "Use flexbox layout in row direction"
+display: flex;
+flex-direction: row;
+$0
+endsnippet
+
+snippet dfr "Use flexbox layout in column direction"
+display: flex;
+flex-direction: column;
+$0
+endsnippet
+
+snippet dg "Use CSS grid layout"
+display: grid;
+$0
+endsnippet
+
+snippet db "Use block layout"
+display: block;
+$0
+endsnippet
+
+snippet dn "Set display to 'none'"
+display: none;
+$0
+endsnippet
+
+snippet var "Use CSS variable"
+var(--$1)$0
+endsnippet
+
+snippet m
+margin: $0;
+endsnippet
+
+snippet p
+padding: $0;
+endsnippet
--- a/dots/.vim/snips/glsl.snippets
+++ b/dots/.vim/snips/glsl.snippets
@ -0,0 +1,51 @@
+snippet ifdef
+#ifdef GL_ES
+precision mediump float;
+#endif
+endsnippet
+
+snippet defpi
+#define PI 3.14159265359
+endsnippet
+
+snippet main
+void main() {
+  $1
+}
+endsnippet
+
+snippet uni
+uniform $1;
+endsnippet
+
+snippet unif
+uniform float $1;
+endsnippet
+
+snippet univ
+uniform vec$1 float $2;
+endsnippet
+
+snippet univ2
+uniform vec2 float $1;
+endsnippet
+
+snippet univ3
+uniform vec3 float $1;
+endsnippet
+
+snippet univ4
+uniform vec4 float $1;
+endsnippet
+
+snippet f
+float
+endsnippet
+
+snippet v
+vec
+endsnippet
+
+snippet ss
+smoothstep($1)$2
+endsnippet
--- a/dots/.vim/snips/javascript.snippets
+++ b/dots/.vim/snips/javascript.snippets
@ -0,0 +1,11 @@
+snippet clg "console.log"
+console.log($0)
+endsnippet
+
+snippet Js "JSON.stringify"
+JSON.stringify($0)
+endsnippet
+
+snippet Jsf "JSON.stringify (formatted)"
+JSON.stringify($0, 0, 2)
+endsnippet
--- a/dots/.vim/snips/pandoc.snippets
+++ b/dots/.vim/snips/pandoc.snippets
@ -0,0 +1,900 @@
+
+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 task "Task" i
+* [ ] $1 -- pro:$2
+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
--- a/dots/.vim/snips/scheme.snippets
+++ b/dots/.vim/snips/scheme.snippets
@ -0,0 +1,20 @@
+snippet reqtrace "(#%require racket/trace)" b
+(#%require racket/trace)
+endsnippet
+
+snippet strln "(string-length <string>)" b
+(string-length $0)
+endsnippet
+
+snippet impb "Import rnrs base libraries" b
+(import (rnrs base (6))
+        (rnrs io simple)$0)
+endsnippet
+
+snippet def "(define <name> <variable>)" b
+(define $0 $1)
+endsnippet
+
+snippet defp "(define (<procedure-name> <arguments>))" b
+(define ($0 $1))
+endsnippet
--- a/dots/.vim/snips/svelte.snippets
+++ b/dots/.vim/snips/svelte.snippets
@ -0,0 +1,19 @@
+extends html, javascript, css
+
+snippet oM
+onMount(() => $0)
+endsnippet
+
+snippet oD
+onDestroy(() => $0)
+endsnippet
+
+snippet preJsf "JSON.stringify (formatted and wrapped)"
+<pre>
+{JSON.stringify($0, 0, 2)}
+</pre>
+endsnippet
+
+snippet :g "Open :global("
+:global(
+endsnippet
--- a/dots/.vim/snips/tex.snippets
+++ b/dots/.vim/snips/tex.snippets
@ -0,0 +1,78 @@
+#
+# Inspired by https://castel.dev/post/lecture-notes-1/
+#
+
+snippet beg "begin{} / end{}" b
+\begin{$1}
+	$0
+\end{$1}
+endsnippet
+
+snippet def "begin{definition} / end{definition}" b
+\begin{definition}
+	$0
+\end{defintion}
+endsnippet
+
+snippet fig "begin{figure} / end{figure}" b
+\begin{figure}
+	$0
+\end{figure}
+endsnippet
+
+snippet time "Time"
+`date +%R`
+endsnippet
+
+snippet i
+\textit{$0}
+endsnippet
+
+snippet b
+\textbf{$0}
+endsnippet
+
+snippet center
+\begin{center}
+$0
+\end{center}
+endsnippet
+
+snippet pac
+\usepackage{$0}
+endsnippet
+
+snippet foot
+\footnote{$0}
+endsnippet
+
+# snippet m "Math" wA
+# $${1}$`!p
+# if t[2] and t[2][0] not in [',', '.', '?', '-', ' ']:
+#		snip.rv = ' '
+# else:
+#		snip.rv = ''
+# `$2
+# endsnippet
+
+snippet dm "Math" wA
+\[
+$1
+\]$0
+endsnippet
+
+snippet ch
+\chapter{$0}
+endsnippet
+
+snippet sec
+\section{$0}
+endsnippet
+
+snippet ssec
+\subsection{$0}
+endsnippet
+
+snippet sssec
+\subsubsection{$0}
+endsnippet
--- a/dots/.vimrc
+++ b/dots/.vimrc
@ -0,0 +1,4 @@
+source ~/.vim/init/base.vim
+source ~/.vim/init/mappings.vim
+source ~/.vim/init/plugins.vim
+source ~/.vim/init/colors.vim
--- a/flake.lock
+++ b/flake.lock
@ -21,46 +21,6 @@
        "type": "github"
      }
    },
-    "firefox-addons": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "pkgs/firefox-addons",
-        "lastModified": 1763885608,
-        "narHash": "sha256-eFRbKKMaEHC5EaL7sxfPVFPFsr0Plzx03e1VkJkcsBA=",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "rev": "c94982d5890f4ff0737d57ed97503c1c8d40195c",
-        "type": "gitlab"
-      },
-      "original": {
-        "dir": "pkgs/firefox-addons",
-        "owner": "rycee",
-        "repo": "nur-expressions",
-        "type": "gitlab"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -82,31 +42,13 @@
        "type": "github"
      }
    },
-    "nix-secrets": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1763919406,
-        "narHash": "sha256-WaGxnH7dm63syPt8E4MXbg4XVxQveXPe+cZu3iPz25w=",
-        "ref": "main",
-        "rev": "4423bf215047474ecb89f4d8ad63a04e734b252a",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@github.com/hektor/nix-secrets"
-      },
-      "original": {
-        "ref": "main",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@github.com/hektor/nix-secrets"
-      }
-    },
    "nixCats": {
      "locked": {
-        "lastModified": 1763330129,
-        "narHash": "sha256-KbOeWIF52SV53BOeETGO2C5ewaV2Ex9iaXH7G72gOr8=",
+        "lastModified": 1759730664,
+        "narHash": "sha256-boRlBQ/c4CaHsK/z04QL6+t81mcar37Io94HBX2GflY=",
        "owner": "BirdeeHub",
        "repo": "nixCats-nvim",
-        "rev": "c81551ed87db2aefab30a12cf7425ff94dc0ad64",
+        "rev": "77dffad8235eb77684fcb7599487c8e9f23d5b8f",
        "type": "github"
      },
      "original": {
@ -115,50 +57,13 @@
        "type": "github"
      }
    },
-    "nixgl": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762090880,
-        "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=",
-        "owner": "nix-community",
-        "repo": "nixGL",
-        "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixGL",
-        "type": "github"
-      }
-    },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1762847253,
-        "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1763622513,
-        "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
+        "lastModified": 1760423683,
+        "narHash": "sha256-Tb+NYuJhWZieDZUxN6PgglB16yuqBYQeMJyYBGCXlt8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
+        "rev": "a493e93b4a259cd9fea8073f89a7ed9b1c5a1da2",
        "type": "github"
      },
      "original": {
@ -227,11 +132,11 @@
    "plugins-helm-ls-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1761915179,
-        "narHash": "sha256-W9NRa84l5Cs62OsDeqb+LMxk8oYjhVBCB3o3UmE9a0I=",
+        "lastModified": 1757598429,
+        "narHash": "sha256-nzuJxAAaEmuVYg9k0B8OKslxsihhg6RKlhz6E7xJTQU=",
        "owner": "qvalentin",
        "repo": "helm-ls.nvim",
-        "rev": "d6f3a8d4ad59b4f54cd734267dfb5411679ea608",
+        "rev": "f36ecbd3e7b0b2ac8358a9d6a3213888e29943db",
        "type": "github"
      },
      "original": {
@ -307,49 +212,9 @@
    "root": {
      "inputs": {
        "disko": "disko",
-        "firefox-addons": "firefox-addons",
        "home-manager": "home-manager",
-        "nix-secrets": "nix-secrets",
-        "nixgl": "nixgl",
-        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs",
-        "nvim": "nvim",
-        "sops-nix": "sops-nix"
-      }
-    },
-    "sops-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1763870012,
-        "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=",
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
+        "nvim": "nvim"
      }
    }
  },
--- a/flake.nix
+++ b/flake.nix
@ -3,34 +3,14 @@
    nixpkgs = {
      url = "github:nixos/nixpkgs?ref=nixos-25.05";
    };
-    nixos-hardware = {
-      url = "github:NixOS/nixos-hardware/master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
    disko = {
      url = "github:nix-community/disko/latest";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nix-secrets = {
-      url = "git+ssh://git@github.com/hektor/nix-secrets?shallow=1&ref=main";
-      flake = false;
-    };
    home-manager = {
      url = "github:nix-community/home-manager/release-25.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    nixgl = {
-      url = "github:nix-community/nixGL";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    firefox-addons = {
-      url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
    nvim = {
      url = "path:./dots/.config/nvim";
      inputs.nixpkgs.follows = "nixpkgs";
@ -41,45 +21,20 @@
    {
      self,
      nixpkgs,
-      nixos-hardware,
      disko,
-      sops-nix,
-      nix-secrets,
      home-manager,
-      nixgl,
-      firefox-addons,
      nvim,
-    }@inputs:
-    let
-      system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [ nixgl.overlay ];
-      };
-    in
+    }:
    {
-      nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; # <https://github.com/nix-community/nixd/blob/main/nixd/docs/configuration.md>
      nixosConfigurations = {
        vm = nixpkgs.lib.nixosSystem {
-          modules = [ ./hosts/vm ];
-          specialArgs = { inherit inputs; };
-        };
-        andromache = nixpkgs.lib.nixosSystem {
-          modules = [ ./hosts/andromache ];
-          specialArgs = { inherit inputs; };
-        };
-        astyanax = nixpkgs.lib.nixosSystem {
-          modules = [ ./hosts/astyanax ];
-          specialArgs = { inherit inputs; };
-        };
-      };
-      homeConfigurations = {
-        work = home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          modules = [ ./home/hosts/work ];
-          extraSpecialArgs = {
-            inherit inputs;
-          };
+          system = "x86_64-linux";
+          modules = [
+            disko.nixosModules.disko
+            home-manager.nixosModules.home-manager
+            ./hosts/vm/configuration.nix
+            { environment.systemPackages = [ nvim.packages.x86_64-linux.nvim ]; }
+          ];
        };
      };
    };
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@ -1 +0,0 @@
-import ../astyanax
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@ -1,76 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  ...
-}:
-
-let
-  username = "h";
-in
-{
-  imports = [
-    ../../modules/dconf.nix # TODO: Only enable when on Gnome?
-    ../../modules/git.nix
-    (import ../../modules/taskwarrior.nix {
-      inherit config;
-      inherit pkgs;
-    })
-  ];
-
-  home.stateVersion = "25.05";
-  home.username = username;
-  home.homeDirectory = "/home/${username}";
-
-  xdg.userDirs.createDirectories = false;
-  xdg.userDirs.download = "${config.home.homeDirectory}/dl";
-
-  programs = {
-    bash = {
-      enable = true;
-      enableCompletion = true;
-      initExtra = ''
-        for f in /home/h/.bashrc.d/*; do
-          [ -f "$f" ] && source "$f"
-        done
-
-        source /home/h/.bash_aliases/all
-        source /home/h/.bash_aliases/lang-js
-
-        # host-specific config goes here
-        # ...
-
-        export PATH=${../../../dots/.bin}:$PATH
-      '';
-    };
-    firefox = import ../../modules/firefox.nix {
-      inherit inputs;
-      inherit pkgs;
-      inherit config;
-    };
-    fzf = {
-      enable = true;
-      enableBashIntegration = true;
-    };
-    home-manager.enable = true;
-    keepassxc = import ../../modules/keepassxc.nix;
-  };
-
-  home.packages = import ./packages.nix {
-    inherit pkgs;
-    inherit config;
-  };
-
-  home.file = {
-    ".inputrc".source = ../../../dots/.inputrc;
-    ".bashrc.d/prompt".source = ../../../dots/.bashrc.d/prompt;
-    ".bashrc.d/editor".source = ../../../dots/.bashrc.d/editor;
-    ".bash_aliases/all".source = ../../../dots/.bash_aliases/all;
-    ".bash_aliases/lang-js".source = ../../../dots/.bash_aliases/lang-js;
-    ".config/kitty/kitty.conf".source = ../../../dots/.config/kitty/kitty.conf;
-    ".config/kitty/themes/zenwritten_light.conf".source =
-      ../../../dots/.config/kitty/themes/zenwritten_light.conf;
-    ".config/kitty/themes/zenwritten_dark.conf".source =
-      ../../../dots/.config/kitty/themes/zenwritten_dark.conf;
-  };
-}
--- a/home/hosts/astyanax/packages.nix
+++ b/home/hosts/astyanax/packages.nix
@ -1,53 +0,0 @@
-{ pkgs, ... }:
-
-with pkgs;
-[
-  bash-completion
-  bash-language-server
-  bat
-  brightnessctl
-  entr
-  eslint_d
-  feh
-  fzf
-  gh
-  git
-  haskell-language-server
-  haskellPackages.pandoc-crossref
-  haskellPackages.hadolint
-  htop
-  jq
-  kitty
-  lua-language-server
-  nixfmt-rfc-style
-  nmap
-  nodejs_24
-  nodePackages.ts-node
-  nvimpager
-  ormolu
-  pandoc
-  parallel
-  pass
-  pnpm
-  ripgrep
-  silver-searcher
-  sops
-  sshfs
-  stylelint
-  svelte-language-server
-  tailwindcss-language-server
-  tldr
-  tmux
-  tmuxp
-  tree
-  tree-sitter
-  typescript-language-server
-  unzip
-  vim-language-server
-  vimPlugins.vim-plug
-  vtsls
-  wget
-  xbanish
-  xclip
-  yaml-language-server
-]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hektor Misplon	318524004b	Lock flake	2025-10-15 21:05:53 +02:00
Hektor Misplon	799348ff91	Add minimal readme to my neovim configuration	2025-10-15 21:03:55 +02:00
				`@ -0,0 +1 @@`
				`autocmd BufNewFile,BufReadPost *.pl set filetype=prolog`