fix: merge 'astyanax' services configuration

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

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

.envrc

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

.gitignore

@@ -8,6 +8,3 @@ result
 result-*
 
 nixos-efi-vars.fd
-
-.direnv/
-.pre-commit-config.yaml

.mcp.json

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

README.md

@@ -1,27 +1,15 @@
-# ❄️ NixOS flake
+# NixOS flake
 
-## hosts
+## Set up virtual machine ([`disko`](https://github.com/nix-community/disko/blob/master/docs/interactive-vm.md))
 
-### NixOS
-
-```
-nixos-rebuild switch --flake .#<hostname>
-```
-
-### home manager
-
-```
-home-manager switch --flake .#work
-```
-
-### virtual machines
+1. Build the virtual machine
 
 ```
 nix build -L '.#nixosConfigurations.vm.config.system.build.vmWithDisko'
-./result/bin/disko-vm
 ```
 
-## docs
+2. Run the virtual machine
 
-* [deploy using colmena](./deploy/README.md)
-* [SD installer images](./images/README.md)
+```
+./result/bin/disko-vm
+```

deploy/README.md

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

deploy/colmena.nix

@@ -1,34 +0,0 @@
-{
-  self,
-  inputs,
-}:
-
-let
-  inherit (inputs.nixpkgs) lib;
-  utils = import ../utils { inherit lib; };
-  hostDirNames = utils.dirNames ../hosts;
-
-  mkNode = hostname: meta: {
-    imports = [ ../hosts/${hostname} ];
-    deployment = {
-      inherit (meta.deployment) targetHost targetUser tags;
-      buildOnTarget = builtins.any (t: t != "local" && t != "arm") meta.deployment.tags;
-    };
-  };
-
-  nodes = lib.genAttrs hostDirNames (hostname: mkNode hostname (utils.hostMeta ../hosts/${hostname}));
-in
-inputs.colmena.lib.makeHive (
-  {
-    meta = {
-      nixpkgs = import inputs.nixpkgs { localSystem = "x86_64-linux"; };
-      specialArgs = {
-        inherit inputs;
-        outputs = self;
-        dotsPath = ../dots;
-        myUtils = utils;
-      };
-    };
-  }
-  // nodes
-)

dots/.bash_aliases/all

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

dots/.bashrc

@@ -103,6 +103,13 @@ if [[ -z "${SSH_CONNECTION}" ]]; then
 fi
 # }}}
 
+# pnpm
+export PNPM_HOME="/home/h/.local/share/pnpm"
+case ":$PATH:" in
+  *":$PNPM_HOME:"*) ;;
+  *) export PATH="$PNPM_HOME:$PATH" ;;
+esac
+# pnpm end
 
 # Codi
 # Usage: codi [filetype] [filename]

dots/.bashrc.d/editor

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

dots/.bin/bak

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

dots/.bin/git-cb

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

dots/.bin/save-home

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

dots/.bin/save-zk

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

dots/.bin/sb-pomo

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

dots/.bin/setup-gnome

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

dots/.bin/setup-zk

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

dots/.bin/update-vim

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

dots/.bin/zk

@@ -1,6 +1,8 @@
-current_zettel_path="$(cat "$ZK_PATH/current-zettel.txt")"
+#!/usr/bin/env bash
 
-if [ -n "${TMUX:-}" ]; then
+current_zettel_path="$ZK_PATH/$(cat "$ZK_PATH/current-zettel.txt")"
+
+if [ "$TERM_PROGRAM" = tmux ]; then
   cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
 else
   echo 'Not in tmux'
@@ -10,9 +12,13 @@ else
   read -r -p 'Enter your choice: ' choice
   case $choice in
     1)
-      if tmux has-session -t zk 2>/dev/null; then
-        tmux attach -t zk
+      # Check if a tmux session is running with a window named zk
+      if tmux list-windows -F '#{window_name}' | grep -q zk; then
+        # Attach to the session containing the 'zk' window
+        session="$(tmux list-windows -F '#{window_name} #{session_name}' | grep zk | head -n 1 | awk '{ print $2 }')"
+        tmux attach -t "$session"
       else
+        # Create session with a window named 'zk' and start nvim
         tmux new-session -s zk -n zk -d
         tmux send-keys -t zk:zk "cd $ZK_PATH && $EDITOR $current_zettel_path" Enter
         tmux attach -t zk

dots/.config/kitty/kitty.conf

@@ -163,4 +163,5 @@ map cmd+q
 
 #: }}}
 
+include ./themes/zenwritten_dark.conf
 include ./nvim.conf

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

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

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

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

dots/.config/ncspot/config.toml

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

dots/.config/ncspot/credentials.toml

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

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

@@ -13,7 +13,6 @@ if ok then
   cc_config.interactions = cc_config.interactions or {}
   cc_config.interactions.chat = cc_config.interactions.chat or {}
   cc_config.interactions.chat.tools = cc_config.interactions.chat.tools or {}
-  cc_config.interactions.chat.variables = cc_config.interactions.chat.variables or {}
 
   require("mcphub.extensions.codecompanion").setup({
     make_vars = true,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

dots/.config/nvim/flake.lock

@@ -42,11 +42,11 @@
     },
     "nixCats": {
       "locked": {
-        "lastModified": 1777273601,
-        "narHash": "sha256-xBUa8Tl9V7IXI+VmLEuDc81La/EhoSn1C3EVSnJ3cfU=",
+        "lastModified": 1767604651,
+        "narHash": "sha256-itAnxzTpWpY1s3LA/oNngOuZDXT5U5JUZP5fApwx9gs=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "f69ea013e328841a7def7037ed59788a76be8816",
+        "rev": "3c9bc4d7123e1b48d92f25ba505b889af541e897",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1777270315,
-        "narHash": "sha256-yKB4G6cKsQsWN7M6rZGk6gkJPDNPIzT05y4qzRyCDlI=",
+        "lastModified": 1768302833,
+        "narHash": "sha256-h5bRFy9bco+8QcK7rGoOiqMxMbmn21moTACofNLRMP4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6368eda62c9775c38ef7f714b2555a741c20c72d",
+        "rev": "61db79b0c6b838d9894923920b612048e1201926",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
     "plugins-helm-ls-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1773934114,
-        "narHash": "sha256-8trqFsA7nTKSdtkiAL0Sa9bXjh5ONtAqN7XNE/B8ukM=",
+        "lastModified": 1761915179,
+        "narHash": "sha256-W9NRa84l5Cs62OsDeqb+LMxk8oYjhVBCB3o3UmE9a0I=",
         "owner": "qvalentin",
         "repo": "helm-ls.nvim",
-        "rev": "20df43509b02a3ce3c6b3eee254d6e2bffa9a370",
+        "rev": "d6f3a8d4ad59b4f54cd734267dfb5411679ea608",
         "type": "github"
       },
       "original": {
@@ -119,14 +119,30 @@
         "type": "github"
       }
     },
+    "plugins-m-taskwarrior-d-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767960157,
+        "narHash": "sha256-ov0qi4LhIlwqrBzSbTJ6APC5qjl2d/vlKWJfW5ZiDrg=",
+        "owner": "huantrinh1802",
+        "repo": "m_taskwarrior_d.nvim",
+        "rev": "107247387cd81823046bc2b8e71150c8edf041d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "huantrinh1802",
+        "repo": "m_taskwarrior_d.nvim",
+        "type": "github"
+      }
+    },
     "plugins-mcphub-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768730387,
-        "narHash": "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=",
+        "lastModified": 1765628564,
+        "narHash": "sha256-nvWqCGRKhbUHsAM/zd+cwFdcoXXxf6EmcCkpN4mElf4=",
         "owner": "ravitemer",
         "repo": "mcphub.nvim",
-        "rev": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f",
+        "rev": "5193329d510a68f1f5bf189960642c925c177a3a",
         "type": "github"
       },
       "original": {
@@ -190,6 +206,7 @@
         "nixpkgs": "nixpkgs_2",
         "plugins-beancount-nvim": "plugins-beancount-nvim",
         "plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
+        "plugins-m-taskwarrior-d-nvim": "plugins-m-taskwarrior-d-nvim",
         "plugins-mcphub-nvim": "plugins-mcphub-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
         "plugins-shipwright-nvim": "plugins-shipwright-nvim",

dots/.config/nvim/flake.nix

@@ -8,10 +8,10 @@
       url = "github:rktjmp/shipwright.nvim";
       flake = false;
     };
-    # plugins-m-taskwarrior-d-nvim = {
-    #   url = "github:huantrinh1802/m_taskwarrior_d.nvim";
-    #   flake = false;
-    # };
+    plugins-m-taskwarrior-d-nvim = {
+      url = "github:huantrinh1802/m_taskwarrior_d.nvim";
+      flake = false;
+    };
     plugins-beancount-nvim = {
       url = "github:polarmutex/beancount.nvim";
       flake = false;
@@ -37,6 +37,7 @@
 
   outputs =
     {
+      self,
       nixpkgs,
       nixCats,
       ...
@@ -45,38 +46,13 @@
       inherit (nixCats) utils;
       luaPath = ./.;
       forEachSystem = utils.eachSystem nixpkgs.lib.platforms.all;
-      extra_pkg_config = {
-        allowUnfreePredicate =
-          pkg:
-          builtins.elem (nixpkgs.lib.getName pkg) [
-            "vim-sandwich"
-            "jupytext.nvim"
-            "eyeliner.nvim"
-            "context_filetype.vim"
-            "editorconfig-vim"
-            "unicode.vim"
-            "quarto-nvim"
-            "vim-openscad"
-            "lsp_lines.nvim"
-            "nvim-highlight-colors"
-            "nvim-lint"
-          ];
-      };
+      extra_pkg_config = { };
 
       mkDependencyOverlays = system: [
         (utils.standardPluginOverlay inputs)
-        (_final: _prev: {
+        (final: prev: {
           mcp-hub = inputs.mcp-hub.packages.${system}.default;
         })
-        (_: prev: {
-          luajitPackages = prev.luajitPackages.overrideScope (
-            _: lprev: {
-              neotest = lprev.neotest.overrideAttrs (_: {
-                doCheck = false;
-              });
-            }
-          );
-        })
       ];
 
       categoryDefinitions =
@@ -87,40 +63,27 @@
         {
           lspsAndRuntimeDeps = with pkgs; {
             general = [
-              nodejs_24
               black
               clang
               clang-tools
-              curl # → plenary-nvim, mcp-hub
               delta
-              emmet-language-server
-              eslint_d
               fd
               gawk
               gdtoolkit_4
-              hadolint
-              helm-ls
               isort
-              lua-language-server
               mcp-hub
               nixd
               nixfmt
-              prettier
-              typescript-language-server
+              nodePackages.prettier
+              nodePackages.typescript-language-server
               ormolu
               prettierd
-              rust-analyzer
               rustfmt
               shellcheck-minimal
               stylelint
               stylua
               tree-sitter
-              tailwindcss-language-server
-              typescript-language-server
               vscode-langservers-extracted
-              vtsls
-              yaml-language-server
-              yamllint
             ];
           };
 
@@ -172,7 +135,7 @@
               zenbones-nvim
               nvim-treesitter.withAllGrammars
               nvim-treesitter-textobjects
-              # nvim-treesitter-context
+              nvim-treesitter-context
               nvim-ts-context-commentstring
               treesj
               sniprun
@@ -192,7 +155,7 @@
               kitty-scrollback-nvim
               fidget-nvim
               rustaceanvim
-              # pkgs.neovimPlugins.m-taskwarrior-d-nvim
+              pkgs.neovimPlugins.m-taskwarrior-d-nvim
               claude-code-nvim
             ];
           };
@@ -210,7 +173,9 @@
         };
 
       packageDefinitions = {
-        nvim = _: {
+        nvim =
+          { ... }:
+          {
             settings = {
               suffix-path = true;
               suffix-LD = true;

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

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

dots/.config/nvim/init.lua

@@ -1,7 +1,10 @@
 require("nixCatsUtils").setup({ non_nix_value = true }) -- https://github.com/BirdeeHub/nixCats-nvim/blob/77dffad8235eb77684fcb7599487c8e9f23d5b8f/templates/example/init.lua
 
-vim.opt.termguicolors = true
-vim.api.nvim_set_hl(0, "Normal", { ctermbg = "NONE", bg = "NONE" })
+vim.cmd([[
+set termguicolors
+set bg=light
+hi Normal ctermbg=none guibg=NONE
+]])
 
 require("base")
 require("cursor")
@@ -19,5 +22,7 @@ require("utils")
 require("zk")
 require("reload")
 
+require("paq-setup") -- when not on nixCats
+
 vim.opt.background = "dark"
 vim.opt.laststatus = 3

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

dots/.config/nvim/vscode.lua

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

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

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

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

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

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

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

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

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

dots/.config/tmux/tmux.conf

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

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

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

dots/.gitconfig

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

dots/.gitignore

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

dots/.resticexclude

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

dots/.resticinclude

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

flake.lock

@@ -1,97 +1,5 @@
 {
   "nodes": {
-    "base16": {
-      "inputs": {
-        "fromYaml": "fromYaml"
-      },
-      "locked": {
-        "lastModified": 1755819240,
-        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "type": "github"
-      }
-    },
-    "base16-fish": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1765809053,
-        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
-        "type": "github"
-      }
-    },
-    "base16-helix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1776754714,
-        "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "type": "github"
-      }
-    },
-    "base16-vim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732806396,
-        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      }
-    },
-    "colmena": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "stable": "stable"
-      },
-      "locked": {
-        "lastModified": 1762034856,
-        "narHash": "sha256-QVey3iP3UEoiFVXgypyjTvCrsIlA4ecx6Acaz5C8/PQ=",
-        "owner": "zhaofengli",
-        "repo": "colmena",
-        "rev": "349b035a5027f23d88eeb3bc41085d7ee29f18ed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli",
-        "repo": "colmena",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -99,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768920986,
-        "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=",
+        "lastModified": 1746728054,
+        "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "de5708739256238fb912c62f03988815db89ec9a",
+        "rev": "ff442f5d1425feb86344c028298548024f21256d",
         "type": "github"
       },
       "original": {
@@ -121,11 +29,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1778040175,
-        "narHash": "sha256-SSXJp3BMjO2LrW/VLjNdGGcjd3RFEyV4FemYA6OGrYw=",
+        "lastModified": 1768622624,
+        "narHash": "sha256-Em6PP667PeXbEjidbV2LnNwmUYohbrSFvVPLYLUDHms=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "3bd76b0f41e65661866bddcac57ebe83aeadb581",
+        "rev": "8061c6d9199dc6cc0727d4241959eea28f2fa0a6",
         "type": "gitlab"
       },
       "original": {
@@ -135,54 +43,6 @@
         "type": "gitlab"
       }
     },
-    "firefox-gnome-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1776136500,
-        "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -205,43 +65,7 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1775087534,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "inputs": {
         "systems": "systems"
       },
@@ -259,82 +83,6 @@
         "type": "github"
       }
     },
-    "fromYaml": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731966426,
-        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "type": "github"
-      }
-    },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1776796298,
-        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "gnome-shell": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767737596,
-        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -342,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778009629,
-        "narHash": "sha256-nUoQtf4Zq7DRYJrfv904hjrxjAlWVP6a1pNNFKx3FCg=",
+        "lastModified": 1768598210,
+        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "00ed86e58bb6979a7921859fd1615d19382eac5c",
+        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
         "type": "github"
       },
       "original": {
@@ -374,34 +122,13 @@
         "type": "github"
       }
     },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "colmena",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729742964,
-        "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
     "nix-secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1776723456,
-        "narHash": "sha256-GBbbm05oXYqSZ2EgxQPsNpTKl16wNhvrlUxdmv0FbSU=",
+        "lastModified": 1768414240,
+        "narHash": "sha256-M/MObXs5oHjUGnKYMwU6Lrl/CfA1RMLGqJYytkfPXjg=",
         "ref": "main",
-        "rev": "135b681d24af6ee4508bbf7c657982d7be8743d4",
+        "rev": "601921b44c3794e899bd31c0f302e9a9f5e6c480",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@github.com/hektor/nix-secrets"
@@ -415,11 +142,11 @@
     },
     "nixCats": {
       "locked": {
-        "lastModified": 1777273601,
-        "narHash": "sha256-xBUa8Tl9V7IXI+VmLEuDc81La/EhoSn1C3EVSnJ3cfU=",
+        "lastModified": 1767604651,
+        "narHash": "sha256-itAnxzTpWpY1s3LA/oNngOuZDXT5U5JUZP5fApwx9gs=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "f69ea013e328841a7def7037ed59788a76be8816",
+        "rev": "3c9bc4d7123e1b48d92f25ba505b889af541e897",
         "type": "github"
       },
       "original": {
@@ -430,7 +157,7 @@
     },
     "nixgl": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -451,11 +178,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1777917524,
-        "narHash": "sha256-k+LVe9YaO2BEPB9AaCtTtOMCeGi4dxDo6gt4Un3qoPY=",
+        "lastModified": 1768584846,
+        "narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "df7783100babf59001340a7a874ba3824e441ecb",
+        "rev": "cce68f4a54fa4e3d633358364477f5cc1d782440",
         "type": "github"
       },
       "original": {
@@ -467,11 +194,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777954456,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "lastModified": 1768564909,
+        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
         "type": "github"
       },
       "original": {
@@ -497,31 +224,6 @@
         "type": "github"
       }
     },
-    "nur": {
-      "inputs": {
-        "flake-parts": [
-          "stylix",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1777598946,
-        "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
     "nvim": {
       "inputs": {
         "mcp-hub": "mcp-hub",
@@ -531,6 +233,7 @@
         ],
         "plugins-beancount-nvim": "plugins-beancount-nvim",
         "plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
+        "plugins-m-taskwarrior-d-nvim": "plugins-m-taskwarrior-d-nvim",
         "plugins-mcphub-nvim": "plugins-mcphub-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
         "plugins-shipwright-nvim": "plugins-shipwright-nvim",
@@ -565,11 +268,11 @@
     "plugins-helm-ls-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1773934114,
-        "narHash": "sha256-8trqFsA7nTKSdtkiAL0Sa9bXjh5ONtAqN7XNE/B8ukM=",
+        "lastModified": 1761915179,
+        "narHash": "sha256-W9NRa84l5Cs62OsDeqb+LMxk8oYjhVBCB3o3UmE9a0I=",
         "owner": "qvalentin",
         "repo": "helm-ls.nvim",
-        "rev": "20df43509b02a3ce3c6b3eee254d6e2bffa9a370",
+        "rev": "d6f3a8d4ad59b4f54cd734267dfb5411679ea608",
         "type": "github"
       },
       "original": {
@@ -578,14 +281,30 @@
         "type": "github"
       }
     },
+    "plugins-m-taskwarrior-d-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767960157,
+        "narHash": "sha256-ov0qi4LhIlwqrBzSbTJ6APC5qjl2d/vlKWJfW5ZiDrg=",
+        "owner": "huantrinh1802",
+        "repo": "m_taskwarrior_d.nvim",
+        "rev": "107247387cd81823046bc2b8e71150c8edf041d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "huantrinh1802",
+        "repo": "m_taskwarrior_d.nvim",
+        "type": "github"
+      }
+    },
     "plugins-mcphub-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768730387,
-        "narHash": "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=",
+        "lastModified": 1765628564,
+        "narHash": "sha256-nvWqCGRKhbUHsAM/zd+cwFdcoXXxf6EmcCkpN4mElf4=",
         "owner": "ravitemer",
         "repo": "mcphub.nvim",
-        "rev": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f",
+        "rev": "5193329d510a68f1f5bf189960642c925c177a3a",
         "type": "github"
       },
       "original": {
@@ -644,18 +363,15 @@
     },
     "root": {
       "inputs": {
-        "colmena": "colmena",
         "disko": "disko",
         "firefox-addons": "firefox-addons",
-        "git-hooks": "git-hooks",
         "home-manager": "home-manager",
         "nix-secrets": "nix-secrets",
         "nixgl": "nixgl",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nvim": "nvim",
-        "sops-nix": "sops-nix",
-        "stylix": "stylix"
+        "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
@@ -665,11 +381,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777944972,
-        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
+        "lastModified": 1768481291,
+        "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
+        "rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
         "type": "github"
       },
       "original": {
@@ -678,55 +394,6 @@
         "type": "github"
       }
     },
-    "stable": {
-      "locked": {
-        "lastModified": 1750133334,
-        "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "36ab78dab7da2e4e27911007033713bab534187b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "stylix": {
-      "inputs": {
-        "base16": "base16",
-        "base16-fish": "base16-fish",
-        "base16-helix": "base16-helix",
-        "base16-vim": "base16-vim",
-        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_2",
-        "gnome-shell": "gnome-shell",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nur": "nur",
-        "systems": "systems_2",
-        "tinted-kitty": "tinted-kitty",
-        "tinted-schemes": "tinted-schemes",
-        "tinted-tmux": "tinted-tmux",
-        "tinted-zed": "tinted-zed"
-      },
-      "locked": {
-        "lastModified": 1777835090,
-        "narHash": "sha256-VLH8zPweblCOvpnQXp4fVs7f6Q79YhXF5XFKlOrvIFk=",
-        "owner": "danth",
-        "repo": "stylix",
-        "rev": "7989a1054b01153212dede6005abfd1576b8328c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "danth",
-        "repo": "stylix",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -741,85 +408,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tinted-kitty": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735730497,
-        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "type": "github"
-      }
-    },
-    "tinted-schemes": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1777041405,
-        "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "type": "github"
-      }
-    },
-    "tinted-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1777169200,
-        "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "type": "github"
-      }
-    },
-    "tinted-zed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1777463218,
-        "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -3,10 +3,6 @@
     nixpkgs = {
       url = "github:nixos/nixpkgs/nixos-unstable";
     };
-    stylix = {
-      url = "github:danth/stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nixos-hardware = {
       url = "github:NixOS/nixos-hardware/master";
     };
@@ -38,134 +34,48 @@
       url = "path:./dots/.config/nvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    colmena = {
-      url = "github:zhaofengli/colmena";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    git-hooks = {
-      url = "github:cachix/git-hooks.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
     {
       self,
       nixpkgs,
+      nixos-hardware,
+      disko,
+      sops-nix,
+      nix-secrets,
       home-manager,
       nixgl,
-      git-hooks,
-      ...
+      firefox-addons,
+      nvim,
     }@inputs:
     let
-      inherit (self) outputs;
-      inherit (inputs.nixpkgs) lib;
-      myUtils = import ./utils { inherit lib; };
-      hostDirNames = myUtils.dirNames ./hosts;
+      lib = inputs.nixpkgs.lib;
+      utils = import ./utils { inherit lib; };
+      hostDirNames = utils.dirNames ./hosts;
       system = "x86_64-linux";
-      dotsPath = ./dots;
-      gitHooks = import ./git-hooks.nix {
-        inherit nixpkgs git-hooks system;
-        src = ./.;
-      };
-    in
-    {
-      nixosConfigurations =
-        (lib.genAttrs hostDirNames (
-          host:
-          nixpkgs.lib.nixosSystem {
-            modules = [
-              ./hosts/${host}
-              {
-                nixpkgs.hostPlatform = (myUtils.hostMeta ./hosts/${host}).system;
-                host.name = host;
-              }
-            ];
-            specialArgs = {
-              inherit
-                inputs
-                outputs
-                dotsPath
-                myUtils
-                ;
-            };
-          }
-        ))
-        // {
-          sd-image-orange-pi-aarch64 = nixpkgs.lib.nixosSystem {
-            modules = [
-              "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
-              ./images/sd-image-orange-pi-aarch64.nix
-              {
-                nixpkgs.buildPlatform = "x86_64-linux";
-                nixpkgs.hostPlatform = "aarch64-linux";
-              }
-            ];
-            specialArgs = {
-              inherit
-                inputs
-                outputs
-                dotsPath
-                myUtils
-                ;
-            };
-          };
-          sd-image-raspberry-pi-aarch64 = nixpkgs.lib.nixosSystem {
-            modules = [
-              "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
-              ./images/sd-image-raspberry-pi-aarch64.nix
-              {
-                nixpkgs.buildPlatform = "x86_64-linux";
-                nixpkgs.hostPlatform = "aarch64-linux";
-              }
-            ];
-            specialArgs = {
-              inherit
-                inputs
-                outputs
-                dotsPath
-                myUtils
-                ;
-            };
-          };
-        };
-
-      homeConfigurations = {
-        work = home-manager.lib.homeManagerConfiguration {
       pkgs = import nixpkgs {
         inherit system;
         overlays = [ nixgl.overlay ];
       };
+    in
+    {
+      nix.nixPath = [
+        "nixpkgs=${inputs.nixpkgs}"
+      ]; # <https://github.com/nix-community/nixd/blob/main/nixd/docs/configuration.md>
+      nixosConfigurations = lib.genAttrs hostDirNames (
+        host:
+        nixpkgs.lib.nixosSystem {
+          modules = [ ./hosts/${host} ];
+          specialArgs = { inherit inputs; };
+        }
+      );
+      homeConfigurations = {
+        work = home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
           modules = [ ./home/hosts/work ];
-          extraSpecialArgs = {
-            inherit
-              inputs
-              outputs
-              dotsPath
-              myUtils
-              ;
+          extraSpecialArgs = { inherit inputs; };
         };
       };
     };
-
-      apps.${system}.colmena = inputs.colmena.apps.${system}.default;
-
-      colmenaHive = import ./deploy/colmena.nix {
-        inherit
-          self
-          inputs
-          ;
-      };
-
-      checks.${system} = gitHooks.checks;
-      formatter.${system} = gitHooks.formatter;
-      devShells.${system} = gitHooks.devShells;
-
-      legacyPackages.${system} = {
-        sd-image-orange-pi-aarch64 =
-          self.nixosConfigurations.sd-image-orange-pi-aarch64.config.system.build.sdImage;
-        sd-image-raspberry-pi-aarch64 =
-          self.nixosConfigurations.sd-image-raspberry-pi-aarch64.config.system.build.sdImage;
-      };
-    };
 }

git-hooks.nix

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

home/hosts/andromache/default.nix

@@ -1,69 +1,55 @@
 {
   lib,
+  inputs,
   config,
   pkgs,
   ...
 }:
 
+let
+  username = "h";
+in
 {
   imports = [
-    ../../modules
-    ../../modules/3d
-    ../../modules/ai-tools
-    ../../modules/anki
-    ../../modules/audio
-    ../../modules/browser
-    ../../modules/cloud
-    ../../modules/comms
     ../../modules/desktop/niri
-    ../../modules/devenv
-    ../../modules/direnv
-    ../../modules/git
-    ../../modules/k8s/k9s.nix
-    ../../modules/keepassxc
-    ../../modules/music
-    ../../modules/nvim
-    ../../modules/pandoc
-    ../../modules/photography
-    ../../modules/secrets
+    ../../modules/git.nix
+    ../../modules/k9s.nix
+    ../../modules/taskwarrior.nix
+    ../../modules/keepassxc.nix
+    ../../modules/anki.nix
+    ../../modules/browser
     ../../modules/shell
-    ../../modules/ssh
-    ../../modules/taskwarrior
-    ../../modules/terminal
-    ../../modules/zk
-    ../../modules/torrenting
   ];
 
-  home = {
-    stateVersion = "25.05";
-    inherit (config.host) username;
-    homeDirectory = "/home/${config.host.username}";
-  };
+  home.stateVersion = "25.05";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
 
   xdg.userDirs.createDirectories = false;
   xdg.userDirs.download = "${config.home.homeDirectory}/dl";
 
-  modules."3d" = {
-    printing.enable = true;
-    modeling.enable = true;
-  };
-  ai-tools = {
-    claude-code.enable = true;
-    opencode.enable = true;
-  };
   browser.primary = "librewolf";
-  cloud.hetzner.enable = true;
-  comms.signal.enable = true;
-  git.github.enable = true;
-  shell.bash.aliases.lang-js = true;
-  shell.bash.addBinToPath = true;
-  torrenting.enable = true;
-  zk.enable = true;
+
+  shell.bash = {
+    enable = true;
+    aliases.lang-js = true;
+  };
 
   programs = {
     home-manager.enable = true;
     taskwarrior.config.recurrence = lib.mkForce "on";
   };
 
-  home.packages = import ../packages.nix { inherit pkgs; };
+  home.packages = import ../packages.nix {
+    inherit pkgs;
+    inherit config;
+  };
+
+  home.file = {
+    ".config/kitty/kitty.conf".source = ../../../dots/.config/kitty/kitty.conf;
+    ".config/kitty/themes/zenwritten_light.conf".source =
+      ../../../dots/.config/kitty/themes/zenwritten_light.conf;
+    ".config/kitty/themes/zenwritten_dark.conf".source =
+      ../../../dots/.config/kitty/themes/zenwritten_dark.conf;
+  };
 }

home/hosts/astyanax/default.nix

@@ -1,58 +1,38 @@
 {
+  inputs,
   config,
   pkgs,
   ...
 }:
 
+let
+  username = "h";
+in
 {
   imports = [
-    ../../modules
-    ../../modules/3d
-    ../../modules/ai-tools
-    ../../modules/anki
-    ../../modules/audio
-    ../../modules/browser
-    ../../modules/cloud
-    ../../modules/comms
+    ../../modules/anki.nix
     ../../modules/desktop/niri
-    ../../modules/devenv
-    ../../modules/direnv
-    ../../modules/git
-    ../../modules/k8s/k9s.nix
-    ../../modules/keepassxc
-    ../../modules/music
-    ../../modules/nfc
-    ../../modules/nvim
-    ../../modules/pandoc
-    ../../modules/secrets
+    ../../modules/git.nix
+    ../../modules/k9s.nix
+    ../../modules/taskwarrior.nix
+    ../../modules/keepassxc.nix
+    ../../modules/browser
     ../../modules/shell
-    ../../modules/ssh
-    ../../modules/taskwarrior
-    ../../modules/terminal
   ];
 
-  home = {
-    stateVersion = "25.05";
-    inherit (config.host) username;
-    homeDirectory = "/home/${config.host.username}";
-  };
+  home.stateVersion = "25.05";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
 
-  xdg.userDirs = {
-    enable = false;
-    createDirectories = false;
-  };
+  xdg.userDirs.createDirectories = false;
+  xdg.userDirs.download = "${config.home.homeDirectory}/dl";
 
-  modules."3d".printing.enable = true;
-  ai-tools = {
-    claude-code.enable = true;
-    opencode.enable = true;
-  };
   browser.primary = "librewolf";
-  cloud.hetzner.enable = true;
-  comms.signal.enable = true;
-  git.github.enable = true;
-  shell.bash.aliases.lang-js = true;
-  shell.bash.addBinToPath = true;
+
+  shell.bash = {
+    enable = true;
+    aliases.lang-js = true;
+  };
 
   programs = {
     home-manager.enable = true;
@@ -62,4 +42,12 @@
     inherit pkgs;
     inherit config;
   };
+
+  home.file = {
+    ".config/kitty/kitty.conf".source = ../../../dots/.config/kitty/kitty.conf;
+    ".config/kitty/themes/zenwritten_light.conf".source =
+      ../../../dots/.config/kitty/themes/zenwritten_light.conf;
+    ".config/kitty/themes/zenwritten_dark.conf".source =
+      ../../../dots/.config/kitty/themes/zenwritten_dark.conf;
+  };
 }

home/hosts/packages.nix

@@ -2,21 +2,36 @@
 
 with pkgs;
 [
+  bash-completion
   bat
   entr
   feh
   fzf
+  gh
+  git
+  haskellPackages.pandoc-crossref
   htop
   jq
+  kitty
+  nixfmt-rfc-style
   nmap
+  nodejs_24
   nvimpager
+  pandoc
   parallel
   pass
+  pnpm
+  python3
   ripgrep
+  signal-desktop
   silver-searcher
   sops
+  sshfs
   tldr
+  tmux
+  tmuxp
   tree
   unzip
+  vimPlugins.vim-plug
   wget
 ]

home/hosts/work/default.nix

@@ -5,95 +5,61 @@
   ...
 }:
 
+let
+  username = "hektor";
+in
 {
   imports = [
     inputs.sops-nix.homeManagerModules.sops
-    ../../modules
-    ../../modules/ai-tools
-    ../../modules/anki
+    ../../modules/dconf.nix
+    ../../modules/git.nix
+    ../../modules/k9s.nix
+    ../../modules/keepassxc.nix
     ../../modules/browser
-    ../../modules/bruno
-    ../../modules/cloud
-    ../../modules/comms
-    ../../modules/database
-    ../../modules/dconf
-    ../../modules/desktop/niri
-    ../../modules/devenv
-    ../../modules/direnv
-    ../../modules/docker
-    ../../modules/git
-    ../../modules/go
-    ../../modules/infra
-    ../../modules/k8s
-    ../../modules/k8s/k9s.nix
-    ../../modules/keepassxc
-    ../../modules/music
-    ../../modules/nodejs
-    ../../modules/nvim
-    ../../modules/pandoc
-    ../../modules/secrets
-    ../../modules/shell
-    ../../modules/stylix
-    ../../modules/taskwarrior
-    ../../modules/ticketing
-    ../../modules/terminal
-    ../../modules/vscode
+    ../../modules/taskwarrior.nix
   ];
 
-  sops.age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
+  sops = {
+    age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
+    defaultSopsFile = "${inputs.nix-secrets}/secrets.yaml";
+
+    secrets = {
+      taskwarrior_sync_server_url = {};
+      taskwarrior_sync_server_client_id = {};
+      taskwarrior_sync_encryption_secret = {};
+      anki_sync_user = {};
+      anki_sync_key = {};
+    };
+
+    templates."taskrc.d/sync" = {
+      content = ''
+        sync.server.url=${config.sops.placeholder.taskwarrior_sync_server_url}
+        sync.server.client_id=${config.sops.placeholder.taskwarrior_sync_server_client_id}
+        sync.encryption_secret=${config.sops.placeholder.taskwarrior_sync_encryption_secret}
+      '';
+    };
+  };
 
   nixpkgs.config.allowUnfree = true;
 
-  xdg = {
-    systemDirs.config = [ "/etc/xdg" ];
-    userDirs = {
-      createDirectories = false;
-      download = "${config.home.homeDirectory}/dl";
-    };
-  };
-
-  home = {
-    stateVersion = "25.05";
-    username = "hektor";
-    homeDirectory = "/home/${config.home.username}";
-  };
+  home.stateVersion = "25.05";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
 
   targets.genericLinux.nixGL = {
-    inherit (inputs.nixgl) packages;
+    packages = inputs.nixgl.packages;
     defaultWrapper = "mesa";
   };
 
   browser.primary = "firefox";
   browser.secondary = "chromium";
-  cloud.azure.enable = true;
-  comms.signal.enable = true;
-  comms.teams.enable = true;
-  ai-tools = {
-    claude-code.enable = true;
-    tirith.enable = true;
-    opencode.enable = true;
-  };
-  database = {
-    mssql.enable = true;
-    postgresql.enable = true;
-    redis.enable = true;
-  };
-  git.github.enable = true;
-  git.gitlab.enable = true;
-  secrets.vault.enable = true;
 
   programs = {
     gh.enable = true;
     kubecolor.enable = true;
   };
 
-  home.packages =
-    import ./packages.nix {
-      inherit inputs;
-      inherit config;
-      inherit pkgs;
-    }
-    ++ import ../packages.nix {
+  home.packages = import ./packages.nix {
     inherit inputs;
     inherit config;
     inherit pkgs;

home/hosts/work/packages.local.nix

@@ -0,0 +1,124 @@
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}:
+
+with pkgs;
+[
+  (pkgs.stdenv.mkDerivation {
+    name = "ccline";
+    src = pkgs.fetchurl {
+      url = "https://github.com/Haleclipse/CCometixLine/releases/download/v1.0.8/ccline-linux-x64.tar.gz";
+      hash = "sha256-Joe3Dd6uSMGi66QT6xr2oY/Tz8rA5RuKa6ckBVJIzI0=";
+    };
+
+    unpackPhase = ''
+      tar xzf $src
+    '';
+
+    installPhase = ''
+      mkdir -p $out/bin
+      cp ccline $out/bin/
+      chmod +x $out/bin/ccline
+    '';
+
+    meta = with pkgs.lib; {
+      description = "CCometixLine Linux x64 CLI (Claude Code statusline)";
+      homepage = "https://github.com/Haleclipse/CCometixLine";
+      license = licenses.mit;
+      platforms = [ "x86_64-linux" ];
+    };
+  })
+
+  act
+  age
+  aider-chat
+  argocd
+  azure-cli
+  bat
+  biome
+  (config.lib.nixGL.wrap bruno)
+  chromium
+  clang
+  claude-code
+  (config.lib.nixGL.wrap code-cursor)
+  curl
+  dconf2nix
+  dive
+  emmet-language-server
+  eslint_d
+  flameshot
+  fluxcd
+  fzf
+  fzf-git-sh
+  git-machete
+  github-copilot-cli
+  glab
+  go
+  hadolint
+  hello
+  helm-ls
+  htop
+  input-leap
+  jira-cli-go
+  jq
+  k3d
+  (config.lib.nixGL.wrap kitty)
+  kubectl
+  kubernetes
+  kubernetes-helm
+  kustomize
+  lua
+  lua-language-server
+  minikube
+  ncspot
+  nil
+  nixd
+  nixfmt-rfc-style
+  # nodejs
+  nodejs_24
+  nvimpager
+  (config.lib.nixGL.wrap obsidian)
+  pavucontrol
+  # pgadmin4
+  prettierd
+  responder
+  ripgrep
+  rust-analyzer
+  rustlings
+  shellcheck
+  (config.lib.nixGL.wrap signal-desktop)
+  silver-searcher
+  sleuthkit
+  spotify
+  starship
+  stylua
+  taskopen
+  taskwarrior3
+  (config.lib.nixGL.wrap teams-for-linux)
+  opentofu
+  sops
+  tldr
+  tmux
+  tree
+  tree-sitter
+  tsx
+  upbound
+  vault-bin
+  (config.lib.nixGL.wrap vscode)
+  vscode-langservers-extracted
+  vtsls
+  yaml-language-server
+  xclip
+  xmage
+  yamllint
+  yarn
+  (python314.withPackages (ppkgs: [
+    ppkgs.plyer
+    ppkgs.dbus-python
+  ]))
+  # flakes
+  inputs.nvim.packages.x86_64-linux.nvim
+]

home/hosts/work/packages.nix

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

home/modules/3d/default.nix

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

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

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

home/modules/ai-tools/default.nix

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

home/modules/ai-tools/opencode.nix

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

home/modules/ai-tools/skills.nix

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

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

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

home/modules/ai-tools/tirith.nix

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

home/modules/anki.nix

@@ -0,0 +1,33 @@
+{
+  config,
+  lib,
+  pkgs,
+  osConfig ? null,
+  ...
+}:
+
+let
+  hmSopsAvailable = config ? sops && config.sops ? secrets;
+  osSopsAvailable = osConfig != null && osConfig ? sops && osConfig.sops ? secrets;
+  sopsAvailable = hmSopsAvailable || osSopsAvailable;
+
+  sopsSecrets = if hmSopsAvailable then config.sops.secrets else osConfig.sops.secrets;
+in
+{
+  warnings = lib.optional (
+    !sopsAvailable && config.programs.anki.enable
+  ) "anki is enabled but sops secrets are not available. anki sync will not be configured.";
+
+  programs.anki = {
+    enable = true;
+    addons = with pkgs.ankiAddons; [
+      anki-connect
+      puppy-reinforcement
+      review-heatmap
+    ];
+    sync = lib.mkIf sopsAvailable {
+      usernameFile = "${sopsSecrets."anki_sync_user".path}";
+      keyFile = "${sopsSecrets."anki_sync_key".path}";
+    };
+  };
+}

home/modules/anki/default.nix

@@ -1,41 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  myUtils,
-  osConfig ? null,
-  inputs ? null,
-  ...
-}:
-
-let
-  sops = myUtils.sopsAvailability config osConfig;
-  standalone = osConfig == null;
-in
-lib.optionalAttrs standalone {
-  sops.secrets = myUtils.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" null {
-    anki = [
-      "sync-user"
-      "sync-key"
-    ];
-  };
-}
-// {
-  warnings = lib.optional (
-    !sops.available && config.programs.anki.enable
-  ) "anki is enabled but sops secrets are not available. anki sync will not be configured.";
-
-  programs.anki = {
-    enable = true;
-    package = config.nixgl.wrap pkgs.anki;
-    addons = with pkgs.ankiAddons; [
-      anki-connect
-      puppy-reinforcement
-      review-heatmap
-    ];
-    profiles."User 1".sync = lib.mkIf sops.available {
-      usernameFile = "${sops.secrets."anki/sync-user".path}";
-      keyFile = "${sops.secrets."anki/sync-key".path}";
-    };
-  };
-}

home/modules/audio/default.nix

@@ -1,7 +0,0 @@
-{ osConfig, pkgs, ... }:
-
-{
-  home.packages = with pkgs; [ pulsemixer ];
-
-  services.mpris-proxy.enable = osConfig.hardware.bluetooth.enable or false;
-}

home/modules/browser/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   options.browser = {
@@ -23,8 +23,6 @@
     };
   };
 
-  config.home.sessionVariables.BROWSER = config.browser.primary;
-
   imports = [
     ./firefox.nix
     ./librewolf.nix

home/modules/browser/firefox-base.nix

@@ -1,89 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  bookmarks = import ./bookmarks.nix;
-in
-
-{
-  nativeMessagingHosts =
-    with pkgs;
-    [
-      tridactyl-native
-    ]
-    ++ lib.optionals config.programs.keepassxc.enable [ keepassxc ];
-  profiles = {
-    default = {
-      settings = {
-        "signon.rememberSignons" = false;
-        "findbar.highlightAll" = true;
-        "extensions.autoDisableScopes" = 0;
-      };
-      extensions = {
-        force = true;
-        packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
-          duckduckgo-privacy-essentials
-          firefox-color
-          istilldontcareaboutcookies
-          libredirect
-          keepassxc-browser
-          react-devtools
-          sponsorblock
-          tridactyl
-          ublock-origin
-        ];
-      };
-      bookmarks = {
-        force = true;
-        settings = [
-          {
-            toolbar = true;
-            bookmarks = [
-              bookmarks.nixos
-            ];
-          }
-        ];
-      };
-    };
-  };
-  policies = {
-    DefaultDownloadDirectory = "\${home}/dl";
-    ExtensionSettings = {
-      "jid1-ZAdIEUB7XOzOJw@jetpack" = {
-        default_area = "navbar";
-        private_browsing = true;
-      };
-      "idcac-pub@guus.ninja" = {
-        default_area = "navbar";
-        private_browsing = true;
-      };
-      "7esoorv3@alefvanoon.anonaddy.me" = {
-        default_area = "navbar";
-      };
-      "keepassxc-browser@keepassxc.org" = {
-        default_area = "navbar";
-        private_browsing = true;
-      };
-      "@react-devtools" = {
-        default_area = "navbar";
-        private_browsing = true;
-      };
-      "sponsorBlocker@ajay.app" = {
-        default_area = "navbar";
-        private_browsing = true;
-      };
-      "tridactyl.vim@cmcaine.co.uk".settings = {
-        private_browsing = true;
-      };
-      "uBlock0@raymondhill.net".settings = {
-        default_area = "navbar";
-        private_browsing = true;
-      };
-    };
-  };
-}

home/modules/browser/firefox.nix

@@ -1,23 +1,83 @@
-{
-  config,
-  lib,
-  inputs,
-  pkgs,
-  ...
-}:
+{ config, inputs, lib, pkgs, ... }:
+
+let
+  bookmarks = import ./bookmarks.nix;
+in
 
 {
   config = lib.mkIf (config.browser.primary == "firefox" || config.browser.secondary == "firefox") {
     programs.firefox = {
       enable = true;
+      nativeMessagingHosts = with pkgs; [
+        tridactyl-native
+      ];
+      profiles = {
+        default = {
+          settings = {
+            "signon.rememberSignons" = false;
+            "findbar.highlightAll" = true;
+            "extensions.autoDisableScopes" = 0;
+          };
+          extensions = {
+            packages = with inputs.firefox-addons.packages.${pkgs.system}; [
+              duckduckgo-privacy-essentials
+              istilldontcareaboutcookies
+              libredirect
+              keepassxc-browser
+              react-devtools
+              sponsorblock
+              tridactyl
+              ublock-origin
+            ];
+          };
+          bookmarks = {
+            force = true;
+            settings = [
+              {
+                toolbar = true;
+                bookmarks = [
+                  bookmarks.nixos
+                ];
               }
-    // (import ./firefox-base.nix {
-      inherit
-        config
-        inputs
-        lib
-        pkgs
-        ;
-    });
+            ];
+          };
+        };
+      };
+      policies = {
+        DefaultDownloadDirectory = "\${home}/dl";
+        ExtensionSettings = {
+          "jid1-ZAdIEUB7XOzOJw@jetpack" = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+          "idcac-pub@guus.ninja" = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+          "7esoorv3@alefvanoon.anonaddy.me" = {
+            default_area = "navbar";
+          };
+          "keepassxc-browser@keepassxc.org" = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+          "@react-devtools" = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+          "sponsorBlocker@ajay.app" = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+          "tridactyl.vim@cmcaine.co.uk".settings = {
+            private_browsing = true;
+          };
+          "uBlock0@raymondhill.net".settings = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+        };
+      };
+    };
   };
 }

home/modules/browser/librewolf.nix

@@ -1,25 +1,83 @@
-{
-  config,
-  lib,
-  inputs,
-  pkgs,
-  ...
-}:
+{ config, inputs, lib, pkgs, ... }:
+
+let
+  bookmarks = import ./bookmarks.nix;
+in
 
 {
-  config =
-    lib.mkIf (config.browser.primary == "librewolf" || config.browser.secondary == "librewolf")
-      {
+  config = lib.mkIf (config.browser.primary == "librewolf" || config.browser.secondary == "librewolf") {
     programs.librewolf = {
       enable = true;
+      nativeMessagingHosts = with pkgs; [
+        tridactyl-native
+      ];
+      profiles = {
+        default = {
+          settings = {
+            "signon.rememberSignons" = false;
+            "findbar.highlightAll" = true;
+            "extensions.autoDisableScopes" = 0;
+          };
+          extensions = {
+            packages = with inputs.firefox-addons.packages.${pkgs.system}; [
+              duckduckgo-privacy-essentials
+              istilldontcareaboutcookies
+              libredirect
+              keepassxc-browser
+              react-devtools
+              sponsorblock
+              tridactyl
+              ublock-origin
+            ];
+          };
+          bookmarks = {
+            force = true;
+            settings = [
+              {
+                toolbar = true;
+                bookmarks = [
+                  bookmarks.nixos
+                ];
               }
-        // (import ./firefox-base.nix {
-          inherit
-            config
-            inputs
-            lib
-            pkgs
-            ;
-        });
+            ];
+          };
+        };
+      };
+      policies = {
+        DefaultDownloadDirectory = "\${home}/dl";
+        ExtensionSettings = {
+          "jid1-ZAdIEUB7XOzOJw@jetpack" = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+          "idcac-pub@guus.ninja" = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+          "7esoorv3@alefvanoon.anonaddy.me" = {
+            default_area = "navbar";
+          };
+          "keepassxc-browser@keepassxc.org" = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+          "@react-devtools" = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+          "sponsorBlocker@ajay.app" = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+          "tridactyl.vim@cmcaine.co.uk".settings = {
+            private_browsing = true;
+          };
+          "uBlock0@raymondhill.net".settings = {
+            default_area = "navbar";
+            private_browsing = true;
+          };
+        };
+      };
+    };
   };
 }

home/modules/bruno/default.nix

@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  config = {
-    home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.bruno "--no-sandbox")) ];
-  };
-}

home/modules/clipboard/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    wl-clipboard
-  ];
-}

home/modules/cloud/azure.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  config = lib.mkIf config.cloud.azure.enable {
-    home.packages = with pkgs; [ azure-cli ];
-  };
-}

home/modules/cloud/default.nix

@@ -1,17 +0,0 @@
-{ lib, ... }:
-
-{
-  options.cloud = {
-    azure = {
-      enable = lib.mkEnableOption "azure CLI";
-    };
-    hetzner = {
-      enable = lib.mkEnableOption "hetzner CLI";
-    };
-  };
-
-  imports = [
-    ./azure.nix
-    ./hetzner.nix
-  ];
-}

home/modules/cloud/hetzner.nix

@@ -1,20 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  osConfig ? null,
-  ...
-}:
-
-let
-  isNixOS = osConfig != null;
-in
-{
-  config = lib.mkIf config.cloud.hetzner.enable {
-    warnings =
-      lib.optional (!isNixOS)
-        "hcloud module requires NixOS host configuration. This module will not work with standalone home-manager.";
-
-    home.packages = with pkgs; [ hcloud ];
-  };
-}

home/modules/comms/default.nix

@@ -1,17 +0,0 @@
-{ lib, ... }:
-
-{
-  options.comms = {
-    signal = {
-      enable = lib.mkEnableOption "signal";
-    };
-    teams = {
-      enable = lib.mkEnableOption "teams";
-    };
-  };
-
-  imports = [
-    ./signal.nix
-    ./teams.nix
-  ];
-}

home/modules/comms/signal.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  config = lib.mkIf config.comms.signal.enable {
-    home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.signal-desktop "--no-sandbox")) ];
-  };
-}

home/modules/comms/teams.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  config = lib.mkIf config.comms.teams.enable {
-    home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.teams-for-linux "--no-sandbox")) ];
-  };
-}

home/modules/database/default.nix

@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  options.database = {
-    mssql.enable = lib.mkEnableOption "MSSQL";
-    postgresql.enable = lib.mkEnableOption "PostgreSQL";
-    redis.enable = lib.mkEnableOption "Redis";
-  };
-
-  config = lib.mkMerge [
-    (lib.mkIf config.database.mssql.enable {
-      home.packages = with pkgs; [ (config.nixgl.wrap dbeaver-bin) ];
-    })
-    (lib.mkIf config.database.postgresql.enable {
-      home.packages = with pkgs; [ (config.nixgl.wrap pgadmin4-desktopmode) ];
-    })
-    (lib.mkIf config.database.postgresql.enable {
-      home.packages = with pkgs; [ redis ];
-    })
-  ];
-}

home/modules/dconf.nix

@@ -1,14 +1,21 @@
-{ config, pkgs, ... }:
-
-let
-  terminal = "kitty";
-  browser = config.browser.primary;
-  font = "${config.stylix.fonts.monospace.name} ${toString config.stylix.fonts.sizes.applications}";
-in
 {
   dconf.settings = {
+    "org/gnome/settings-daemon/plugins/color" = {
+      night-light-enabled = true;
+      night-light-schedule-automatic = true;
+    };
+    "org/gnome/desktop/interface" = {
+      color-scheme = "prefer-dark";
+    };
+
+    "org/gnome/desktop/applications/terminal" = {
+      exec = "kitty";
+      exec-arg = "";
+    };
+
     "org/gnome/desktop/background" = {
       color-shading-type = "solid";
+      picture-opacity = 100;
       picture-options = "zoom";
       picture-uri = "none";
       picture-uri-dark = "none";
@@ -17,54 +24,55 @@ in
       show-desktop-icons = false;
     };
 
-    "org/gnome/desktop/default-applications/office/calendar" = {
-      exec = "${browser} https://calendar.proton.me";
-      needs-term = false;
-    };
-
-    "org/gnome/desktop/default-applications/office/tasks" = {
-      exec = "task";
-      needs-term = true;
-    };
-
-    "org/gnome/desktop/default-applications/terminal" = {
-      exec = terminal;
-      exec-arg = "";
-    };
-
-    "org/gnome/desktop/input-sources" = {
-      xkb-options = [ "caps:none" ];
-    };
-
-    "org/gnome/desktop/interface" = {
-      clock-format = "24h";
-      clock-show-weekday = true;
-      color-scheme = "prefer-dark";
-      enable-hot-corners = false;
-      # font-name = font;
-      locate-pointer = true;
-      monospace-font-name = font;
-    };
+    # "org/gnome/desktop/input-sources" = {
+    #   sources = [
+    #     (mkTuple [
+    #       "xkb"
+    #       "us"
+    #     ])
+    #   ];
+    #   xkb-options = [ "caps:none" ];
+    # };
 
     "org/gnome/desktop/wm/keybindings" = {
       close = [ "<Shift><Super>Delete" ];
-      minimize = [ "<Super>h" ];
-      move-to-monitor-down = [ "<Super><Shift>Down" ];
-      move-to-monitor-left = [ "<Super><Shift>Left" ];
-      move-to-monitor-right = [ "<Super><Shift>Right" ];
-      move-to-monitor-up = [ "<Super><Shift>Up" ];
+      cycle-group = [ ];
+      cycle-group-backward = [ ];
+      cycle-panels = [ ];
+      cycle-panels-backward = [ ];
+      cycle-windows = [ ];
+      cycle-windows-backward = [ ];
+      maximize = [ "<Super> " ];
+      minimize = [ ];
       move-to-workspace-1 = [ "<Super><Shift>a" ];
       move-to-workspace-2 = [ "<Super><Shift>s" ];
       move-to-workspace-3 = [ "<Super><Shift>d" ];
       move-to-workspace-4 = [ "<Super><Shift>f" ];
       move-to-workspace-5 = [ "<Super><Shift>g" ];
+      move-to-workspace-last = [ ];
+      move-to-workspace-left = [ "<Super><Shift>h" ];
+      move-to-workspace-right = [ "<Super><Shift>l" ];
+      panel-run-dialog = [ ];
       switch-applications = [ "<Super>j" ];
       switch-applications-backward = [ "<Super>k" ];
+      switch-group = [ ];
+      switch-group-backward = [ ];
+      switch-input-source = [ ];
+      switch-input-source-backward = [ ];
+      switch-panels = [ ];
+      switch-panels-backward = [ ];
       switch-to-workspace-1 = [ "<Super>a" ];
       switch-to-workspace-2 = [ "<Super>s" ];
       switch-to-workspace-3 = [ "<Super>d" ];
       switch-to-workspace-4 = [ "<Super>f" ];
       switch-to-workspace-5 = [ "<Super>g" ];
+      switch-to-workspace-last = [ ];
+      switch-to-workspace-left = [ "<Super>h" ];
+      switch-to-workspace-right = [ "<Super>l" ];
+      switch-windows = [ ];
+      switch-windows-backward = [ ];
+      toggle-maximized = [ "<Super>space" ];
+      unmaximize = [ ];
     };
 
     "org/gnome/desktop/wm/preferences" = {
@@ -78,19 +86,8 @@ in
       ];
     };
 
-    "org/gnome/mutter" = {
-      center-new-windows = true;
-      dynamic-workspaces = false;
-    };
-
-    "org/gnome/settings-daemon/plugins/color" = {
-      night-light-enabled = true;
-      night-light-schedule-automatic = true;
-    };
-
     "org/gnome/settings-daemon/plugins/media-keys" = {
       custom-keybindings = [
-        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
         "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
       ];
     };
@@ -103,23 +100,14 @@ in
 
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
       binding = "<Super>Return";
-      command = terminal;
+      command = "kitty";
       name = "Kitty";
     };
 
-    "org/gnome/settings-daemon/plugins/power" = {
-      power-button-action = "suspend";
-    };
-
-    "org/gnome/shell/app-switcher" = {
-      current-workspace-only = true;
-    };
-
     "org/gnome/shell/keybindings" = {
+      screenshot = [ "Print" ];
       toggle-application-view = [ "<Super>p" ];
       toggle-quick-settings = [ ];
     };
   };
-
-  home.packages = with pkgs; [ dconf2nix ];
 }

home/modules/default.nix

@@ -1,37 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  options = {
-    host.username = lib.mkOption {
-      type = lib.types.str;
-      default = config.home.username;
-    };
-
-    nixgl.wrap = lib.mkOption {
-      type = lib.types.functionTo lib.types.package;
-      default = if config.lib ? nixGL then config.lib.nixGL.wrap else lib.id;
-      readOnly = true;
-    };
-
-    wrapApp = lib.mkOption {
-      type = lib.types.raw;
-      default =
-        pkg: flags:
-        if config.lib ? nixGL then
-          pkg.overrideAttrs (old: {
-            nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
-            postInstall = (old.postInstall or "") + ''
-              wrapProgram $out/bin/${pkg.meta.mainProgram} --add-flags "${flags}"
-            '';
-          })
-        else
-          pkg;
-      readOnly = true;
-    };
-  };
-}

home/modules/desktop/niri/config.kdl

@@ -48,7 +48,8 @@ layout {
     }
 }
 
-
+spawn-at-startup "wlsunset -l 51.05 -L 3.72"
+spawn-at-startup "waybar"
 
 hotkey-overlay {
     skip-at-startup

home/modules/desktop/niri/default.nix

@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ../../clipboard
     ../../fuzzel
     ../../mako
     ../../shikane
@@ -12,15 +11,8 @@
   home = {
     file.".config/niri/config.kdl".source = ./config.kdl;
     packages = with pkgs; [
-      brightnessctl
+      wl-clipboard
       wlsunset
     ];
   };
-
-  services.gammastep = {
-    enable = true;
-    provider = "manual";
-    latitude = 51.05;
-    longitude = 3.71667;
-  };
 }

home/modules/devenv/default.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [ pkgs.devenv ];
-}

home/modules/direnv/default.nix

@@ -1,7 +0,0 @@
-{
-  programs.direnv = {
-    enable = true;
-    enableBashIntegration = true;
-    nix-direnv.enable = true;
-  };
-}

home/modules/docker/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    dive
-  ];
-}