chore: update lockfile

dots/.bashrc

@@ -5,8 +5,7 @@
 
 . /etc/os-release
 
-# Editor & prompt configuration
-[ -f "$HOME/.bashrc.d/editor" ] && . "$HOME/.bashrc.d/editor"
+# Prompt configuration
 [ -f "$HOME/.bashrc.d/prompt" ] && . "$HOME/.bashrc.d/prompt"
 
 # Aliases {{{
@@ -31,24 +30,6 @@ 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
@@ -58,16 +39,6 @@ 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='rg --files ""'
-  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
@@ -82,10 +53,6 @@ else
 fi
 # }}}
 
-# Go {{{
-export GOPATH="${XDG_DATA_HOME}/go"
-# }}}
-
 # Jupyter {{{
 export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab
 # }}}
@@ -94,10 +61,6 @@ 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"
-
-
 # Codi
 # Usage: codi [filetype] [filename]
 codi() {

dots/.bashrc.d/editor

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

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,confirm
+paste_actions quote-urls-at-prompt
 
 #: }}}
 
@@ -54,17 +54,6 @@ 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
@@ -128,14 +117,6 @@ 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/nvim/site/pack/paqs/start/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py
+action_alias kitty_scrollback_nvim kitten ~/.local/share/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

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

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

@@ -0,0 +1,26 @@
+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,19 +5,3 @@ 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

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

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

@@ -1 +0,0 @@
-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/mcphub.nvim.lua

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

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

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

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

@@ -0,0 +1,14 @@
+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/zenbones.lua

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

dots/.config/nvim/flake.lock

@@ -1,45 +1,5 @@
 {
   "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,
@@ -57,27 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743689281,
-        "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1777270315,
-        "narHash": "sha256-yKB4G6cKsQsWN7M6rZGk6gkJPDNPIzT05y4qzRyCDlI=",
+        "lastModified": 1787424095,
+        "narHash": "sha256-dWLO5AHhKaw6rdWCtTes8hnntT1r0/J5yhQGm0f0ZgU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6368eda62c9775c38ef7f714b2555a741c20c72d",
+        "rev": "174eb786fb68e3a13e4e535a3deea479a0c07a6a",
         "type": "github"
       },
       "original": {
@@ -103,38 +47,6 @@
         "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": {
@@ -185,12 +97,9 @@
     },
     "root": {
       "inputs": {
-        "mcp-hub": "mcp-hub",
         "nixCats": "nixCats",
-        "nixpkgs": "nixpkgs_2",
+        "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"

dots/.config/nvim/flake.nix

@@ -2,7 +2,6 @@
   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";
@@ -24,14 +23,6 @@
       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;
-    };
 
   };
 
@@ -49,7 +40,6 @@
         allowUnfreePredicate =
           pkg:
           builtins.elem (nixpkgs.lib.getName pkg) [
-            "copilot-language-server"
             "vim-sandwich"
             "jupytext.nvim"
             "eyeliner.nvim"
@@ -64,11 +54,8 @@
           ];
       };
 
-      mkDependencyOverlays = system: [
+      mkDependencyOverlays = [
         (utils.standardPluginOverlay inputs)
-        (_final: _prev: {
-          mcp-hub = inputs.mcp-hub.packages.${system}.default;
-        })
         (_: prev: {
           luajitPackages = prev.luajitPackages.overrideScope (
             _: lprev: {
@@ -83,8 +70,12 @@
       categoryDefinitions =
         {
           pkgs,
+          categories,
           ...
         }:
+        let
+          themes = import ./themes.nix pkgs;
+        in
         {
           lspsAndRuntimeDeps = with pkgs; {
             general = [
@@ -92,7 +83,7 @@
               black
               clang
               clang-tools
-              curl # → plenary-nvim, mcp-hub
+              curl # → plenary-nvim
               delta
               emmet-language-server
               eslint_d
@@ -103,7 +94,6 @@
               helm-ls
               isort
               lua-language-server
-              mcp-hub
               nixd
               nixfmt
               prettier
@@ -126,7 +116,9 @@
           };
 
           startupPlugins = {
-            general = with pkgs.vimPlugins; [
+            general =
+              with pkgs.vimPlugins;
+              [
                 ## plug
                 vim-plug
                 vim-sandwich
@@ -168,9 +160,8 @@
                 plenary-nvim
                 nui-nvim
                 trouble-nvim
-              pkgs.neovimPlugins.shipwright-nvim
                 lush-nvim
-              zenbones-nvim
+                pkgs.neovimPlugins.shipwright-nvim
                 nvim-treesitter.withAllGrammars
                 nvim-treesitter-textobjects
                 # nvim-treesitter-context
@@ -187,16 +178,15 @@
                 pkgs.neovimPlugins.beancount-nvim
                 pkgs.neovimPlugins.nvimkit-nvim
                 codecompanion-nvim
-              pkgs.neovimPlugins.mcphub-nvim
-              copilot-lua
-              copilot-cmp
-              pkgs.neovimPlugins.helm-ls-nvim
+                helm-ls-nvim
                 kitty-scrollback-nvim
                 fidget-nvim
                 rustaceanvim
                 # pkgs.neovimPlugins.m-taskwarrior-d-nvim
-              claude-code-nvim
-            ];
+                claudecode-nvim
+                snacks-nvim
+              ]
+              ++ themes.${categories.colorscheme or "zenwritten"};
           };
 
           optionalPlugins = {
@@ -221,6 +211,7 @@
           };
           categories = {
             general = true;
+            colorscheme = "zenwritten";
           };
         };
       };
@@ -230,7 +221,7 @@
     forEachSystem (
       system:
       let
-        dependencyOverlays = mkDependencyOverlays system;
+        dependencyOverlays = mkDependencyOverlays;
         nixCatsBuilder = utils.baseBuilder luaPath {
           inherit
             nixpkgs

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

@@ -15,7 +15,6 @@ 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

@@ -16,5 +16,4 @@ require("diagnostic")
 require("utils")
 require("zk")
 require("reload")
-
-vim.opt.background = "dark"
+require("theme")

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

@@ -22,6 +22,7 @@ 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" })
@@ -34,9 +35,6 @@ 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/theme.lua

@@ -0,0 +1,8 @@
+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/themes.nix

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

flake.lock

@@ -101,11 +101,11 @@
         "stable": "stable"
       },
       "locked": {
-        "lastModified": 1785930890,
-        "narHash": "sha256-QN4Oy1B4Vma9DiMyXiyssrpgMuIPgkNyO8jb6k2H4oY=",
+        "lastModified": 1786742289,
+        "narHash": "sha256-r61K9svFDQkI5jONYksneDtDT5c4SkWrZVD3ni5O6Ak=",
         "owner": "zhaofengli",
         "repo": "colmena",
-        "rev": "a156fd9146e69a577fe6f5542a7c6ed83a6888ce",
+        "rev": "dc22786a43315b212eeafe13409a7203328e5a30",
         "type": "github"
       },
       "original": {
@@ -123,11 +123,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1786220854,
-        "narHash": "sha256-/b79w+zO/+sJ1ADXUfkemP+0kBV+HPxmZVY7xlPI2ag=",
+        "lastModified": 1788879443,
+        "narHash": "sha256-qb9sL86UCUEd3SYAda4ItN1NV0vhMSdbpA64WckvVI0=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "4dcc87bbf8b3e63ecbe2bf3bb77d729ced7d91d8",
+        "rev": "414ac5f35d79aabe5a0bf52451d8cf61eadf6c88",
         "type": "github"
       },
       "original": {
@@ -165,11 +165,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1786177081,
-        "narHash": "sha256-k8oMgW50OIXcGEz6Unic8sV3c+GTvinL3UUZL1TRayM=",
+        "lastModified": 1788926592,
+        "narHash": "sha256-cHzKQBhQVLPfMCtK+E0EMeQpwW2/XA9l+8H6xXsT+70=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "e56e2b53b293be127a1360c7d30c713eaaadce08",
+        "rev": "9d230a63e1419b6efd95728f01a6a72e1986a03f",
         "type": "gitlab"
       },
       "original": {
@@ -265,28 +265,6 @@
       }
     },
     "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nvim",
-          "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"
-      }
-    },
-    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
@@ -367,11 +345,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784288435,
-        "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=",
+        "lastModified": 1788267358,
+        "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9",
+        "rev": "27555e2624241fb116b49095df4caaee85a25691",
         "type": "github"
       },
       "original": {
@@ -418,19 +396,18 @@
     "hecuba-services": {
       "flake": false,
       "locked": {
-        "lastModified": 1787190763,
-        "narHash": "sha256-hZCD0M5mt6gP5z21dYOslx9d7aoF5XTCgB0axt8O+SA=",
+        "lastModified": 1788557536,
+        "narHash": "sha256-oG0PyMqzA11EGfqY86iU73DjYq5HHoK89kQW0xaPHf4=",
         "ref": "main",
-        "rev": "838434daa9844608863c93627aa466a0109237b5",
-        "shallow": true,
+        "rev": "29002359b7a863b12bed5a83a1cafc53c660a14a",
+        "revCount": 218,
         "type": "git",
         "url": "ssh://git@github.com/hektor/hecuba-services"
       },
       "original": {
-        "type": "git",
-        "url": "ssh://git@github.com/hektor/hecuba-services",
         "ref": "main",
-        "shallow": true
+        "type": "git",
+        "url": "ssh://git@github.com/hektor/hecuba-services"
       }
     },
     "home-manager": {
@@ -440,11 +417,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786031233,
-        "narHash": "sha256-TIDlLTLI1/pB7IqgjzcKQjpODQsZE2oII4XGG9B6KjI=",
+        "lastModified": 1788921139,
+        "narHash": "sha256-2wRuvf9UDw1SYWtBcxNmxLeAtNU1i/hc1c0AKQHdvlM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7834e82588860aaf780cec1366524456a70898d7",
+        "rev": "a2dbe7c2c9333e8234ae8114c7f731784201d108",
         "type": "github"
       },
       "original": {
@@ -453,25 +430,6 @@
         "type": "github"
       }
     },
-    "mcp-hub": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1755841689,
-        "narHash": "sha256-KakvXZf0vjdqzyT+LsAKHEr4GLICGXPmxl1hZ3tI7Yg=",
-        "owner": "ravitemer",
-        "repo": "mcp-hub",
-        "rev": "9c7670a4c341ed3cf738a6242c0fde1cea40bccf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ravitemer",
-        "repo": "mcp-hub",
-        "type": "github"
-      }
-    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -496,10 +454,10 @@
     "nix-secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1785190089,
-        "narHash": "sha256-nhzJq5kkcU9X5QXhErn1pHqqN5TPxUVV0teOd+yMzN4=",
+        "lastModified": 1788786361,
+        "narHash": "sha256-u6qgw8xKHLdlC02HZnC89WzigADbXoO4mGsllMMj5FM=",
         "ref": "main",
-        "rev": "3375f7a8ccb4dc3c5ea3c488597c659665973e4d",
+        "rev": "b560101cef698142dd15cacc222c2c6135b8ab04",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@github.com/hektor/nix-secrets"
@@ -552,11 +510,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1785232496,
-        "narHash": "sha256-65EQYIRRpTdpH8lUiB6Mvo5uBkG60aBIzAJuALfx+O0=",
+        "lastModified": 1788942796,
+        "narHash": "sha256-CLoJCCRi9sogsyGXYn8rOCWBLKAntfKUB9Rli/YXgEY=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "2e790b0a6be8ec2b76174ac0931b8ff11919ec98",
+        "rev": "83bbc895120516d6e86885a188c04beced6535d9",
         "type": "github"
       },
       "original": {
@@ -581,11 +539,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1785967620,
-        "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=",
+        "lastModified": 1788881743,
+        "narHash": "sha256-2V9GZGvPfrNzxFozhI9dcqV+c3QdA8YZrvAAzqEB+dI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436",
+        "rev": "d6524aaca2ff07876657ae2b323f24be4874944b",
         "type": "github"
       },
       "original": {
@@ -595,22 +553,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
-      "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": [
@@ -638,14 +580,11 @@
     },
     "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"
@@ -676,38 +615,6 @@
         "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": {
@@ -782,11 +689,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1783174389,
-        "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=",
+        "lastModified": 1788914643,
+        "narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
+        "rev": "13616fff713a9f94055c66f15687ebdc17a335df",
         "type": "github"
       },
       "original": {
@@ -818,7 +725,7 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"
@@ -831,11 +738,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1786216702,
-        "narHash": "sha256-fOOmw9tUYeqWVnK2w2NiuMTmGIbluj8xiBFTTFDCcEE=",
+        "lastModified": 1787771653,
+        "narHash": "sha256-DkkJSBOXWV/mja5Vy8az5g1KpZlsbUwlmH0BsQhowaQ=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "b67debfd2db1eb1f0fd8740b950f598bbaf74b8f",
+        "rev": "5e3809851f486e7fc7e84b40f174c74b60ecc784",
         "type": "github"
       },
       "original": {

flake.nix

@@ -31,7 +31,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hecuba-services = {
-      url = "git+ssh://git@github.com/hektor/hecuba-services?shallow=1&ref=main";
+      url = "git+ssh://git@github.com/hektor/hecuba-services?ref=main";
       flake = false;
     };
     git-hooks = {

home/hosts/andromache/default.nix

@@ -27,34 +27,36 @@
     claude-code.enable = true;
     opencode.enable = true;
   };
-  desktop.niri.enable = true;
-  browser.enable = true;
+  anki.enable = true;
+  audio.enable = true;
   browser.primary = "librewolf";
-  cloud.hetzner.enable = true;
-  gaming.enable = true;
+  cloud = {
+    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;
+  keepassxc.enable = 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;
   };
-  anki.enable = true;
-  k8s.k9s.enable = true;
-  secrets.enable = true;
-  taskwarrior.enable = true;
-  audio.enable = true;
   ssh.enable = true;
-  deploy.enable = true;
-  music.enable = true;
+  taskwarrior.enable = true;
   terminal.enable = true;
-  devenv.enable = true;
-  keepassxc.enable = true;
-  direnv.enable = true;
-  nvim.enable = true;
-  pandoc.enable = true;
-  photography.enable = true;
   torrenting.enable = true;
   my.yubikey.enable = true;
   zk.enable = true;

home/hosts/work/default.nix

@@ -70,7 +70,10 @@
   music.enable = true;
   my.dconf.enable = true;
   my.stylix.enable = true;
-  nvim.enable = true;
+  nvim = {
+    enable = true;
+    colorscheme = "vscode";
+  };
   pandoc.enable = true;
   shell.enable = true;
   taskwarrior.enable = true;

home/modules/go/default.nix

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

home/modules/k8s/default.nix

@@ -27,7 +27,6 @@ in
       kubectl
       kubernetes
       kustomize
-      minikube
     ];
 
     programs.kubecolor = {

home/modules/nvim/default.nix

@@ -1,20 +1,46 @@
 {
-  config,
-  lib,
-  pkgs,
   inputs,
+  pkgs,
+  lib,
+  config,
   ...
 }:
 
 let
-  cfg = config.nvim;
+  themes = import "${inputs.nvim}/themes.nix" pkgs;
+  plugins = themes.${config.nvim.colorscheme};
 in
 {
-  options.nvim.enable = lib.mkEnableOption "nvim";
+  imports = [ inputs.nvim.homeModules.default ];
 
-  config = lib.mkIf cfg.enable {
-    home.packages = [
-      inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.nvim
-    ];
+  options.nvim.colorscheme = lib.mkOption {
+    type = lib.types.enum (lib.attrNames themes);
+    default = "zenwritten";
+  };
+
+  config = lib.mkIf config.nvim.enable {
+    nvim.packageDefinitions.merge.nvim = _: {
+      categories.colorscheme = config.nvim.colorscheme;
+    };
+
+    home = {
+      sessionVariables = {
+        EDITOR = "nvim";
+        SUDO_EDITOR = "nvim";
+        SYSTEMD_EDITOR = "nvim";
+
+        PAGER = "nvimpager";
+        MANWIDTH = "80";
+      };
+      packages = with pkgs; [ nvimpager ];
+    };
+
+    xdg.configFile."nvimpager/init.lua".text = ''
+      vim.opt.clipboard = "unnamedplus"
+      vim.opt.background = "dark"
+      vim.g.zenwritten_compat = 1
+      ${lib.concatMapStringsSep "\n" (plugin: ''vim.opt.runtimepath:append("${plugin}")'') plugins}
+      vim.cmd.colorscheme("${config.nvim.colorscheme}")
+    '';
   };
 }

home/modules/shell/bash.nix

@@ -7,7 +7,7 @@
 
 let
   cfg = config.shell.bash;
-  inherit (config.home) username;
+  inherit (config.home) homeDirectory;
 in
 {
   options.shell.bash = {
@@ -37,15 +37,29 @@ in
     programs.bash = {
       enable = true;
       enableCompletion = true;
+
+      historySize = 999999;
+      historyFileSize = -1; # unlimited
+      historyControl = [
+        "ignoreboth"
+        "erasedups"
+      ];
+      # omit commands from history (e.g. those prepended with space)
+      historyIgnore = [
+        " *"
+        "clear"
+        "l"
+        "ls"
+        "cd"
+      ];
+
       initExtra = ''
-        for f in /home/${username}/.bashrc.d/*; do
+        for f in ${homeDirectory}/.bashrc.d/*; do
           [ -f "$f" ] && source "$f"
         done
 
-        ${lib.optionalString cfg.aliases.all "source /home/${username}/.bash_aliases/all"}
-        ${lib.optionalString cfg.aliases.lang-js "source /home/${username}/.bash_aliases/lang-js"}
-
-        ${lib.optionalString cfg.addBinToPath "export PATH=${dotsPath}/.bin:$PATH"}
+        ${lib.optionalString cfg.aliases.all "source ${homeDirectory}/.bash_aliases/all"}
+        ${lib.optionalString cfg.aliases.lang-js "source ${homeDirectory}/.bash_aliases/lang-js"}
 
         ${cfg.extraInit}
       '';
@@ -54,7 +68,6 @@ in
     home.file = {
       ".inputrc".source = dotsPath + "/.inputrc";
       ".bashrc.d/prompt".source = dotsPath + "/.bashrc.d/prompt";
-      ".bashrc.d/editor".source = dotsPath + "/.bashrc.d/editor";
     }
     // lib.optionalAttrs cfg.aliases.all {
       ".bash_aliases/all".source = dotsPath + "/.bash_aliases/all";
@@ -62,5 +75,6 @@ in
     // lib.optionalAttrs cfg.aliases.lang-js {
       ".bash_aliases/lang-js".source = dotsPath + "/.bash_aliases/lang-js";
     };
+    home.sessionPath = lib.optional cfg.addBinToPath "${dotsPath}/.bin";
   };
 }

home/modules/shell/utils.nix

@@ -10,6 +10,15 @@
     programs.fzf = {
       enable = true;
       enableBashIntegration = lib.mkDefault true;
+      defaultCommand = "rg --files";
+      defaultOptions = [
+        "--pointer='❭'"
+        "--height 10%"
+      ];
+      fileWidget = {
+        command = "rg --files";
+        options = [ "--preview 'bat {} | head -500'" ];
+      };
     };
 
     home.packages = with pkgs; [

home/modules/terminal/default.nix

@@ -24,5 +24,6 @@ in
     };
 
     home.file.".config/kitty/nvim.conf".source = dotsPath + "/.config/kitty/nvim.conf";
+    home.file.".local/share/kitty-scrollback.nvim".source = pkgs.vimPlugins.kitty-scrollback-nvim;
   };
 }

home/modules/zk/default.nix

@@ -13,8 +13,7 @@ in
     enable = lib.mkEnableOption "zettelkasten";
     path = lib.mkOption {
       type = lib.types.str;
-      default = config.home.homeDirectory + "/.zk";
-      description = "Path to the zettelkasten directory";
+      default = "${config.home.homeDirectory}/.zk";
     };
   };
 
@@ -24,21 +23,13 @@ in
       packages = [
         (pkgs.writeShellApplication {
           name = "zk";
-          runtimeInputs = with pkgs; [ tmux ];
+          runtimeInputs = with pkgs; [
+            tmux
+            gh
+          ];
+          runtimeEnv.ZK_PATH = cfg.path;
           text = builtins.readFile ./scripts/zk.sh;
         })
-
-        (pkgs.writeShellApplication {
-          name = "save-zk";
-          runtimeInputs = with pkgs; [ git ];
-          text = builtins.readFile ./scripts/save-zk.sh;
-        })
-
-        (pkgs.writeShellApplication {
-          name = "setup-zk";
-          runtimeInputs = with pkgs; [ gh ];
-          text = builtins.readFile ./scripts/setup-zk.sh;
-        })
       ];
     };
   };

home/modules/zk/scripts/save-zk.sh

@@ -1,2 +0,0 @@
-cd "$ZK_PATH" || { echo "No zettelkasten directory found"; exit 1; }
-git add . && git commit -m "Update" && git push

home/modules/zk/scripts/setup-zk.sh

@@ -1,13 +0,0 @@
-if [ ! -d "$ZK_PATH" ]; then
-  echo "[zk] Setting up zettelkasten"
-  gh repo clone zk "$ZK_PATH"
-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
-  $EDITOR "$ZK_PATH"
-fi

home/modules/zk/scripts/zk.sh

@@ -1,7 +1,16 @@
-current_zettel_path="$(cat "$ZK_PATH/current-zettel.txt")"
+if [ ! -d "$ZK_PATH" ]; then
+  echo "[zk] Setting up zettelkasten"
+  gh repo clone zk "$ZK_PATH"
+fi
+
+if [ -f "$ZK_PATH/current-zettel.txt" ]; then
+  target="$(cat "$ZK_PATH/current-zettel.txt")"
+else
+  target="."
+fi
 
 if [ -n "${TMUX:-}" ]; then
-  cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
+  cd "$ZK_PATH" && $EDITOR "$target"
 else
   echo 'Not in tmux'
   echo 'Choose an option:'
@@ -14,12 +23,12 @@ else
         tmux attach -t zk
       else
         tmux new-session -s zk -n zk -d
-        tmux send-keys -t zk:zk "cd $ZK_PATH && $EDITOR $current_zettel_path" Enter
+        tmux send-keys -t zk:zk "cd ${ZK_PATH} && $EDITOR ${target}" Enter
         tmux attach -t zk
       fi
       ;;
     2)
-      cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
+      cd "$ZK_PATH" && $EDITOR "$target"
       ;;
     *)
       echo 'Not opening Zettelkasten'

hosts/andromache/default.nix

@@ -55,7 +55,13 @@ in
     useDHCP = lib.mkDefault true;
   };
   nvidia.enable = true;
-  restic-backup.enable = true;
+  restic-backup = {
+    enable = true;
+    paths = [
+      "/home"
+      "/data"
+    ];
+  };
   secrets = {
     enable = true;
     nixSigningKey.enable = true;

hosts/astyanax/default.nix

@@ -101,10 +101,13 @@ in
     useNetworkd = true;
   };
 
-  systemd.network.networks."40-wlan0" = {
+  systemd.network = {
+    networks."40-wlan0" = {
       matchConfig.Name = "wlan0";
       networkConfig.DHCP = "yes";
     };
+    wait-online.anyInterface = true;
+  };
 
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 

hosts/eetion-02/default.nix

@@ -59,16 +59,7 @@ in
     git
   ];
 
-  nix.settings = {
-    experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
-    trusted-users = [
-      "root"
-      "@wheel"
-    ];
-  };
+  nix.settings.trusted-users = [ "@wheel" ];
 
   system.stateVersion = "26.05";
 }

hosts/eetion/default.nix

@@ -112,16 +112,7 @@ in
     git
   ];
 
-  nix.settings = {
-    experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
-    trusted-users = [
-      "root"
-      "@wheel"
-    ];
-  };
+  nix.settings.trusted-users = [ "@wheel" ];
 
   system.stateVersion = "26.05";
 }

modules/desktop/niri/default.nix

@@ -58,6 +58,7 @@ in
       dbus.enable = true;
       displayManager.ly = lib.mkIf cfg.ly.enable {
         enable = true;
+        settings.session_log = ".local/state/ly-session.log";
       };
     };
   };

modules/ssh/extract-keys.nix

@@ -2,12 +2,13 @@
 
 let
   inherit (config.host) username;
+  home = config.users.users.${username}.home;
 in
 {
   config = lib.mkIf config.ssh.enable {
     system.activationScripts.extractSshKeys = lib.stringAfter [ "etc" ] ''
       HOST_KEY="/etc/ssh/ssh_host_ed25519_key.pub"
-      HOST_DIR="/home/${username}/nix/hosts/${config.networking.hostName}"
+      HOST_DIR="${home}/nix/hosts/${config.networking.hostName}"
 
       if [ -f "$HOST_KEY" ] && [ -d "$HOST_DIR" ]; then
         cp "$HOST_KEY" "$HOST_DIR/ssh_host.pub"
@@ -17,8 +18,8 @@ in
 
       USER_KEY=""
       for candidate in \
-          "/home/${username}/.ssh/id_ed25519_sk.pub" \
-          "/home/${username}/.ssh/id_ed25519.pub"; do
+          "${home}/.ssh/id_ed25519_sk.pub" \
+          "${home}/.ssh/id_ed25519.pub"; do
         if [ -f "$candidate" ]; then
           USER_KEY="$candidate"
           break

modules/storage/default.nix

@@ -5,6 +5,5 @@
 
   config = lib.mkIf config.storage.enable {
     services.udisks2.enable = true;
-    boot.zfs.forceImportRoot = false;
   };
 }

modules/syncthing/default.nix

@@ -3,6 +3,7 @@
 let
   cfg = config.syncthing;
   inherit (config.host) username;
+  home = config.users.users.${username}.home;
 
   deviceRegistry = import ./devices.nix;
   deviceName = lib.types.enum (builtins.attrNames deviceRegistry);
@@ -48,7 +49,7 @@ in
       enable = true;
       user = username;
       group = username;
-      configDir = "/home/${username}/.local/state/syncthing";
+      configDir = "${home}/.local/state/syncthing";
       openDefaultPorts = true;
       settings = {
         devices = lib.mapAttrs (_: id: { inherit id; }) (lib.getAttrs referencedDevices deviceRegistry);