refactor: modularize utils

.gitea/workflows/build.yaml

@@ -1,12 +0,0 @@
-name: check
-on:
-  pull_request:
-  push:
-    branches: [main]
-
-jobs:
-  lint:
-    runs-on: nix
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix build .#checks.x86_64-linux.pre-commit-check --print-build-logs

README.md

@@ -1,8 +1,5 @@
 # ❄️ NixOS flake
 
-![nix](https://img.shields.io/badge/nix-blue?logo=nixos&logoColor=%234d6fb7&labelColor=%23fff&color=%234d6fb7&link=https%3A%2F%2Fnixos.org%2F)
-![neovim](https://img.shields.io/badge/neovim-flat?logo=neovim&logoColor=%23408040&labelColor=%23fff&color=%2380C040)
-
 ## hosts
 
 ### NixOS

deploy/README.md

@@ -1,8 +1,7 @@
 # `colmena` deployments
 
-* tags: `personal`, `lab`
+* tags: `local`, `cloud`
 * deployments can be made from `astyanax` and `andromache` hosts
-* `hecuba` uses `deploy-rs` instead of `colmena` (see `./deploy-rs.nix`)
 
 ## References
 

deploy/colmena.nix

@@ -6,39 +6,30 @@
 let
   inherit (inputs.nixpkgs) lib;
   utils = import ../utils { inherit lib; };
-  # exclude hosts that need auto rollback (until `colmena` supports it) for
+  hostDirNames = utils.dirNames ../hosts;
-  # now, we use `deploy-rs` (which has magic rollback) for those (also see ./deploy-rs.nix)
-  #
-  # see <https://github.com/nix-community/colmena/issues/38>
-  #     <https://github.com/nix-community/colmena/issues/344>
-  hostnames = lib.filter (
-    hostname: !((utils.hostMeta ../hosts/${hostname}).deploy.autoRollback or false)
-  ) (utils.dirNames ../hosts);
 
-  mkNode =
+  mkNode = hostname: tags: {
-    hostname:
+    imports = [ ../hosts/${hostname} ];
-    let
+    deployment = {
-      meta = utils.hostMeta ../hosts/${hostname};
+      targetHost = self.nixosConfigurations.${hostname}.config.ssh.publicHostname;
-      isArm = meta.system == "aarch64-linux";
+      targetUser = self.nixosConfigurations.${hostname}.config.ssh.username;
-    in
+      buildOnTarget = builtins.any (t: t != "local" && t != "arm") tags;
-    {
+      inherit tags;
-      imports = [ ../hosts/${hostname} ];
-      host.name = hostname;
-      deployment = {
-        inherit (meta) tags;
-        targetUser = meta.host.username;
-        targetHost = hostname;
-        allowLocalDeployment = meta.host.admin or false;
-        buildOnTarget = !isArm;
-      };
     };
+  };
 
-  nodes = lib.genAttrs hostnames mkNode;
+  nodes = lib.genAttrs hostDirNames (
+    hostname: mkNode hostname (utils.hostMeta ../hosts/${hostname}).deployment.tags
+  );
 in
 inputs.colmena.lib.makeHive (
   {
     meta = {
-      nixpkgs = import inputs.nixpkgs { localSystem = "x86_64-linux"; };
+      nixpkgs = import inputs.nixpkgs {
+        localSystem = "x86_64-linux";
+      };
+
+      nodeNixpkgs = builtins.mapAttrs (_: v: v.pkgs) self.nixosConfigurations;
       specialArgs = {
         inherit inputs;
         outputs = self;

deploy/deploy-rs.nix

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

dots/.bash_aliases/all

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

dots/.bash_profile

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

dots/.bashrc

@@ -5,7 +5,8 @@
 
 . /etc/os-release
 
-# Prompt configuration
+# Editor & prompt configuration
+[ -f "$HOME/.bashrc.d/editor" ] && . "$HOME/.bashrc.d/editor"
 [ -f "$HOME/.bashrc.d/prompt" ] && . "$HOME/.bashrc.d/prompt"
 
 # Aliases {{{
@@ -30,6 +31,24 @@ done
 [ -f "$HOME/.bashrc.d/prompt" ] && . "$HOME/.bashrc.d/prompt"
 # }}}
 
+# Path {{{
+# Add ~/.bin to PATH
+export PATH=~/.bin:$PATH
+# }}}
+
+# History {{{
+export HISTSIZE=999999
+export HISTFILESIZE= # Unlimited
+export HISTCONTROL=ignoreboth:erasedups
+export HISTIGNORE=" *:clear:l:ls:cd" # Omit commands from history (e.g. those prepended with space)
+# }}}
+
+# Man pages {{{
+# See `:h :Man` in NeoVim
+export MANWIDTH=80
+export PAGER=nvimpager
+# }}}
+
 # X11 {{{
 export XDG_SESSION_TYPE=X11
 export XDG_CONFIG_HOME=$HOME/.config
@@ -39,6 +58,16 @@ export XDG_DATA_HOME=$HOME/.local/share
 # FZF {{{
 # Check if fzf is installed
 if [ -f "/usr/bin/fzf" ]; then
+  # Fuzzy finder setup
+  export FZF_COMPLETION_TRIGGER='**'
+  export FZF_DEFAULT_COMMAND='ag -g ""'
+  export FZF_DEFAULT_OPTS="
+  --pointer='❭'
+  --height 10%
+  --color=fg:-1,bg:-1"
+  export FZF_CTRL_T_COMMAND="${FZF_DEFAULT_COMMAND}"
+  export FZF_CTRL_T_OPTS="--preview='bat {} | head -500'"
+
   if [[ $ID == "raspbian" ]]; then
     . /usr/share/doc/fzf/examples/completion.bash
     . /usr/share/doc/fzf/examples/key-bindings.bash
@@ -53,6 +82,10 @@ else
 fi
 # }}}
 
+# Go {{{
+export GOPATH="${XDG_DATA_HOME}/go"
+# }}}
+
 # Jupyter {{{
 export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab
 # }}}
@@ -61,6 +94,16 @@ export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab
 [ -f /opt/miniconda3/etc/profile.d/conda.sh ] && . /opt/miniconda3/etc/profile.d/conda.sh
 # }}}
 
+# Zettelkasten {{{
+export ZK_PATH="$HOME/.zk"
+
+# SSH Agent {{{
+if [[ -z "${SSH_CONNECTION}" ]]; then
+    export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+fi
+# }}}
+
+
 # Codi
 # Usage: codi [filetype] [filename]
 codi() {

dots/.bashrc.d/editor

@@ -0,0 +1,7 @@
+# shellcheck shell=bash
+# vim: set ft=bash :
+
+# Set NeoVim as default editor
+export EDITOR=nvim
+export SUDO_EDITOR="$EDITOR"
+export SYSTEMD_EDITOR="$EDITOR"

dots/.bin/calc

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/env/bin bash
 
 ipython -i /home/h/.bin/calc.py

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

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

dots/.bin/taskdeps

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

dots/.bin/zk

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

dots/.config/kitty/kitty.conf

@@ -27,7 +27,7 @@ scrollback_pager_history_size 1024
 #: Mouse {{{
 
 mouse_hide_wait 0.0
-paste_actions quote-urls-at-prompt
+paste_actions quote-urls-at-prompt,confirm
 
 #: }}}
 
@@ -54,6 +54,17 @@ hide_window_decorations yes
 
 #: }}}
 
+#: Tab bar {{{
+
+tab_bar_edge bottom
+tab_bar_style powerline
+tab_bar_min_tabs 1
+tab_powerline_style slanted
+tab_activity_symbol !
+tab_title_template "{index}{fmt.fg.red}{bell_symbol}{fmt.fg.tab}{activity_symbol}:{tab.last_focused_progress_percent}{title}"
+
+#: }}}
+
 #: Advanced {{{
 
 notify_on_cmd_finish unfocused
@@ -117,6 +128,14 @@ map cmd+8
 map kitty_mod+9
 map cmd+9
 map kitty_mod+0
+map f1 goto_tab 1
+map f2 goto_tab 2
+map f3 goto_tab 3
+map f4 goto_tab 4
+map f5 goto_tab 5
+map f6 goto_tab 6
+map f7 goto_tab 7
+map f8 goto_tab 8
 # map kitty_mod+c new_tab # FIXME: conflict with 'copy'
 map cmd+t
 map kitty_mod+q

dots/.config/kitty/nvim.conf

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

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

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

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

@@ -1,26 +0,0 @@
-require("claudecode").setup({
-  -- terminal = {
-  --   provider = "snacks",
-  --   snacks_win_opts = {
-  --     position = "float",
-  --     width = 0.8,
-  --     height = 0.8,
-  --     border = "rounded",
-  --   },
-  -- },
-  -- diff_opts = {
-  --   layout = "vertical",
-  -- },
-})
-
-local map = vim.keymap.set
-
-map({ "n", "t" }, "<C-_>", "<cmd>ClaudeCode<cr>", { desc = "Toggle Claude Code" })
-map("n", "<leader>cf", "<cmd>ClaudeCodeFocus<cr>", { desc = "Focus Claude Code" })
-map("n", "<leader>cC", "<cmd>ClaudeCode --continue<cr>", { desc = "Claude Code (continue)" })
-map("n", "<leader>cr", "<cmd>ClaudeCode --resume<cr>", { desc = "Claude Code (resume)" })
-map("n", "<leader>cm", "<cmd>ClaudeCodeSelectModel<cr>", { desc = "Claude Code select model" })
-map("n", "<leader>cb", "<cmd>ClaudeCodeAdd %<cr>", { desc = "Add buffer to Claude Code" })
-map("v", "<leader>cs", "<cmd>ClaudeCodeSend<cr>", { desc = "Send selection to Claude Code" })
-map("n", "<leader>co", "<cmd>ClaudeCodeDiffAccept<cr>", { desc = "Accept Claude Code diff" })
-map("n", "<leader>cd", "<cmd>ClaudeCodeDiffDeny<cr>", { desc = "Deny Claude Code diff" })

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

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

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

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

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

@@ -0,0 +1 @@
+require("copilot").setup({})

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

@@ -2,7 +2,7 @@ local gitsigns = require("gitsigns")
 
 gitsigns.setup({
   current_line_blame_formatter = "<author>, <author_time:%R> - <summary>",
-  -- linehl = true,
+  linehl = true,
   current_line_blame_opts = {
     delay = 0,
     virt_text_pos = "right_align",

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

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

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

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

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

@@ -0,0 +1 @@
+require("mcphub").setup({})

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

@@ -62,8 +62,9 @@ cmp.setup({
     ["<CR>"] = c_l,
   }),
   sources = {
+    { name = "copilot",  group_index = 2 },
     { name = "zk" },
-    { name = "nvim_lsp" },
+    { name = "nvim_lsp", keyword_length = 8 },
     { name = "luasnip",  max_item_count = 16 },
     { name = "path" },
     { name = "buffer",   max_item_count = 8 },

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

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

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

@@ -123,7 +123,7 @@ treesitter.setup({
 })
 
 opt.foldmethod = "expr"
-opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+opt.foldexpr = "nvim_treesitter#foldexpr()"
 opt.foldenable = false
 
 -- TreeSJ

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

@@ -1,14 +0,0 @@
-local function overrides()
-  local colors = require("vscode.colors").get_colors()
-  vim.api.nvim_set_hl(0, "NormalFloat", { bg = colors.vscLeftDark })
-  vim.api.nvim_set_hl(0, "FloatBorder", { fg = colors.vscSplitDark, bg = colors.vscLeftDark })
-end
-
-vim.api.nvim_create_autocmd("ColorScheme", {
-  pattern = "vscode",
-  callback = overrides,
-})
-
-if vim.g.colors_name == "vscode" then
-  overrides()
-end

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()
+autocmd BufEnter *.md if expand('%:t') =~ '_' | echo 'hierarchical relation' | endif
-  let l:name = expand('%:t')
+autocmd BufEnter *.md if expand('%:t') =~ '--' | echo 'relation' | endif
-  if l:name =~ '_' | echo 'hierarchical relation'
+autocmd BufEnter *.md if expand('%:t') =~ '<>' | echo 'dichotomy' | endif
-  elseif l:name =~ '--' | echo 'relation'
+autocmd BufEnter *.md if expand('%:t') =~ 'my-' | echo 'personal file' | endif
-  elseif l:name =~ '<>' | echo 'dichotomy'
+autocmd BufEnter *.md if expand('%:t') =~ 'project_' | echo 'project file' | endif
-  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()'
 
 " 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/after/plugin/zenbones.lua

@@ -0,0 +1 @@
+vim.cmd("colorscheme zenwritten")

dots/.config/nvim/flake.lock

@@ -1,12 +1,52 @@
 {
   "nodes": {
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "mcp-hub",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "mcp-hub": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1755841689,
+        "narHash": "sha256-KakvXZf0vjdqzyT+LsAKHEr4GLICGXPmxl1hZ3tI7Yg=",
+        "owner": "ravitemer",
+        "repo": "mcp-hub",
+        "rev": "9c7670a4c341ed3cf738a6242c0fde1cea40bccf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ravitemer",
+        "repo": "mcp-hub",
+        "type": "github"
+      }
+    },
     "nixCats": {
       "locked": {
-        "lastModified": 1777273601,
+        "lastModified": 1774835836,
-        "narHash": "sha256-xBUa8Tl9V7IXI+VmLEuDc81La/EhoSn1C3EVSnJ3cfU=",
+        "narHash": "sha256-6ok7iv/9R82vl6MYe3Lwyyb6S5bmW2PxEZtmjzlqyPs=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "f69ea013e328841a7def7037ed59788a76be8816",
+        "rev": "ebb9f279a55ca60ff4e37e4accf6518dc627aa8d",
         "type": "github"
       },
       "original": {
@@ -17,11 +57,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787424095,
+        "lastModified": 1743689281,
-        "narHash": "sha256-dWLO5AHhKaw6rdWCtTes8hnntT1r0/J5yhQGm0f0ZgU=",
+        "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1775608838,
+        "narHash": "sha256-2ySoGH+SAi34U0PeuQgABC0WiH9LQ3tkyHTiE93KUeg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "174eb786fb68e3a13e4e535a3deea479a0c07a6a",
+        "rev": "9a01fad67a57e44e1b3e1d905c6881bcfb209e8a",
         "type": "github"
       },
       "original": {
@@ -47,6 +103,38 @@
         "type": "github"
       }
     },
+    "plugins-helm-ls-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1773934114,
+        "narHash": "sha256-8trqFsA7nTKSdtkiAL0Sa9bXjh5ONtAqN7XNE/B8ukM=",
+        "owner": "qvalentin",
+        "repo": "helm-ls.nvim",
+        "rev": "20df43509b02a3ce3c6b3eee254d6e2bffa9a370",
+        "type": "github"
+      },
+      "original": {
+        "owner": "qvalentin",
+        "repo": "helm-ls.nvim",
+        "type": "github"
+      }
+    },
+    "plugins-mcphub-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1768730387,
+        "narHash": "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=",
+        "owner": "ravitemer",
+        "repo": "mcphub.nvim",
+        "rev": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ravitemer",
+        "repo": "mcphub.nvim",
+        "type": "github"
+      }
+    },
     "plugins-nvimkit-nvim": {
       "flake": false,
       "locked": {
@@ -97,9 +185,12 @@
     },
     "root": {
       "inputs": {
+        "mcp-hub": "mcp-hub",
         "nixCats": "nixCats",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "plugins-beancount-nvim": "plugins-beancount-nvim",
+        "plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
+        "plugins-mcphub-nvim": "plugins-mcphub-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
         "plugins-shipwright-nvim": "plugins-shipwright-nvim",
         "plugins-tailwind-fold-nvim": "plugins-tailwind-fold-nvim"

dots/.config/nvim/flake.nix

@@ -2,6 +2,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     nixCats.url = "github:BirdeeHub/nixCats-nvim";
+    mcp-hub.url = "github:ravitemer/mcp-hub";
 
     plugins-shipwright-nvim = {
       url = "github:rktjmp/shipwright.nvim";
@@ -23,6 +24,14 @@
       url = "github:jamesblckwell/nvimkit.nvim";
       flake = false;
     };
+    plugins-mcphub-nvim = {
+      url = "github:ravitemer/mcphub.nvim";
+      flake = false;
+    };
+    plugins-helm-ls-nvim = {
+      url = "github:qvalentin/helm-ls.nvim";
+      flake = false;
+    };
 
   };
 
@@ -36,54 +45,26 @@
       inherit (nixCats) utils;
       luaPath = ./.;
       forEachSystem = utils.eachSystem nixpkgs.lib.platforms.all;
-      extra_pkg_config = {
+      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"
-          ];
-      };
 
-      mkDependencyOverlays = [
+      mkDependencyOverlays = system: [
         (utils.standardPluginOverlay inputs)
-        (_: prev: {
+        (_final: _prev: {
-          luajitPackages = prev.luajitPackages.overrideScope (
+          mcp-hub = inputs.mcp-hub.packages.${system}.default;
-            _: lprev: {
-              neotest = lprev.neotest.overrideAttrs (_: {
-                doCheck = false;
-              });
-            }
-          );
         })
       ];
 
       categoryDefinitions =
         {
           pkgs,
-          categories,
           ...
         }:
-        let
-          themes = import ./themes.nix pkgs;
-        in
         {
           lspsAndRuntimeDeps = with pkgs; {
             general = [
-              nodejs_24
               black
               clang
               clang-tools
-              curl # → plenary-nvim
               delta
               emmet-language-server
               eslint_d
@@ -94,10 +75,9 @@
               helm-ls
               isort
               lua-language-server
+              mcp-hub
               nixd
               nixfmt
-              prettier
-              typescript-language-server
               ormolu
               prettierd
               rust-analyzer
@@ -106,7 +86,6 @@
               stylelint
               stylua
               tree-sitter
-              tailwindcss-language-server
               typescript-language-server
               vscode-langservers-extracted
               vtsls
@@ -116,77 +95,76 @@
           };
 
           startupPlugins = {
-            general =
+            general = with pkgs.vimPlugins; [
-              with pkgs.vimPlugins;
+              ## plug
-              [
+              vim-plug
-                ## plug
+              vim-sandwich
-                vim-plug
+              context_filetype-vim
-                vim-sandwich
+              editorconfig-vim
-                context_filetype-vim
+              vim-snippets
-                editorconfig-vim
+              unicode-vim
-                vim-snippets
+              vim-css-color
-                unicode-vim
+              quarto-nvim
-                vim-css-color
+              vimtex
-                quarto-nvim
+              wiki-vim
-                vimtex
+              vim-pandoc
-                wiki-vim
+              vim-pandoc-syntax
-                vim-pandoc
+              # TODO: ferrine/md-img-paste.vim
-                vim-pandoc-syntax
+              # TODO: supercollider/scvim
-                # TODO: ferrine/md-img-paste.vim
+              # TODO: tidalcycles/vim-tidal
-                # TODO: supercollider/scvim
+              vim-glsl
-                # TODO: tidalcycles/vim-tidal
+              # TODO: timtro/glslView-nvim
-                vim-glsl
+              # TODO: sirtaj/vim-openscad
-                # TODO: timtro/glslView-nvim
+              jupytext-nvim
-                # TODO: sirtaj/vim-openscad
+              vim-openscad
-                jupytext-nvim
+              ## paq
-                vim-openscad
+              eyeliner-nvim
-                ## paq
+              fzf-lua
-                eyeliner-nvim
+              ltex_extra-nvim
-                fzf-lua
+              nvim-lspconfig
-                ltex_extra-nvim
+              lsp_lines-nvim
-                nvim-lspconfig
+              lsp-progress-nvim
-                lsp_lines-nvim
+              neodev-nvim
-                lsp-progress-nvim
+              SchemaStore-nvim
-                neodev-nvim
+              nvim-lint
-                SchemaStore-nvim
+              conform-nvim
-                nvim-lint
+              luasnip
-                conform-nvim
+              cmp_luasnip
-                luasnip
+              nvim-cmp
-                cmp_luasnip
+              cmp-nvim-lsp
-                nvim-cmp
+              cmp-buffer
-                cmp-nvim-lsp
+              cmp-path
-                cmp-buffer
+              plenary-nvim
-                cmp-path
+              nui-nvim
-                plenary-nvim
+              trouble-nvim
-                nui-nvim
+              pkgs.neovimPlugins.shipwright-nvim
-                trouble-nvim
+              lush-nvim
-                lush-nvim
+              zenbones-nvim
-                pkgs.neovimPlugins.shipwright-nvim
+              nvim-treesitter.withAllGrammars
-                nvim-treesitter.withAllGrammars
+              nvim-treesitter-textobjects
-                nvim-treesitter-textobjects
+              # nvim-treesitter-context
-                # nvim-treesitter-context
+              nvim-ts-context-commentstring
-                nvim-ts-context-commentstring
+              treesj
-                # theHamsta/crazy-node-movement
+              sniprun
-                treesj
+              gitsigns-nvim
-                sniprun
+              nvim-highlight-colors
-                gitsigns-nvim
+              pkgs.neovimPlugins.tailwind-fold-nvim
-                nvim-highlight-colors
+              auto-session
-                pkgs.neovimPlugins.tailwind-fold-nvim
+              nvim-dbee
-                auto-session
+              image-nvim
-                nvim-dbee
+              pkgs.neovimPlugins.beancount-nvim
-                image-nvim
+              pkgs.neovimPlugins.nvimkit-nvim
-                pkgs.neovimPlugins.beancount-nvim
+              codecompanion-nvim
-                pkgs.neovimPlugins.nvimkit-nvim
+              pkgs.neovimPlugins.mcphub-nvim
-                codecompanion-nvim
+              copilot-lua
-                helm-ls-nvim
+              copilot-cmp
-                kitty-scrollback-nvim
+              pkgs.neovimPlugins.helm-ls-nvim
-                fidget-nvim
+              kitty-scrollback-nvim
-                rustaceanvim
+              fidget-nvim
-                # pkgs.neovimPlugins.m-taskwarrior-d-nvim
+              rustaceanvim
-                claudecode-nvim
+              # pkgs.neovimPlugins.m-taskwarrior-d-nvim
-                snacks-nvim
+              claude-code-nvim
-              ]
+            ];
-              ++ themes.${categories.colorscheme or "zenwritten"};
           };
 
           optionalPlugins = {
@@ -211,7 +189,6 @@
           };
           categories = {
             general = true;
-            colorscheme = "zenwritten";
           };
         };
       };
@@ -221,7 +198,7 @@
     forEachSystem (
       system:
       let
-        dependencyOverlays = mkDependencyOverlays;
+        dependencyOverlays = mkDependencyOverlays system;
         nixCatsBuilder = utils.baseBuilder luaPath {
           inherit
             nixpkgs

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

@@ -15,6 +15,7 @@ vim.api.nvim_create_user_command("AnkiDeck", function()
 end, {})
 
 vim.cmd([[
+set cc=81
 set cocu=""
 func! GetContext()
   " https://stackoverflow.com/questions/9464844/how-to-get-group-name-of-highlighting-under-cursor-in-vim

dots/.config/nvim/init.lua

@@ -8,12 +8,16 @@ require("cursor")
 require("fold")
 require("netrw")
 require("ftdetect")
+require("plug")
 require("pandoc")
 require("keymaps")
 require("highlight")
+require("paq-setup")
 require("statusline")
 require("diagnostic")
 require("utils")
 require("zk")
 require("reload")
-require("theme")
+
+vim.opt.background = "dark"
+vim.opt.laststatus = 3

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

@@ -22,7 +22,6 @@ set("n", "s=", "<c-w>=", { desc = "equalize splits" })
 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" })
-set("n", "<leader>w", "<cmd>w<cr>", { desc = ":w" })
 
 -- remaps
 set("i", "jj", "<esc>", { nowait = true, desc = "exit insert mode" })
@@ -35,6 +34,9 @@ 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" })
 

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

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

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

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

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

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

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

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

dots/.config/nvim/lua/theme.lua

@@ -1,8 +0,0 @@
-vim.opt.background = "dark"
-
-if vim.g.vscode then
-  return
-end
-
-vim.g.zenwritten_compat = 1
-vim.cmd.colorscheme(require("nixCatsUtils").getCatOrDefault("colorscheme", "zenwritten"))

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

@@ -13,31 +13,28 @@ 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
+  local trigger = cursor_before_line:match("%[[^%]]*%]%(([^)]*)$")
-    callback({})
-    return
-  end
 
-  local items = get_markdown_files(".")
+  if trigger ~= nil then
-  local next_char = cursor_after_line:sub(1, 1)
+    local items = get_markdown_files(".")
+    local next_char = cursor_after_line:sub(1, 1)
 
-  for _, item in ipairs(items) do
+    for _, item in ipairs(items) do
-    if next_char == ")" then
+      if next_char == ")" then
-      item.insertText = item.label
+        item.insertText = item.label
-    else
+      else
-      item.insertText = item.label .. ")"
+        item.insertText = item.label .. ")"
+      end
     end
-  end
 
-  callback(items)
+    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"'
+          au BufEnter /home/h/.zk/*.md silent exe '!cat "%:r.html" > /home/h/.zk/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 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/themes.nix

@@ -1,4 +0,0 @@
-pkgs: {
-  vscode = [ pkgs.vimPlugins.vscode-nvim ];
-  zenwritten = [ pkgs.vimPlugins.zenbones-nvim ];
-}

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

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

dots/.config/task/taskrc

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

dots/.config/task/taskrc.d/reports

@@ -9,9 +9,8 @@ report.next.filter=status:pending -WAITING -BLOCKED limit:page
 
 report.in.columns=id,description
 report.in.labels=ID,Description
-report.in.description=Inbox (untagged)
+report.in.description=Inbox (tasks with no project)
-report.in.filter=status:pending tags.none:
+report.in.filter=status:pending and project:
-report.in.sort=entry+
 
 report.recent.columns=id,description,entry
 report.recent.labels=ID,Description,Age

dots/.config/task/taskrc.d/udas

@@ -1,2 +0,0 @@
-uda.url.type=string
-uda.url.label=URL

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

@@ -0,0 +1 @@
+set -g status-style bg=colour12,fg=colour0

dots/.config/tmux/tmux.conf

@@ -70,11 +70,11 @@ set -g status-right '#(uptime | cut -f 4-5 -d " " | cut -f 1 -d ",") %a %l:%M:%S
 
 set -g default-terminal "tmux-256color"
 
+set-hook -g after-new-session 'if -F "#{==:#{session_name},ssh}" "source ${XDG_CONFIG_HOME}/tmux/hooks/tmux.ssh.conf" "source ${XDG_CONFIG_HOME}/tmux/hooks/tmux.regular.conf"'
+
 # Vi copypaste mode
 if-shell "test '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 4 \)'" 'bind-key -Tcopy-mode-vi v send -X begin-selection; bind-key -Tcopy-mode-vi y send -X copy-selection-and-cancel'
 if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 4\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'bind-key -t vi-copy v begin-selection; bind-key -t vi-copy y copy-selection'
 if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 2\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'set-option -g status-utf8 on'
 
 set -g allow-passthrough on
-set -s extended-keys on
-set -as terminal-features 'xterm*:extkeys'

dots/.local/share/task/hooks/on-add.limit.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+import sys
+import json
+
+SLOTS_FILE = "/home/h/.local/share/task/add_slots"
+
+def get_slots():
+    try:
+        with open(SLOTS_FILE, "r") as f:
+            return int(f.read().strip())
+    except:
+        return 0
+
+slots = get_slots()
+
+if slots <= 0:
+    print(f"Cannot add task: No slots available (0/{slots}).")
+    print("Delete or complete a task first to earn an add slot.")
+    sys.exit(1)
+
+with open(SLOTS_FILE, "w") as f:
+    f.write(str(slots - 1))
+
+print(f"Task added. Slots remaining: {slots - 1}")
+
+for line in sys.stdin:
+    task = json.loads(line)
+    print(json.dumps(task))
+    sys.exit(0)

dots/.local/share/task/hooks/on-modify.limit.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+import sys
+import json
+
+SLOTS_FILE = "/home/h/.local/share/task/add_slots"
+
+def get_slots():
+    try:
+        with open(SLOTS_FILE, "r") as f:
+            return int(f.read().strip())
+    except:
+        return 0
+
+data = sys.stdin.read().strip().split("\n")
+if len(data) < 2:
+    for line in data:
+        if line:
+            print(line)
+    sys.exit(0)
+
+old_task = json.loads(data[0])
+new_task = json.loads(data[1])
+
+was_pending = old_task.get("status") == "pending"
+is_not_pending = new_task.get("status") in ("completed", "deleted")
+
+if was_pending and is_not_pending:
+    slots = get_slots() + 1
+    with open(SLOTS_FILE, "w") as f:
+        f.write(str(slots))
+    print(f"Slot earned! Total slots: {slots}")
+
+print(json.dumps(new_task))
+sys.exit(0)

dots/.zotero/bbt.json

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

flake.lock

@@ -1,27 +1,5 @@
 {
   "nodes": {
-    "arion": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "haskell-flake": "haskell-flake",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1770259557,
-        "narHash": "sha256-EvZ09k9+mzXAngPzU2K7oLLUDlKoT1numb4bDb3Gtl4=",
-        "owner": "hercules-ci",
-        "repo": "arion",
-        "rev": "9b24cf65c72cb0e9616e437d55e1ac8e5c6bc715",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "arion",
-        "type": "github"
-      }
-    },
     "base16": {
       "inputs": {
         "fromYaml": "fromYaml"
@@ -60,11 +38,11 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1776754714,
+        "lastModified": 1760703920,
-        "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
         "type": "github"
       },
       "original": {
@@ -101,11 +79,11 @@
         "stable": "stable"
       },
       "locked": {
-        "lastModified": 1786742289,
+        "lastModified": 1762034856,
-        "narHash": "sha256-r61K9svFDQkI5jONYksneDtDT5c4SkWrZVD3ni5O6Ak=",
+        "narHash": "sha256-QVey3iP3UEoiFVXgypyjTvCrsIlA4ecx6Acaz5C8/PQ=",
         "owner": "zhaofengli",
         "repo": "colmena",
-        "rev": "dc22786a43315b212eeafe13409a7203328e5a30",
+        "rev": "349b035a5027f23d88eeb3bc41085d7ee29f18ed",
         "type": "github"
       },
       "original": {
@@ -114,28 +92,6 @@
         "type": "github"
       }
     },
-    "deploy-rs": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1788879443,
-        "narHash": "sha256-qb9sL86UCUEd3SYAda4ItN1NV0vhMSdbpA64WckvVI0=",
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "rev": "414ac5f35d79aabe5a0bf52451d8cf61eadf6c88",
-        "type": "github"
-      },
-      "original": {
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -165,11 +121,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1788926592,
+        "lastModified": 1775966594,
-        "narHash": "sha256-cHzKQBhQVLPfMCtK+E0EMeQpwW2/XA9l+8H6xXsT+70=",
+        "narHash": "sha256-pnRtaqTr7ut8dz8b04OWAanUM4tGhDUJz8SWmeTRp7U=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "9d230a63e1419b6efd95728f01a6a72e1986a03f",
+        "rev": "000d1d2322d28fa0a51b8db9f85a227aa5413b52",
         "type": "gitlab"
       },
       "original": {
@@ -182,11 +138,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1783570805,
+        "lastModified": 1775176642,
-        "narHash": "sha256-ptl5aRlCv9/uRSv2u8Hq8UFVFeZ6Q/bT049bpqNgc3w=",
+        "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "5602ed62d638142c1ab31dccd01dfbfb28841225",
+        "rev": "179704030c5286c729b5b0522037d1d51341022c",
         "type": "github"
       },
       "original": {
@@ -198,11 +154,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1767039857,
+        "lastModified": 1650374568,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
         "type": "github"
       },
       "original": {
@@ -212,22 +168,6 @@
       }
     },
     "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1767039857,
@@ -246,16 +186,17 @@
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
-          "arion",
+          "nvim",
+          "mcp-hub",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1769996383,
+        "lastModified": 1743550720,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -272,11 +213,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782949081,
+        "lastModified": 1775087534,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
+        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
+        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
         "type": "github"
       },
       "original": {
@@ -286,15 +227,12 @@
       }
     },
     "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1659877975,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -305,7 +243,7 @@
     },
     "flake-utils_2": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -339,17 +277,18 @@
     },
     "git-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1788267358,
+        "lastModified": 1775585728,
-        "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
+        "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "27555e2624241fb116b49095df4caaee85a25691",
+        "rev": "580633fa3fe5fc0379905986543fd7495481913d",
         "type": "github"
       },
       "original": {
@@ -358,58 +297,44 @@
         "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": {
-        "host": "gitlab.gnome.org",
+        "lastModified": 1767737596,
-        "lastModified": 1776175984,
+        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
-        "narHash": "sha256-RJFlFW8GiMei6oqUGrMkGEvVqOH8U7Q8abc1yK4VKD8=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "e0fdc4c13250e9a9b8ea9594c83925274f4a5dca",
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
-        "type": "gitlab"
-      },
-      "original": {
-        "host": "gitlab.gnome.org",
-        "owner": "GNOME",
-        "ref": "50.1",
-        "repo": "gnome-shell",
-        "type": "gitlab"
-      }
-    },
-    "haskell-flake": {
-      "locked": {
-        "lastModified": 1675296942,
-        "narHash": "sha256-u1X1sblozi5qYEcLp1hxcyo8FfDHnRUVX3dJ/tW19jY=",
-        "owner": "srid",
-        "repo": "haskell-flake",
-        "rev": "c2cafce9d57bfca41794dc3b99c593155006c71e",
         "type": "github"
       },
       "original": {
-        "owner": "srid",
+        "owner": "GNOME",
-        "ref": "0.1.0",
+        "repo": "gnome-shell",
-        "repo": "haskell-flake",
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
         "type": "github"
       }
     },
-    "hecuba-services": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1788557536,
-        "narHash": "sha256-oG0PyMqzA11EGfqY86iU73DjYq5HHoK89kQW0xaPHf4=",
-        "ref": "main",
-        "rev": "29002359b7a863b12bed5a83a1cafc53c660a14a",
-        "revCount": 218,
-        "type": "git",
-        "url": "ssh://git@github.com/hektor/hecuba-services"
-      },
-      "original": {
-        "ref": "main",
-        "type": "git",
-        "url": "ssh://git@github.com/hektor/hecuba-services"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -417,11 +342,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788921139,
+        "lastModified": 1775983377,
-        "narHash": "sha256-2wRuvf9UDw1SYWtBcxNmxLeAtNU1i/hc1c0AKQHdvlM=",
+        "narHash": "sha256-ZeRjipGQnVtQ/6batI+yVOrL853FZsL0m9A63OaSfgM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a2dbe7c2c9333e8234ae8114c7f731784201d108",
+        "rev": "e0ca734ffc85d25297715e98010b93303fa165c4",
         "type": "github"
       },
       "original": {
@@ -430,6 +355,25 @@
         "type": "github"
       }
     },
+    "mcp-hub": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1755841689,
+        "narHash": "sha256-KakvXZf0vjdqzyT+LsAKHEr4GLICGXPmxl1hZ3tI7Yg=",
+        "owner": "ravitemer",
+        "repo": "mcp-hub",
+        "rev": "9c7670a4c341ed3cf738a6242c0fde1cea40bccf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ravitemer",
+        "repo": "mcp-hub",
+        "type": "github"
+      }
+    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -438,11 +382,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737420293,
+        "lastModified": 1729742964,
-        "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
+        "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
         "owner": "nix-community",
         "repo": "nix-github-actions",
-        "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
+        "rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
         "type": "github"
       },
       "original": {
@@ -454,10 +398,10 @@
     "nix-secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1788786361,
+        "lastModified": 1776003473,
-        "narHash": "sha256-u6qgw8xKHLdlC02HZnC89WzigADbXoO4mGsllMMj5FM=",
+        "narHash": "sha256-v87721Nfc5qnevsgGkaAO+MpeJdfgPtBpazs6N5dUiI=",
         "ref": "main",
-        "rev": "b560101cef698142dd15cacc222c2c6135b8ab04",
+        "rev": "d95fb37764e5033ad2cdf543f7d8acccb36146c8",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@github.com/hektor/nix-secrets"
@@ -471,11 +415,11 @@
     },
     "nixCats": {
       "locked": {
-        "lastModified": 1777273601,
+        "lastModified": 1774835836,
-        "narHash": "sha256-xBUa8Tl9V7IXI+VmLEuDc81La/EhoSn1C3EVSnJ3cfU=",
+        "narHash": "sha256-6ok7iv/9R82vl6MYe3Lwyyb6S5bmW2PxEZtmjzlqyPs=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "f69ea013e328841a7def7037ed59788a76be8816",
+        "rev": "ebb9f279a55ca60ff4e37e4accf6518dc627aa8d",
         "type": "github"
       },
       "original": {
@@ -506,15 +450,12 @@
       }
     },
     "nixos-hardware": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
       "locked": {
-        "lastModified": 1788942796,
+        "lastModified": 1775490113,
-        "narHash": "sha256-CLoJCCRi9sogsyGXYn8rOCWBLKAntfKUB9Rli/YXgEY=",
+        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "83bbc895120516d6e86885a188c04beced6535d9",
+        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
         "type": "github"
       },
       "original": {
@@ -526,24 +467,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767892417,
+        "lastModified": 1775710090,
-        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1788881743,
-        "narHash": "sha256-2V9GZGvPfrNzxFozhI9dcqV+c3QdA8YZrvAAzqEB+dI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d6524aaca2ff07876657ae2b323f24be4874944b",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -553,6 +481,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1743689281,
+        "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": [
@@ -565,11 +509,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785549842,
+        "lastModified": 1775228139,
-        "narHash": "sha256-DCwBZmGsySF7oKGTRgEv2HvpxVXkHT+38VhTM76k0B4=",
+        "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "a9f987b57594e845e3e5cdd423b9a70846d70308",
+        "rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
         "type": "github"
       },
       "original": {
@@ -580,11 +524,14 @@
     },
     "nvim": {
       "inputs": {
+        "mcp-hub": "mcp-hub",
         "nixCats": "nixCats",
         "nixpkgs": [
           "nixpkgs"
         ],
         "plugins-beancount-nvim": "plugins-beancount-nvim",
+        "plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
+        "plugins-mcphub-nvim": "plugins-mcphub-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
         "plugins-shipwright-nvim": "plugins-shipwright-nvim",
         "plugins-tailwind-fold-nvim": "plugins-tailwind-fold-nvim"
@@ -615,6 +562,38 @@
         "type": "github"
       }
     },
+    "plugins-helm-ls-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1773934114,
+        "narHash": "sha256-8trqFsA7nTKSdtkiAL0Sa9bXjh5ONtAqN7XNE/B8ukM=",
+        "owner": "qvalentin",
+        "repo": "helm-ls.nvim",
+        "rev": "20df43509b02a3ce3c6b3eee254d6e2bffa9a370",
+        "type": "github"
+      },
+      "original": {
+        "owner": "qvalentin",
+        "repo": "helm-ls.nvim",
+        "type": "github"
+      }
+    },
+    "plugins-mcphub-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1768730387,
+        "narHash": "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=",
+        "owner": "ravitemer",
+        "repo": "mcphub.nvim",
+        "rev": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ravitemer",
+        "repo": "mcphub.nvim",
+        "type": "github"
+      }
+    },
     "plugins-nvimkit-nvim": {
       "flake": false,
       "locked": {
@@ -665,18 +644,15 @@
     },
     "root": {
       "inputs": {
-        "arion": "arion",
         "colmena": "colmena",
-        "deploy-rs": "deploy-rs",
         "disko": "disko",
         "firefox-addons": "firefox-addons",
         "git-hooks": "git-hooks",
-        "hecuba-services": "hecuba-services",
         "home-manager": "home-manager",
         "nix-secrets": "nix-secrets",
         "nixgl": "nixgl",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nvim": "nvim",
         "sops-nix": "sops-nix",
         "stylix": "stylix"
@@ -689,11 +665,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1788914643,
+        "lastModified": 1775971308,
-        "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=",
+        "narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "13616fff713a9f94055c66f15687ebdc17a335df",
+        "rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4",
         "type": "github"
       },
       "original": {
@@ -704,16 +680,16 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1783625654,
+        "lastModified": 1750133334,
-        "narHash": "sha256-pI1244/PJfTyKhlAr2QYQC55vR6UQdnGA0rJUgtO2IQ=",
+        "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a0230bd8d5cbd13893b2263918d396a2c7dd0407",
+        "rev": "36ab78dab7da2e4e27911007033713bab534187b",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-26.05",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -731,18 +707,18 @@
           "nixpkgs"
         ],
         "nur": "nur",
-        "systems": "systems_4",
+        "systems": "systems_2",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
         "tinted-tmux": "tinted-tmux",
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1787771653,
+        "lastModified": 1775936757,
-        "narHash": "sha256-DkkJSBOXWV/mja5Vy8az5g1KpZlsbUwlmH0BsQhowaQ=",
+        "narHash": "sha256-KJO/7qoxJ+hlsb3WlFSl6IGrExBIf1GvKdrhOlnGdKY=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "5e3809851f486e7fc7e84b40f174c74b60ecc784",
+        "rev": "d3e447786b74d62c75f665e17cb3e681c66e90c7",
         "type": "github"
       },
       "original": {
@@ -781,37 +757,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1774449309,
-        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "ref": "future-26.11",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tinted-kitty": {
       "flake": false,
       "locked": {
@@ -831,11 +776,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1785153830,
+        "lastModified": 1772661346,
-        "narHash": "sha256-fNdfCTeCXU3tZG3TMincd+u68qBHQgCr2Ljr/M1mWP0=",
+        "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "9bd28ed313560db3c5b605c63bc4e309e78e3fc8",
+        "rev": "13b5b0c299982bb361039601e2d72587d6846294",
         "type": "github"
       },
       "original": {
@@ -847,11 +792,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1785031658,
+        "lastModified": 1772934010,
-        "narHash": "sha256-mZp9O2LjzdMzlqQF3l3fjqsuPBzXy+1qTfBEUGjTlpk=",
+        "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "5d2c67f61ea7af36f16865ab6d541cdba41dc257",
+        "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
         "type": "github"
       },
       "original": {
@@ -863,11 +808,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1785030526,
+        "lastModified": 1772909925,
-        "narHash": "sha256-klZf8UviewRkxuu74Bhbq6tqy7oxebQC7UVRWbbtQxU=",
+        "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "16f5a8adf4a6b1310d0a61ab172de963e8f76a02",
+        "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
         "type": "github"
       },
       "original": {
@@ -875,24 +820,6 @@
         "repo": "base16-zed",
         "type": "github"
       }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -3,6 +3,10 @@
     nixpkgs = {
       url = "github:nixos/nixpkgs/nixos-unstable";
     };
+    stylix = {
+      url = "github:danth/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     nixos-hardware = {
       url = "github:NixOS/nixos-hardware/master";
     };
@@ -18,30 +22,6 @@
       url = "git+ssh://git@github.com/hektor/nix-secrets?shallow=1&ref=main";
       flake = false;
     };
-    colmena = {
-      url = "github:zhaofengli/colmena";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    deploy-rs = {
-      url = "github:serokell/deploy-rs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    arion = {
-      url = "github:hercules-ci/arion";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hecuba-services = {
-      url = "git+ssh://git@github.com/hektor/hecuba-services?ref=main";
-      flake = false;
-    };
-    git-hooks = {
-      url = "github:cachix/git-hooks.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    stylix = {
-      url = "github:danth/stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -58,15 +38,23 @@
       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,
-      git-hooks,
       home-manager,
       nixgl,
+      git-hooks,
       ...
     }@inputs:
     let
@@ -88,10 +76,7 @@
           nixpkgs.lib.nixosSystem {
             modules = [
               ./hosts/${host}
-              {
+              { nixpkgs.hostPlatform = import ./hosts/${host}/system.nix; }
-                nixpkgs.hostPlatform = (myUtils.hostMeta ./hosts/${host}).system;
-                host.name = host;
-              }
             ];
             specialArgs = {
               inherit
@@ -150,7 +135,6 @@
           };
           modules = [ ./home/hosts/work ];
           extraSpecialArgs = {
-            osConfig = null;
             inherit
               inputs
               outputs
@@ -161,9 +145,7 @@
         };
       };
 
-      apps.${system}.colmena = inputs.colmena.apps.${system}.default // {
+      apps.${system}.colmena = inputs.colmena.apps.${system}.default;
-        meta.description = "colmena";
-      };
 
       colmenaHive = import ./deploy/colmena.nix {
         inherit
@@ -172,14 +154,7 @@
           ;
       };
 
-      deploy = import ./deploy/deploy-rs.nix {
+      checks.${system} = gitHooks.checks;
-        inherit
-          self
-          inputs
-          ;
-      };
-
-      checks.${system} = gitHooks.checks // inputs.deploy-rs.lib.${system}.deployChecks self.deploy;
       formatter.${system} = gitHooks.formatter;
       devShells.${system} = gitHooks.devShells;
 

home/hosts/andromache/default.nix

@@ -8,6 +8,28 @@
 {
   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/shell
+    ../../modules/ssh
+    ../../modules/taskwarrior
+    ../../modules/terminal
+    ../../modules/torrenting
   ];
 
   home = {
@@ -23,43 +45,14 @@
     printing.enable = true;
     modeling.enable = true;
   };
-  ai-tools = {
+  ai-tools.opencode.enable = true;
-    claude-code.enable = true;
-    opencode.enable = true;
-  };
-  anki.enable = true;
-  audio.enable = true;
   browser.primary = "librewolf";
-  cloud = {
+  cloud.hetzner.enable = true;
-    hetzner.enable = true;
-    vercel.enable = true;
-  };
   comms.signal.enable = true;
-  deploy.enable = true;
-  desktop.niri.enable = true;
-  devenv.enable = true;
-  direnv.enable = true;
-  gaming.enable = true;
-  git.enable = true;
   git.github.enable = true;
-  k8s.k9s.enable = true;
+  shell.bash.aliases.lang-js = true;
-  keepassxc.enable = true;
+  shell.bash.addBinToPath = true;
-  music.enable = true;
-  nvim.enable = true;
-  pandoc.enable = true;
-  photography.enable = true;
-  secrets.enable = true;
-  shell = {
-    enable = true;
-    bash.aliases.lang-js = true;
-    bash.addBinToPath = true;
-  };
-  ssh.enable = true;
-  taskwarrior.enable = true;
-  terminal.enable = true;
   torrenting.enable = true;
-  my.yubikey.enable = true;
-  zk.enable = true;
 
   programs = {
     home-manager.enable = true;

home/hosts/astyanax/default.nix

@@ -7,6 +7,27 @@
 {
   imports = [
     ../../modules
+    ../../modules/3d
+    ../../modules/ai-tools
+    ../../modules/anki
+    ../../modules/audio
+    ../../modules/browser
+    ../../modules/cloud
+    ../../modules/comms
+    ../../modules/desktop/niri
+    ../../modules/direnv
+    ../../modules/git
+    ../../modules/k8s/k9s.nix
+    ../../modules/keepassxc
+    ../../modules/music
+    ../../modules/nfc
+    ../../modules/nvim
+    ../../modules/pandoc
+    ../../modules/secrets
+    ../../modules/shell
+    ../../modules/ssh
+    ../../modules/taskwarrior
+    ../../modules/terminal
   ];
 
   home = {
@@ -15,45 +36,17 @@
     homeDirectory = "/home/${config.host.username}";
   };
 
-  xdg.userDirs = {
+  xdg.userDirs.createDirectories = false;
-    enable = false;
+  xdg.userDirs.download = "${config.home.homeDirectory}/dl";
-    createDirectories = false;
-  };
 
   modules."3d".printing.enable = true;
-  ai-tools = {
+  ai-tools.opencode.enable = true;
-    claude-code.enable = true;
-    opencode.enable = true;
-  };
-  anki.enable = true;
-  audio.enable = true;
-  browser.enable = true;
   browser.primary = "librewolf";
   cloud.hetzner.enable = true;
   comms.signal.enable = true;
-  desktop.niri.enable = true;
-  devenv.enable = true;
-  direnv.enable = true;
-  git.enable = true;
   git.github.enable = true;
-  k8s.k9s.enable = true;
+  shell.bash.aliases.lang-js = true;
-  keepassxc.enable = true;
+  shell.bash.addBinToPath = true;
-  music.enable = true;
-  my.yubikey.enable = true;
-  nfc.enable = true;
-  nvim.enable = true;
-  pandoc.enable = true;
-  secrets.enable = true;
-  shell = {
-    enable = true;
-    bash.aliases.lang-js = true;
-    bash.addBinToPath = true;
-  };
-  ssh.enable = true;
-  deploy.enable = true;
-  taskwarrior.enable = true;
-  terminal.enable = true;
-  reference-manager.enable = true;
 
   programs = {
     home-manager.enable = true;

home/hosts/packages.nix

@@ -3,9 +3,7 @@
 with pkgs;
 [
   bat
-  curl
   entr
-  fd
   feh
   fzf
   htop
@@ -15,6 +13,7 @@ with pkgs;
   parallel
   pass
   ripgrep
+  silver-searcher
   sops
   tldr
   tree

home/hosts/work/default.nix

@@ -5,29 +5,53 @@
   ...
 }:
 
+let
+  username = "hektor";
+in
 {
   imports = [
     inputs.sops-nix.homeManagerModules.sops
-    inputs.stylix.homeModules.stylix
     ../../modules
+    ../../modules/ai-tools
+    ../../modules/anki
+    ../../modules/browser
+    ../../modules/bruno
+    ../../modules/cloud
+    ../../modules/comms
+    ../../modules/database
+    ../../modules/dconf
+    ../../modules/desktop/niri
+    ../../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
   ];
 
   sops.age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
 
   nixpkgs.config.allowUnfree = true;
 
-  xdg = {
+  xdg.systemDirs.config = [ "/etc/xdg" ];
-    systemDirs.config = [ "/etc/xdg" ];
-    userDirs = {
-      createDirectories = false;
-      download = "${config.home.homeDirectory}/dl";
-    };
-  };
 
   home = {
     stateVersion = "25.05";
-    username = "hektor";
+    inherit username;
-    homeDirectory = "/home/${config.home.username}";
+    homeDirectory = "/home/${username}";
   };
 
   targets.genericLinux.nixGL = {
@@ -35,60 +59,21 @@
     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;
   };
-  anki.enable = true;
+  database.mssql.enable = true;
-  browser = {
+  database.postgresql.enable = true;
-    enable = true;
+  git.github.enable = true;
-    primary = "firefox";
+  git.gitlab.enable = true;
-    secondary = "chromium";
-  };
-  bruno.enable = true;
-  cloud.azure.enable = true;
-  comms.signal.enable = true;
-  comms.teams.enable = true;
-  database = {
-    mssql.enable = true;
-    postgresql.enable = true;
-    redis.enable = true;
-  };
-  desktop.niri.enable = true;
-  devenv.enable = true;
-  direnv.enable = true;
-  docker.enable = true;
-  git = {
-    enable = true;
-    github.enable = true;
-    gitlab.enable = true;
-  };
-  go.enable = true;
-  k8s.enable = true;
-  keepassxc.enable = true;
-  music.enable = true;
-  my.dconf.enable = true;
-  my.stylix.enable = true;
-  nvim = {
-    enable = true;
-    colorscheme = "vscode";
-  };
-  pandoc.enable = true;
-  shell.enable = true;
-  taskwarrior.enable = true;
-  terminal.enable = true;
-  infra.enable = true;
-  nodejs.enable = true;
-  secrets.enable = true;
   secrets.vault.enable = true;
-  ticketing.enable = true;
-  vscode.enable = true;
-
-  services.home-manager.autoUpgrade = {
-    enable = true;
-    frequency = "weekly";
-  };
 
   programs = {
     gh.enable = true;

home/modules/3d/default.nix

@@ -17,6 +17,7 @@ in
   config = lib.mkMerge [
     (lib.mkIf cfg.printing.enable {
       home.packages = with pkgs; [
+        bambu-studio
         orca-slicer
       ];
     })

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 +1,116 @@
 {
-  imports = [
+  lib,
-    ./claude-code.nix
+  config,
-    ./opencode.nix
+  pkgs,
-    ./skills.nix
+  ...
-    ./tirith.nix
+}:
+let
+  cfg = config.ai-tools;
+  rtk-version = "0.18.1";
+in
+{
+  options.ai-tools = {
+    claude-code.enable = lib.mkEnableOption "claude code with rtk and ccline";
+    tirith.enable = lib.mkEnableOption "tirith shell security guard";
+    opencode.enable = lib.mkEnableOption "opencode";
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.claude-code.enable {
+      home.packages = with pkgs; [
+        claude-code
+        (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" ];
+          };
+        })
+        (pkgs.stdenv.mkDerivation {
+          name = "rtk-${rtk-version}";
+          version = rtk-version;
+          src = pkgs.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 = with pkgs.lib; {
+            description = "RTK - AI coding tool enhancer";
+            homepage = "https://www.rtk-ai.app";
+            license = licenses.mit;
+            platforms = [ "x86_64-linux" ];
+          };
+        })
+        mcp-nixos
+      ];
+    })
+    (lib.mkIf cfg.tirith.enable {
+      home.packages = with pkgs; [
+        tirith
+      ];
+    })
+    (lib.mkIf (cfg.tirith.enable && cfg.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
+      '';
+    })
+    (lib.mkIf cfg.opencode.enable {
+      home.packages = with 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/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.nix

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

home/modules/anki/default.nix

@@ -9,53 +9,31 @@
 }:
 
 let
-  cfg = config.anki;
   sops = myUtils.sopsAvailability config osConfig;
   standalone = osConfig == null;
 in
-{
+lib.optionalAttrs standalone {
-  options.anki.enable = lib.mkEnableOption "Anki";
+  sops.secrets = myUtils.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" "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.";
 
-  config = lib.mkIf cfg.enable (
+  programs.anki = {
-    lib.optionalAttrs standalone {
+    enable = true;
-      sops.secrets = myUtils.mkSopsSecrets "${toString inputs.nix-secrets}/secrets" {
+    package = config.nixgl.wrap pkgs.anki;
-        anki = [
+    addons = with pkgs.ankiAddons; [
-          "sync-user"
+      anki-connect
-          "sync-key"
+      puppy-reinforcement
-        ];
+      review-heatmap
-      };
+    ];
-    }
+    profiles."User 1".sync = lib.mkIf sops.available {
-    // {
+      usernameFile = "${sops.secrets."anki/sync-user".path}";
-      warnings = lib.optional (
+      keyFile = "${sops.secrets."anki/sync-key".path}";
-        !sops.available
+    };
-      ) "anki is enabled but sops secrets are not available. anki sync will not be configured.";
+  };
-
-      programs.anki = {
-        enable = true;
-        package = config.nixgl.wrap pkgs.anki;
-        addons = with pkgs.ankiAddons; [
-          (anki-connect.withConfig {
-            # https://git.sr.ht/~foosoft/anki-connect/tree/master/item/plugin/config.json
-            config = {
-              apiKey = null;
-              apiLogPath = null;
-              webBindAddress = "127.0.0.1";
-              webBindPort = 8765;
-              webCorsOriginList = [ "http://localhost" ];
-              ignoreOriginList = [ ];
-            };
-          })
-          puppy-reinforcement
-          review-heatmap
-        ];
-        profiles."User 1".sync = lib.mkIf sops.available {
-          usernameFile = "${sops.secrets."anki/sync-user".path}";
-          keyFile = "${sops.secrets."anki/sync-key".path}";
-        };
-      };
-
-      # allow Anki to write prefs
-      home.file."${config.xdg.dataHome}/Anki2/prefs21.db".enable = lib.mkForce false;
-    }
-  );
 }

home/modules/audio/default.nix

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

home/modules/browser/default.nix

@@ -1,19 +1,7 @@
-{
+{ lib, ... }:
-  config,
-  lib,
-  ...
-}:
 
 {
-  imports = [
-    ./firefox.nix
-    ./librewolf.nix
-    ./chromium.nix
-  ];
-
   options.browser = {
-    enable = lib.mkEnableOption "browser";
-
     primary = lib.mkOption {
       type = lib.types.enum [
         "firefox"
@@ -35,7 +23,9 @@
     };
   };
 
-  config = lib.mkIf config.browser.enable {
+  imports = [
-    home.sessionVariables.BROWSER = config.browser.primary;
+    ./firefox.nix
-  };
+    ./librewolf.nix
+    ./chromium.nix
+  ];
 }

home/modules/browser/firefox.nix

@@ -10,7 +10,6 @@
   config = lib.mkIf (config.browser.primary == "firefox" || config.browser.secondary == "firefox") {
     programs.firefox = {
       enable = true;
-      configPath = "${config.xdg.configHome}/mozilla/firefox";
     }
     // (import ./firefox-base.nix {
       inherit

home/modules/bruno/default.nix

@@ -1,19 +1,7 @@
-{
+{ config, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
-let
-  cfg = config.bruno;
-in
 {
-  options.bruno = {
+  config = {
-    enable = lib.mkEnableOption "Bruno";
-  };
-
-  config = lib.mkIf cfg.enable {
     home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.bruno "--no-sandbox")) ];
   };
 }

home/modules/clipboard/default.nix

@@ -1,21 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.clipboard;
-in
-{
-  options.clipboard = {
-    enable = lib.mkEnableOption "clipboard";
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      wl-clipboard
-    ];
-  };
-}

home/modules/cloud/default.nix

@@ -3,10 +3,10 @@
 {
   options.cloud = {
     azure = {
-      enable = lib.mkEnableOption "Azure CLI";
+      enable = lib.mkEnableOption "azure CLI";
     };
     hetzner = {
-      enable = lib.mkEnableOption "Hetzner CLI";
+      enable = lib.mkEnableOption "hetzner CLI";
     };
   };
 

home/modules/database/default.nix

@@ -9,18 +9,14 @@
   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) ];
+      home.packages = [ (config.nixgl.wrap pkgs.dbeaver-bin) ];
     })
     (lib.mkIf config.database.postgresql.enable {
-      home.packages = with pkgs; [ (config.nixgl.wrap pgadmin4-desktopmode) ];
+      home.packages = [ (config.nixgl.wrap pkgs.pgadmin4-desktopmode) ];
-    })
-    (lib.mkIf config.database.postgresql.enable {
-      home.packages = with pkgs; [ redis ];
     })
   ];
 }

home/modules/dconf/default.nix

@@ -1,137 +1,124 @@
-{
+{ config, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 let
-  cfg = config.my.dconf;
   terminal = "kitty";
   browser = config.browser.primary;
-  font = "${config.stylix.fonts.monospace.name} ${toString config.stylix.fonts.sizes.applications}";
 in
 {
-  options.my.dconf = {
+  dconf.settings = {
-    enable = lib.mkEnableOption "dconf";
+    "org/gnome/desktop/background" = {
-  };
+      color-shading-type = "solid";
-
+      picture-options = "zoom";
-  config = lib.mkIf cfg.enable {
+      picture-uri = "none";
-    dconf.settings = {
+      picture-uri-dark = "none";
-      "org/gnome/desktop/background" = {
+      primary-color = "#555555";
-        color-shading-type = "solid";
+      secondary-color = "#555555";
-        picture-options = "zoom";
+      show-desktop-icons = false;
-        picture-uri = "none";
-        picture-uri-dark = "none";
-        primary-color = "#555555";
-        secondary-color = "#555555";
-        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/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" ];
-        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" ];
-        switch-applications = [ "<Super>j" ];
-        switch-applications-backward = [ "<Super>k" ];
-        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" ];
-      };
-
-      "org/gnome/desktop/wm/preferences" = {
-        num-workspaces = 5;
-        workspace-names = [
-          "sh"
-          "www"
-          "dev"
-          "info"
-          "etc"
-        ];
-      };
-
-      "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/"
-        ];
-      };
-
-      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-        binding = "Print";
-        command = "flameshot gui";
-        name = "flameshot";
-      };
-
-      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
-        binding = "<Super>Return";
-        command = terminal;
-        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" = {
-        toggle-application-view = [ "<Super>p" ];
-        toggle-quick-settings = [ ];
-      };
     };
 
-    home.packages = with pkgs; [ dconf2nix ];
+    "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 = "Iosevka Term SS08 12";
+      locate-pointer = true;
+      monospace-font-name = "Iosevka Term SS08 12";
+    };
+
+    "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" ];
+      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" ];
+      switch-applications = [ "<Super>j" ];
+      switch-applications-backward = [ "<Super>k" ];
+      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" ];
+    };
+
+    "org/gnome/desktop/wm/preferences" = {
+      num-workspaces = 5;
+      workspace-names = [
+        "sh"
+        "www"
+        "dev"
+        "info"
+        "etc"
+      ];
+    };
+
+    "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/"
+      ];
+    };
+
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+      binding = "Print";
+      command = "flameshot gui";
+      name = "flameshot";
+    };
+
+    "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
+      binding = "<Super>Return";
+      command = terminal;
+      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" = {
+      toggle-application-view = [ "<Super>p" ];
+      toggle-quick-settings = [ ];
+    };
   };
+
+  home.packages = with pkgs; [ dconf2nix ];
 }

home/modules/default.nix

@@ -2,44 +2,29 @@
   config,
   lib,
   pkgs,
-  myUtils,
   ...
 }:
 
 {
-  imports =
+  options.nixgl.wrap = lib.mkOption {
-    let
+    type = lib.types.functionTo lib.types.package;
-      dirs = myUtils.dirNames ./.;
+    default = if config.lib ? nixGL then config.lib.nixGL.wrap else lib.id;
-      hasDef = name: builtins.pathExists ./${name}/default.nix;
+    readOnly = true;
-    in
+  };
-    map (name: ./${name}) (builtins.filter hasDef dirs);
 
-  options = {
+  options.wrapApp = lib.mkOption {
-    host.username = lib.mkOption {
+    type = lib.types.raw;
-      type = lib.types.str;
+    default =
-      default = config.home.username;
+      pkg: flags:
-    };
+      if config.lib ? nixGL then
-
+        pkg.overrideAttrs (old: {
-    nixgl.wrap = lib.mkOption {
+          nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.makeWrapper ];
-      type = lib.types.functionTo lib.types.package;
+          postInstall = (old.postInstall or "") + ''
-      default = if config.lib ? nixGL then config.lib.nixGL.wrap else lib.id;
+            wrapProgram $out/bin/${pkg.meta.mainProgram} --add-flags "${flags}"
-      readOnly = true;
+          '';
-    };
+        })
-
+      else
-    wrapApp = lib.mkOption {
+        pkg;
-      type = lib.types.raw;
+    readOnly = true;
-      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/deploy/colmena-wrapper.bash

@@ -1,68 +0,0 @@
-# `colmena` wrapper script that opens a short-lived SSH master process for
-# `colmena` to use so it works with hardware-backed key touch+PIN. assumes
-# ControlPath ~/.ssh/control/%C (see ../ssh/default.nix)
-
-selector=""
-want_on=0
-on_given=0
-deploy_cmd=0
-nodes=()
-on_nodes=()
-master_processes=()
-
-# build node list from `--on` value, a comma-separated string (e.g. "host-01,host-02")
-for arg in "$@"; do
-  if ((want_on)); then
-    selector="$arg"
-    want_on=0
-    continue
-  fi
-  case "$arg" in
-    --on=*)
-      selector="${arg#--on=}"
-      on_given=1
-      ;;
-    --on) want_on=1 on_given=1 ;;
-    apply | exec | upload-keys) deploy_cmd=1 ;;
-  esac
-done
-
-# shellcheck disable=SC2154
-if ((deploy_cmd)) && ! ((on_given)); then
-  on_nodes=("${!_colmena_node_tags[@]}")
-else
-  IFS=',' read -ra nodes <<< "$selector"
-  for node in "${nodes[@]}"; do
-    for node_tag in "${!_colmena_node_tags[@]}"; do
-      if [[ "$node" == @* ]]; then
-        for tag in ${_colmena_node_tags[$node_tag]}; do
-          # shellcheck disable=SC2053
-          [[ "$tag" == ${node#@} ]] && on_nodes+=("$node_tag")
-        done
-      else
-        # shellcheck disable=SC2053
-        [[ "$node_tag" == $node ]] && on_nodes+=("$node_tag")
-      fi
-    done
-  done
-fi
-
-for node in "${on_nodes[@]}"; do
-  # check if master process is running (see `man ssh`)
-  ssh -O check "$node" 2>/dev/null && continue
-
-  # place ssh client into "master" mode for connection sharing (see `man ssh`)
-  if ssh -fNM "$node"; then
-    master_processes+=("$node")
-  fi
-done
-
-rc=0
-@colmena@ "$@" || rc=$?
-
-# request master processes to exit (see `man ssh`)
-for process in "${master_processes[@]}"; do
-  ssh -O exit "$process" 2>/dev/null || true
-done
-
-exit "$rc"

home/modules/deploy/default.nix

@@ -1,65 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  myUtils,
-  ...
-}:
-
-let
-  cfg = config.deploy;
-
-  hostDir = ../../../hosts;
-  hostNames = myUtils.dirNames hostDir;
-  hostsWithKeys = lib.filter (
-    hostname: builtins.pathExists (hostDir + "/${hostname}/ssh_host.pub")
-  ) hostNames;
-
-  colmena = inputs.colmena.packages.${pkgs.stdenv.hostPlatform.system}.colmena;
-  deployRs = inputs.deploy-rs.packages.${pkgs.stdenv.hostPlatform.system}.default;
-
-  hostTags = hostname: (myUtils.hostMeta (hostDir + "/${hostname}")).tags;
-  nodeTagsDecl = ''
-    declare -A _colmena_node_tags=(
-    ${lib.concatMapStringsSep "\n" (
-      hostname: "  [${hostname}]=${lib.escapeShellArg (lib.concatStringsSep " " (hostTags hostname))}"
-    ) hostsWithKeys}
-    )
-  '';
-
-  colmenaWrapped = pkgs.writeShellApplication {
-    name = "colmena";
-    runtimeInputs = [ pkgs.openssh ];
-    text =
-      nodeTagsDecl
-      + lib.replaceStrings [ "@colmena@" ] [ "${colmena}/bin/colmena" ] (
-        builtins.readFile ./colmena-wrapper.bash
-      );
-  };
-
-  deployRsWrapped = pkgs.writeShellApplication {
-    name = "deploy";
-    runtimeInputs = [ pkgs.openssh ];
-    text = lib.replaceStrings [ "@deploy@" ] [ "${deployRs}/bin/deploy" ] (
-      builtins.readFile ./deploy-rs-wrapper.bash
-    );
-  };
-in
-{
-  options.deploy.enable = lib.mkEnableOption "deploy";
-
-  config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = config.ssh.enable;
-        message = "'home/modules/deploy' requires 'home/modules/ssh'";
-      }
-    ];
-
-    home.packages = [
-      colmenaWrapped
-      deployRsWrapped
-    ];
-  };
-}

home/modules/deploy/deploy-rs-wrapper.bash

@@ -1,34 +0,0 @@
-# `deploy` wrapper script that opens a short-lived SSH master process for
-# `deploy-rs` to use so it works with hardware-backed key touch+PIN. assumes
-# ControlPath ~/.ssh/control/%C (see ../ssh/default.nix)
-
-# extract the target host from the `deploy-rs` flake target (e.g. `.#hecuba`)
-node=""
-for arg in "$@"; do
-  case "$arg" in
-    -*) ;;
-    *'#'*)
-      node="${arg#*#}"   # strip flake ref up to '#'
-      node="${node%%@*}" # strip '@user'
-      node="${node%%.*}" # strip '.profile'
-      ;;
-  esac
-done
-
-master=0
-if [[ -n "$node" ]] && ! ssh -O check "$node" 2>/dev/null; then
-  # place ssh client into "master" mode for connection sharing (see `man ssh`)
-  if ssh -fNM "$node"; then
-    master=1
-  fi
-fi
-
-rc=0
-@deploy@ "$@" || rc=$?
-
-# request the master process to exit (see `man ssh`)
-if ((master)); then
-  ssh -O exit "$node" 2>/dev/null || true
-fi
-
-exit "$rc"

home/modules/desktop/default.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  imports = [ ./niri ];
-}

home/modules/desktop/niri/config.kdl

@@ -179,5 +179,4 @@ binds {
     Alt+Print  { screenshot-window; }
 
     Mod+Shift+Delete { quit; }
-
 }

home/modules/desktop/niri/default.nix

@@ -1,64 +1,26 @@
-{
+{ pkgs, ... }:
-  lib,
-  pkgs,
-  config,
-  ...
-}:
 
 {
-  options.desktop.niri.enable = lib.mkEnableOption "niri desktop";
+  imports = [
+    ../../fuzzel
+    ../../mako
+    ../../shikane
+    ../../waybar
+  ];
 
-  config = lib.mkIf config.desktop.niri.enable {
+  home = {
-    clipboard.enable = lib.mkDefault true;
+    file.".config/niri/config.kdl".source = ./config.kdl;
-    fuzzel.enable = lib.mkDefault true;
+    packages = with pkgs; [
-    mako.enable = lib.mkDefault true;
+      brightnessctl
-    shikane.enable = lib.mkDefault true;
+      wl-clipboard
-    swayidle.enable = lib.mkDefault true;
+      wlsunset
-    waybar.enable = lib.mkDefault true;
+    ];
+  };
 
-    home = {
+  services.gammastep = {
-      file.".config/niri/config.kdl".source = ./config.kdl;
+    enable = true;
-      packages = with pkgs; [
+    provider = "manual";
-        brightnessctl
+    latitude = 51.05;
-        wlsunset
+    longitude = 3.71667;
-      ];
-    };
-
-    services.gammastep = {
-      enable = true;
-      provider = "manual";
-      latitude = 51.05;
-      longitude = 3.71667;
-    };
-
-    xdg.configFile."electron-flags.conf".text = ''
-      --enable-features=UseOzonePlatform
-      --ozone-platform=wayland
-    '';
-
-    xdg.portal = {
-      enable = true;
-      config = {
-        niri = {
-          default = [
-            "gnome"
-            "gtk"
-          ];
-          "org.freedesktop.impl.portal.Access" = "gtk";
-          "org.freedesktop.impl.portal.Notification" = "gtk";
-          "org.freedesktop.impl.portal.Secret" = "gnome-keyring";
-          "org.freedesktop.impl.portal.FileChooser" = "gtk";
-          "org.freedesktop.impl.portal.ScreenCast" = [ "gnome" ];
-          "org.freedesktop.impl.portal.Settings" = [
-            "gnome"
-            "gtk"
-          ];
-        };
-      };
-      extraPortals = [
-        pkgs.xdg-desktop-portal-gtk
-        pkgs.xdg-desktop-portal-gnome
-      ];
-    };
   };
 }

home/modules/devenv/default.nix

@@ -1,19 +1,4 @@
+{ pkgs, ... }:
 {
-  config,
+  home.packages = [ pkgs.devenv ];
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.devenv;
-in
-{
-  options.devenv = {
-    enable = lib.mkEnableOption "devenv";
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = [ pkgs.devenv ];
-  };
 }

home/modules/direnv/default.nix

@@ -1,20 +1,7 @@
 {
-  config,
+  programs.direnv = {
-  lib,
+    enable = true;
-  ...
+    enableBashIntegration = true;
-}:
+    nix-direnv.enable = true;
-
-let
-  cfg = config.direnv;
-in
-{
-  options.direnv.enable = lib.mkEnableOption "direnv";
-
-  config = lib.mkIf cfg.enable {
-    programs.direnv = {
-      enable = true;
-      enableBashIntegration = true;
-      nix-direnv.enable = true;
-    };
   };
 }

home/modules/docker/default.nix

@@ -1,21 +1,7 @@
-{
+{ pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
-let
-  cfg = config.docker;
-in
 {
-  options.docker = {
+  home.packages = with pkgs; [
-    enable = lib.mkEnableOption "Docker";
+    dive
-  };
+  ];
-
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      dive
-    ];
-  };
 }

home/modules/fuzzel/default.nix

@@ -1,27 +1,14 @@
 {
-  config,
+  programs.fuzzel = {
-  lib,
+    enable = true;
-  ...
+    settings = {
-}:
+      main = {
-
+        horizontal-pad = 0;
-let
+        vertical-pad = 0;
-  cfg = config.fuzzel;
+      };
-in
+      border = {
-{
+        width = 2;
-  options.fuzzel.enable = lib.mkEnableOption "fuzzel";
+        radius = 0;
-
-  config = lib.mkIf cfg.enable {
-    programs.fuzzel = {
-      enable = true;
-      settings = {
-        main = {
-          horizontal-pad = 0;
-          vertical-pad = 0;
-        };
-        border = {
-          width = 2;
-          radius = 0;
-        };
       };
     };
   };

home/modules/gaming/default.nix

@@ -1,15 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-
-{
-  options.gaming.enable = lib.mkEnableOption "gaming";
-
-  config = lib.mkIf config.gaming.enable {
-    xdg.configFile."lutris/system.yml".text = lib.generators.toJSON { } {
-      system.game_path = "${config.home.homeDirectory}/games";
-    };
-  };
-}

home/modules/git/default.nix

@@ -8,12 +8,11 @@
 
 {
   options.git = {
-    enable = lib.mkEnableOption "git";
     github.enable = lib.mkEnableOption "Github CLI";
     gitlab.enable = lib.mkEnableOption "Gitlab CLI";
   };
 
-  config = lib.mkIf config.git.enable {
+  config = {
     programs.git.enable = true;
     home.file = {
       ".gitconfig".source = dotsPath + "/.gitconfig";

home/modules/go/default.nix

@@ -1,22 +1,7 @@
+{ pkgs, ... }:
 {
-  config,
+  home.packages = with pkgs; [
-  lib,
+    go
-  pkgs,
+    gopls
-  ...
+  ];
-}:
-
-{
-  options.go = {
-    enable = lib.mkEnableOption "Go";
-  };
-
-  config = lib.mkIf config.go.enable {
-    home = {
-      sessionVariables.GOPATH = "${config.xdg.dataHome}/go";
-      packages = with pkgs; [
-        go
-        gopls
-      ];
-    };
-  };
 }

home/modules/infra/default.nix

@@ -1,19 +1,7 @@
-{
+{ pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
-let
-  cfg = config.infra;
-in
 {
-  options.infra = {
+  config = {
-    enable = lib.mkEnableOption "infrastructure tools";
-  };
-
-  config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
       opentofu
       upbound

home/modules/k8s/default.nix

@@ -1,41 +1,25 @@
-{
+{ pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
-let
-  cfg = config.k8s;
-in
 {
+  home.packages = with pkgs; [
+    argocd
+    fluxcd
+    k3d
+    kubectl
+    kubernetes
+    kustomize
+    minikube
+    opentofu
+    upbound
+  ];
+
+  programs.kubecolor = {
+    enable = true;
+    enableAlias = true;
+  };
+
   imports = [
     ./helm.nix
     ./k9s.nix
   ];
-
-  options.k8s.enable = lib.mkEnableOption "k8s";
-
-  config = lib.mkIf cfg.enable {
-    k8s.helm.enable = lib.mkDefault true;
-    k8s.k9s.enable = lib.mkDefault true;
-
-    home.packages = with pkgs; [
-      argocd
-      fluxcd
-      k3d
-      kubectl
-      kubernetes
-      kustomize
-    ];
-
-    programs.kubecolor = {
-      enable = true;
-      enableAlias = true;
-    };
-
-    home.shellAliases = {
-      k = "kubectl";
-    };
-  };
 }

home/modules/k8s/helm.nix

@@ -1,27 +1,15 @@
-{
+{ pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
-let
-  cfg = config.k8s.helm;
-in
 {
-  options.k8s.helm.enable = lib.mkEnableOption "helm";
+  home.packages = with pkgs; [
-
+    (wrapHelm kubernetes-helm {
-  config = lib.mkIf cfg.enable {
+      plugins = with kubernetes-helmPlugins; [
-    home.packages = with pkgs; [
+        helm-diff
-      (wrapHelm kubernetes-helm {
+        helm-git
-        plugins = with kubernetes-helmPlugins; [
+        helm-schema
-          helm-diff
+        helm-secrets
-          helm-git
+        helm-unittest
-          helm-schema
+      ];
-          helm-secrets
+    })
-          helm-unittest
+  ];
-        ];
-      })
-    ];
-  };
 }

home/modules/k8s/k9s.nix

@@ -1,23 +1,10 @@
 {
-  config,
+  programs.k9s = {
-  lib,
+    enable = true;
-  ...
+    settings.k9s = {
-}:
+      ui = {
-
+        logoless = true;
-let
+        reactive = true;
-  cfg = config.k8s.k9s;
-in
-{
-  options.k8s.k9s.enable = lib.mkEnableOption "k9s";
-
-  config = lib.mkIf cfg.enable {
-    programs.k9s = {
-      enable = true;
-      settings.k9s = {
-        ui = {
-          logoless = true;
-          reactive = true;
-        };
       };
     };
   };

home/modules/keepassxc/default.nix

@@ -1,22 +1,8 @@
 {
-  config,
+  programs.keepassxc = {
-  lib,
+    enable = true;
-  ...
+    settings = {
-}:
+      Browser.Enabled = true;
-
-let
-  cfg = config.keepassxc;
-in
-{
-  options.keepassxc.enable = lib.mkEnableOption "KeePassXC";
-
-  config = lib.mkIf cfg.enable {
-    programs.keepassxc = {
-      enable = true;
-      settings = {
-        Browser.Enabled = true;
-        SSHAgent.Enabled = true;
-      };
     };
   };
 }

home/modules/mako/default.nix

@@ -1,16 +1,5 @@
 {
-  config,
+  services.mako = {
-  lib,
+    enable = true;
-  ...
-}:
-
-let
-  cfg = config.mako;
-in
-{
-  options.mako.enable = lib.mkEnableOption "mako";
-
-  config = lib.mkIf cfg.enable {
-    services.mako.enable = true;
   };
 }

home/modules/music/default.nix

@@ -1,13 +1,10 @@
 {
-  config,
-  lib,
-  pkgs,
   dotsPath,
+  pkgs,
   ...
 }:
 
 let
-  cfg = config.music;
   spotifyWithWayland = pkgs.symlinkJoin {
     name = "spotify";
     paths = [ pkgs.spotify ];
@@ -19,14 +16,12 @@ let
   };
 in
 {
-  options.music.enable = lib.mkEnableOption "music";
+  home.packages = with pkgs; [
+    spotifyWithWayland
+  ];
 
-  config = lib.mkIf cfg.enable {
+  programs.ncspot = {
-    home.packages = [ spotifyWithWayland ];
+    enable = true;
-
+    settings = builtins.fromTOML (builtins.readFile (dotsPath + "/.config/ncspot/config.toml"));
-    programs.ncspot = {
-      enable = true;
-      settings = fromTOML (builtins.readFile (dotsPath + "/.config/ncspot/config.toml"));
-    };
   };
 }

home/modules/nfc/default.nix

@@ -1,21 +1,5 @@
 {
-  config,
+  imports = [
-  lib,
+    ./proxmark3.nix
-  pkgs,
+  ];
-  ...
-}:
-
-let
-  cfg = config.nfc;
-in
-{
-  options.nfc = {
-    enable = lib.mkEnableOption "NFC tools";
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = [
-      (pkgs.proxmark3.override { withGeneric = true; })
-    ];
-  };
 }

home/modules/nfc/proxmark3.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  home.packages = [
+    (pkgs.proxmark3.override { withGeneric = true; })
+  ];
+}

home/modules/nodejs/default.nix

@@ -5,21 +5,15 @@
   ...
 }:
 
-let
-  cfg = config.nodejs;
-in
 {
-  options.nodejs = {
+  options.nodejs.package = lib.mkOption {
-    enable = lib.mkEnableOption "Node.js";
+    type = lib.types.package;
-    package = lib.mkOption {
+    default = pkgs.nodejs_24;
-      type = lib.types.package;
-      default = pkgs.nodejs_24;
-    };
   };
 
-  config = lib.mkIf cfg.enable {
+  config = {
     home.packages = with pkgs; [
-      cfg.package
+      config.nodejs.package
       pnpm
       yarn
       biome