chore: untrack 'packages.local.nix'

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

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

dots/.bin/taskdeps

@@ -0,0 +1,144 @@
+#!/usr/bin/python
+
+import argparse
+import json
+import subprocess
+from collections import defaultdict
+
+
+def get_task_data():
+    command = (
+        "task +PENDING or +WAITING -COMPLETED -DELETED export | "
+        "jq '[.[] | {uuid: .uuid, id, depends: .depends, description: .description, status: .status }]'"
+    )
+    output = subprocess.check_output(command, shell=True)
+    return json.loads(output)
+
+
+def parse_task_data(data):
+    dependency_graph = defaultdict(list)
+    task_details = {}
+    dependent_tasks = set()
+
+    for task in data:
+        task_id = task["uuid"]
+        task_details[task_id] = {
+            "id": task.get("id", "?"),
+            "description": task.get("description", "No description"),
+            "status": task.get("status", "Unknown status"),
+        }
+        if task["depends"]:
+            for dependency in task["depends"]:
+                dependency_graph[dependency].append(task_id)
+                dependent_tasks.add(task_id)
+
+    root_tasks = set(task_details.keys()) - dependent_tasks
+    return task_details, dependency_graph, root_tasks
+
+
+def get_all_parents(task_id, dependency_graph):
+    return [
+        parent for parent, children in dependency_graph.items() if task_id in children
+    ]
+
+
+def build_ascii_dag(
+    task_id,
+    task_details,
+    dependency_graph,
+    prefix="",
+    is_last=True,
+    show_id=True,
+    visited=None,
+):
+    if visited is None:
+        visited = set()
+
+    if task_id in visited:
+        return [f"{prefix}{'└── ' if is_last else '├── '}... (cycle detected)"]
+
+    visited.add(task_id)
+
+    task_info = task_details[task_id]
+    task_line = f"{prefix}{'└── ' if is_last else '├── '}{task_info['id'] + ': ' if show_id else ''}{task_info['description']} ({task_info['status']})"
+    lines = [task_line]
+
+    children = dependency_graph.get(task_id, [])
+    for idx, child in enumerate(children):
+        child_is_last = idx == len(children) - 1
+        child_prefix = prefix + ("    " if is_last else "│   ")
+        lines.extend(
+            build_ascii_dag(
+                child,
+                task_details,
+                dependency_graph,
+                child_prefix,
+                child_is_last,
+                show_id,
+                visited.copy(),
+            )
+        )
+
+    return lines
+
+
+def render_dependency_dag(task_details, dependency_graph, root_tasks, show_id):
+    dag_lines = []
+    global_visited = set()
+
+    def dfs(task_id, prefix="", is_last=True, visited=None):
+        if visited is None:
+            visited = set()
+
+        if task_id in visited:
+            return
+
+        visited.add(task_id)
+        global_visited.add(task_id)
+
+        task_info = task_details[task_id]
+        task_line = f"{prefix}{'└── ' if is_last else '├── '}{str(task_info['id']) + ': ' if show_id else ''}{task_info['description']} ({task_info['status']})"
+        dag_lines.append(task_line)
+
+        children = dependency_graph.get(task_id, [])
+        for idx, child in enumerate(children):
+            child_is_last = idx == len(children) - 1
+            child_prefix = prefix + ("    " if is_last else "│   ")
+            dfs(child, child_prefix, child_is_last, visited.copy())
+
+    root_tasks_with_children = [
+        root for root in root_tasks if dependency_graph.get(root, [])
+    ]
+    for root in sorted(
+        root_tasks_with_children,
+        key=lambda x: len(dependency_graph.get(x, [])),
+        reverse=True,
+    ):
+        if root not in global_visited:
+            dfs(root)
+            dag_lines.append("")
+
+    return "\n".join(dag_lines).rstrip()
+
+
+def main(args):
+    data = get_task_data()
+    task_details, dependency_graph, root_tasks = parse_task_data(data)
+    ascii_dag = render_dependency_dag(
+        task_details, dependency_graph, root_tasks, show_id=args.show_id
+    )
+    print(ascii_dag)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Generates a task dependency DAG for Taskwarrior tasks."
+    )
+    parser.add_argument(
+        "--show-id",
+        action="store_true",
+        default=False,
+        help="Include task IDs in the output.",
+    )
+    args = parser.parse_args()
+    main(args)

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

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

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

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

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

@@ -1,6 +1,6 @@
 require("conform").setup({
   format_after_save = {
-    lsp_fallback = true,
+    lsp_fallback = false,
     async = false,
     timeout_ms = 500,
   },
@@ -13,14 +13,15 @@ require("conform").setup({
     gdscript = { "gdformat" },
     haskell = { "ormolu" },
     html = { "prettierd", "prettier", stop_after_first = true },
+    javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
+    javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
+    json = { "prettierd", "prettier", stop_after_first = true },
+    jsonc = { "prettierd", "prettier", stop_after_first = true },
     lua = { "stylua" }, -- configured in stylua.toml
     markdown = { "prettierd", "prettier", stop_after_first = true },
     nix = { "nixfmt" },
-    javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
-    javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
-    -- json = { "prettierd", "prettier", stop_after_first = true },
-    -- jsonc = { "prettierd", "prettier", stop_after_first = true },
     python = { "isort", "black" },
+    rust = { "rustfmt", lsp_fallback = "fallback" },
     svelte = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
     typescript = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
     typescriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },

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

@@ -1,78 +0,0 @@
--- require("formatter").setup({
---   logging = true,
---   filetype = {
---     typescriptreact = {
---       -- prettier
---       function()
---         return {
---           exe = "prettier",
---           args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0) },
---           stdin = true,
---         }
---       end,
---     },
---     typescript = {
---       -- prettier
---       function()
---         return {
---           exe = "prettier",
---           args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0) },
---           stdin = true,
---         }
---       end,
---       -- linter
---       -- function()
---       --   return {
---       --     exe = "eslint",
---       --     args = {
---       --       "--stdin-filename",
---       --       vim.api.nvim_buf_get_name(0),
---       --       "--fix",
---       --       "--cache"
---       --     },
---       --     stdin = false
---       --   }
---       -- end
---     },
---     javascript = {
---       -- prettier
---       function()
---         return {
---           exe = "prettier",
---           args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0) },
---           stdin = true,
---         }
---       end,
---     },
---     javascriptreact = {
---       -- prettier
---       function()
---         return {
---           exe = "prettier",
---           args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0) },
---           stdin = true,
---         }
---       end,
---     },
---     json = {
---       -- prettier
---       function()
---         return {
---           exe = "prettier",
---           args = { "--stdin-filepath", vim.api.nvim_buf_get_name(0) },
---           stdin = true,
---         }
---       end,
---     },
---     lua = {
---       -- luafmt
---       function()
---         return {
---           exe = "luafmt",
---           args = { "--indent-count", 2, "--stdin" },
---           stdin = true,
---         }
---       end,
---     },
---   },
--- })

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

@@ -5,9 +5,7 @@ fzf.setup({ "max-perf" })
 vim.keymap.set("n", "<leader>f<leader>", fzf.builtin) -- Help
 vim.keymap.set("n", "<leader>fc", fzf.commands)
 vim.keymap.set("n", "<leader>ff", fzf.files)
-vim.keymap.set("n", "<leader>fg", function()
+vim.keymap.set("n", "<leader>fg", fzf.live_grep_native)
-  fzf.live_grep_native({ resume = true })
-end)
 vim.keymap.set("n", "<leader>fb", fzf.buffers)
 vim.keymap.set("n", "<leader>fd", fzf.diagnostics_workspace)
 vim.keymap.set("n", "<leader>fhe", fzf.help_tags)
@@ -15,4 +13,4 @@ vim.keymap.set("n", "<leader>fhi", fzf.search_history)
 vim.keymap.set("n", "<leader>fma", fzf.marks)
 vim.keymap.set("n", "<leader>fma", fzf.man_pages)
 
-vim.keymap.set("i", "<c-f>", fzf.complete_file)
+vim.keymap.set("i", "<c-f>", fzf.complete_path)

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

@@ -1,10 +1,10 @@
--- require("image").setup({
+require("image").setup({
---   backend = "kitty",
+  backend = "kitty",
---   kitty_method = "normal",
+  kitty_method = "normal",
---   processor = "magick_cli",
+  processor = "magick_cli",
---   integrations = {
+  integrations = {
---     markdown = {
+    markdown = {
---       filetypes = { "markdown", "pandoc" },
+      filetypes = { "markdown", "pandoc" },
---     },
+    },
---   },
+  },
--- })
+})

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

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

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

@@ -17,9 +17,11 @@ local servers = {
       format = false,
     },
   },
-  -- emmet_language_server = {},
+  emmet_language_server = {},
   gdscript = {},
-  helm_ls = { filetypes = { "helm", "yaml.helm-values" } },
+  helm_ls = {
+    filetypes = { "yaml", "helm", "yaml.helm-values" },
+  },
   hls = { filetypes = { "haskell", "lhaskell", "cabal" } },
   html = {},
   jsonls = {
@@ -63,26 +65,8 @@ local servers = {
     },
   },
   -- marksman = {},
-  -- TODO: This completion ain't working yet
+  nixd = {},
-  nixd = {
-    nixpkgs = {
-      expr = "import <nixpkgs> { }",
-    },
-    formatting = {
-      command = { "nixfmt" },
-    },
-    options = {
-      home_manager = {
-        expr = '(builtins.getFlake "/home/hektor/.config/home-manager").homeConfigurations.work.options',
-      },
-    },
-  },
   pyright = {},
-  rust_analyzer = {
-    settings = {
-      ["rust-analyzer"] = {},
-    },
-  },
   -- tsserver = {},
   svelte = {
     plugin = {
@@ -92,43 +76,48 @@ local servers = {
     },
   },
   tailwindcss = {},
-  terraformls = {},
+  -- vtsls = {},
-  -- ts_ls = {},
+  ts_ls = {},
-  vtsls = {
+  -- vtsls = {
-    maxTsServerMemory = 16384,
+  --   maxTsServerMemory = 16384,
-    filetypes = {
+  --   filetypes = {
-      "javascript",
+  --     "javascript",
-      "javascriptreact",
+  --     "javascriptreact",
-      "javascript.jsx",
+  --     "javascript.jsx",
-      "typescript",
+  --     "typescript",
-      "typescriptreact",
+  --     "typescriptreact",
-      "typescript.tsx",
+  --     "typescript.tsx",
-    },
+  --   },
-    settings = {
+  --   settings = {
-      complete_function_calls = true,
+  --     complete_function_calls = true,
-      vtsls = {
+  --     vtsls = {
-        enableMoveToFileCodeAction = true,
+  --       enableMoveToFileCodeAction = true,
-        autoUseWorkspaceTsdk = true,
+  --       autoUseWorkspaceTsdk = true,
-        experimental = { completion = { enableServerSideFuzzyMatch = true } },
+  --       experimental = {
-      },
+  --         completion = {
-      typescript = {
+  --           enableServerSideFuzzyMatch = true,
-        updateImportsOnFileMove = { enabled = "always" },
+  --         },
-        suggest = { completeFunctionCalls = true },
+  --       },
-        inlayHints = {
+  --     },
-          enumMemberValues = { enabled = true },
+  --     typescript = {
-          functionLikeReturnTypes = { enabled = true },
+  --       updateImportsOnFileMove = { enabled = "always" },
-          parameterNames = { enabled = "literals" },
+  --       suggest = {
-          parameterTypes = { enabled = true },
+  --         completeFunctionCalls = true,
-          propertyDeclarationTypes = { enabled = true },
+  --       },
-          variableTypes = { enabled = false },
+  --       inlayHints = {
-        },
+  --         enumMemberValues = { enabled = true },
-      },
+  --         functionLikeReturnTypes = { enabled = true },
-    },
+  --         parameterNames = { enabled = "literals" },
-  },
+  --         parameterTypes = { enabled = true },
+  --         propertyDeclarationTypes = { enabled = true },
+  --         variableTypes = { enabled = false },
+  --       },
+  --     },
+  --   },
+  -- },
   yamlls = {
     settings = {
       yaml = {
-        validate = true,
         schemaStore = {
           -- You must disable built-in schemaStore support if you want to use
           -- this plugin and its advanced options like `ignore`.

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

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

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

@@ -62,12 +62,12 @@ cmp.setup({
     ["<CR>"] = c_l,
   }),
   sources = {
+    { name = "copilot",  group_index = 2 },
     { name = "zk" },
-    { name = "copilot", group_index = 2 },
     { name = "nvim_lsp", keyword_length = 8 },
-    { name = "luasnip", max_item_count = 16 },
+    { name = "luasnip",  max_item_count = 16 },
     { name = "path" },
-    { name = "buffer", max_item_count = 8 },
+    { name = "buffer",   max_item_count = 8 },
   },
   window = {
     completion = cmp.config.window.bordered({ border = { "┌", "─", "┐", "│", "┘", "─", "└", "│" } }),

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

@@ -12,8 +12,8 @@ require("lint").linters_by_ft = {
   editorconfig = { "editorconfig-checker" },
   haskell = { "hlint" },
   -- html = { "htmlhint" },
-  javascript = { eslint_linter },
+  -- javascript = { eslint_linter },
-  javascriptreact = { eslint_linter },
+  -- javascriptreact = { eslint_linter },
   gdscript = { "gdlint" },
   latex = { "chktex" },
   -- lua = { "luacheck", "selene" },
@@ -22,9 +22,10 @@ require("lint").linters_by_ft = {
   -- python = { "pylint" },
   sh = { "shellcheck" },
   svelte = { eslint_linter },
-  typescript = { eslint_linter },
+  systemd = { "systemdlint" },
-  typescriptreact = { eslint_linter },
+  -- typescript = { eslint_linter },
-  -- yaml = { "yamllint" },
+  -- typescriptreact = { eslint_linter },
+  yaml = { "yamllint" },
 }
 
 -- TODO: Wouldn't it be possible / nice to only try to load the linters when they are

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

@@ -1,9 +0,0 @@
-require("obsidian").setup({
-  legacy_commands = false,
-  workspaces = {
-    {
-      name = "test",
-      path = "~/zk/work",
-    },
-  },
-})

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

@@ -1,6 +1,6 @@
 vim.cmd([[
-" " Change local buffer to directory of current file after the plugin has loaded
+" Change local buffer to directory of current file after the plugin has loaded
-" autocmd VimEnter * lcd %:p:h
+autocmd VimEnter * lcd %:p:h
 
 " " Override wiki index mapping to also cd into the wiki
 nm <leader>ww <plug>(wiki-index)

dots/.config/nvim/flake.lock

@@ -1,5 +1,45 @@
 {
   "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": 1765766809,
@@ -17,11 +57,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1765934234,
+        "lastModified": 1743689281,
-        "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=",
+        "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": 1766532406,
+        "narHash": "sha256-acLU/ag9VEoKkzOD202QASX25nG1eArXg5A0mHjKgxM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "af84f9d270d404c17699522fab95bbf928a2d92f",
+        "rev": "8142186f001295e5a3239f485c8a49bf2de2695a",
         "type": "github"
       },
       "original": {
@@ -146,11 +202,11 @@
     "plugins-tailwind-fold-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1752559116,
+        "lastModified": 1766077142,
-        "narHash": "sha256-8uefZIVsn9USEd6FyiO3m3TRKAS/vigU4t9Tk5ijd3c=",
+        "narHash": "sha256-SwcDLlygXUSV/dytPXA5Y45OpUhjnExc8SZg5a8MZ2k=",
         "owner": "razak17",
         "repo": "tailwind-fold.nvim",
-        "rev": "d9e7ca11691d252b35795726dff087bf013b2ebf",
+        "rev": "e2ba5ee1ca9b74208709fe9d7314b8aa753b26a7",
         "type": "github"
       },
       "original": {
@@ -161,8 +217,9 @@
     },
     "root": {
       "inputs": {
+        "mcp-hub": "mcp-hub",
         "nixCats": "nixCats",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "plugins-beancount-nvim": "plugins-beancount-nvim",
         "plugins-crazy-node-movement": "plugins-crazy-node-movement",
         "plugins-helm-ls-nvim": "plugins-helm-ls-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";
@@ -51,8 +52,11 @@
       forEachSystem = utils.eachSystem nixpkgs.lib.platforms.all;
       extra_pkg_config = { };
 
-      dependencyOverlays = [
+      mkDependencyOverlays = system: [
         (utils.standardPluginOverlay inputs)
+        (final: prev: {
+          mcp-hub = inputs.mcp-hub.packages.${system}.default;
+        })
       ];
 
       categoryDefinitions =
@@ -66,12 +70,16 @@
               black
               clang
               clang-tools
+              delta
+              fd
               gawk
               gdtoolkit_4
               isort
+              mcp-hub
               nixd
               nixfmt
               nodePackages.prettier
+              nodePackages.typescript-language-server
               ormolu
               prettierd
               rustfmt
@@ -189,6 +197,7 @@
     forEachSystem (
       system:
       let
+        dependencyOverlays = mkDependencyOverlays system;
         nixCatsBuilder = utils.baseBuilder luaPath {
           inherit
             nixpkgs
@@ -220,31 +229,32 @@
           moduleNamespace = [ defaultPackageName ];
           inherit
             defaultPackageName
-            dependencyOverlays
             luaPath
             categoryDefinitions
             packageDefinitions
             extra_pkg_config
             nixpkgs
             ;
+          dependencyOverlays = mkDependencyOverlays;
         };
         homeModule = utils.mkHomeModules {
           moduleNamespace = [ defaultPackageName ];
           inherit
             defaultPackageName
-            dependencyOverlays
             luaPath
             categoryDefinitions
             packageDefinitions
             extra_pkg_config
             nixpkgs
             ;
+          dependencyOverlays = mkDependencyOverlays;
         };
       in
       {
 
         overlays = utils.makeOverlays luaPath {
-          inherit nixpkgs dependencyOverlays extra_pkg_config;
+          inherit nixpkgs extra_pkg_config;
+          dependencyOverlays = mkDependencyOverlays;
         } categoryDefinitions packageDefinitions defaultPackageName;
 
         nixosModules.default = nixosModule;

dots/.config/nvim/ftplugin/dotenv.lua

@@ -1 +0,0 @@
-vim.opt_local.filetype = "sh"

dots/.config/nvim/init.lua

@@ -20,7 +20,6 @@ require("statusline")
 require("diagnostic")
 require("utils")
 require("zk")
-require("skeleton")
 require("reload")
 
 require("paq-setup") -- when not on nixCats

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

@@ -34,17 +34,14 @@ require("nixCatsUtils.catPacker").setup({
   { "razak17/tailwind-fold.nvim" },
   { "rmagatti/auto-session" },
   { "kndndrj/nvim-dbee" },
-  -- { "3rd/image.nvim", build = false },
+  { "3rd/image.nvim", build = false },
   { "polarmutex/beancount.nvim" },
-  -- { "jamesblckwell/nvimkit.nvim" },
+  { "jamesblckwell/nvimkit.nvim" },
-  { "olimorris/codecompanion.nvim" },
+  { 'olimorris/codecompanion.nvim' },
-  { "ravitemer/mcphub.nvim", build = "pnpm install -g mcp-hub@latest" },
+  { "ravitemer/mcphub.nvim",                       build = "pnpm install -g mcp-hub@latest" },
   { "zbirenbaum/copilot.lua" },
   { "zbirenbaum/copilot-cmp" },
   { "qvalentin/helm-ls.nvim", ft = "helm" },
-  { "saghen/blink.download" },
-  { "ramilito/kubectl.nvim" },
   { "mikesmithgh/kitty-scrollback.nvim" },
-  { "chrisgrieser/nvim-early-retirement" },
+  { "greggh/claude-code.nvim" },
-  { "euclio/vim-markdown-composer" },
 })

flake.lock

@@ -29,11 +29,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1765771449,
+        "lastModified": 1766046711,
-        "narHash": "sha256-ZoHRPmTzwC1ndX3NQB/b/WKtU1WduAJdLI4j8eW/QFM=",
+        "narHash": "sha256-PijxRQcvSgQae3qBdY4+IGMsMFL67N3D7sBJdZxDii4=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "5bcf9a2aeb4d361c2ff918a146b3fcc1e136b9ca",
+        "rev": "7163ab9a8e64cd29c45e8f93fbc038b12056e6fc",
         "type": "gitlab"
       },
       "original": {
@@ -43,6 +43,28 @@
         "type": "gitlab"
       }
     },
+    "flake-parts": {
+      "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-utils": {
       "inputs": {
         "systems": "systems"
@@ -68,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765682243,
+        "lastModified": 1765980955,
-        "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
+        "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
+        "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
         "type": "github"
       },
       "original": {
@@ -81,6 +103,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-secrets": {
       "flake": false,
       "locked": {
@@ -153,11 +194,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1765472234,
+        "lastModified": 1765779637,
-        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
+        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
+        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
         "type": "github"
       },
       "original": {
@@ -167,8 +208,25 @@
         "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"
+      }
+    },
     "nvim": {
       "inputs": {
+        "mcp-hub": "mcp-hub",
         "nixCats": "nixCats",
         "nixpkgs": [
           "nixpkgs"
@@ -307,11 +365,11 @@
     "plugins-tailwind-fold-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1752559116,
+        "lastModified": 1766077142,
-        "narHash": "sha256-8uefZIVsn9USEd6FyiO3m3TRKAS/vigU4t9Tk5ijd3c=",
+        "narHash": "sha256-SwcDLlygXUSV/dytPXA5Y45OpUhjnExc8SZg5a8MZ2k=",
         "owner": "razak17",
         "repo": "tailwind-fold.nvim",
-        "rev": "d9e7ca11691d252b35795726dff087bf013b2ebf",
+        "rev": "e2ba5ee1ca9b74208709fe9d7314b8aa753b26a7",
         "type": "github"
       },
       "original": {
@@ -340,11 +398,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765684837,
+        "lastModified": 1765836173,
-        "narHash": "sha256-fJCnsYcpQxxy/wit9EBOK33c0Z9U4D3Tvo3gf2mvHos=",
+        "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc",
+        "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63",
         "type": "github"
       },
       "original": {

home/hosts/work/packages.local.nix

@@ -1,98 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  ...
-}:
-
-with pkgs;
-[
-  age
-  aider-chat
-  argocd
-  azure-cli
-  bat
-  biome
-  (config.lib.nixGL.wrap bruno)
-  chromium
-  clang
-  claude-code
-  (config.lib.nixGL.wrap code-cursor)
-  curl
-  dconf2nix
-  dive
-  emmet-language-server
-  eslint_d
-  flameshot
-  fluxcd
-  fzf
-  fzf-git-sh
-  git-machete
-  github-copilot-cli
-  glab
-  go
-  hadolint
-  hello
-  helm-ls
-  htop
-  input-leap
-  jira-cli-go
-  jq
-  k3d
-  (config.lib.nixGL.wrap kitty)
-  kubectl
-  kubernetes
-  kubernetes-helm
-  kustomize
-  lua
-  lua-language-server
-  minikube
-  ncspot
-  nil
-  nixd
-  nixfmt-rfc-style
-  # nodejs
-  nodejs_24
-  nvimpager
-  (config.lib.nixGL.wrap obsidian)
-  pavucontrol
-  # pgadmin4
-  prettierd
-  responder
-  ripgrep
-  rust-analyzer
-  rustlings
-  shellcheck
-  (config.lib.nixGL.wrap signal-desktop)
-  silver-searcher
-  sleuthkit
-  spotify
-  starship
-  stylua
-  taskopen
-  taskwarrior3
-  (config.lib.nixGL.wrap teams-for-linux)
-  opentofu
-  sops
-  tldr
-  tmux
-  tree
-  tree-sitter
-  tsx
-  upbound
-  vault-bin
-  (config.lib.nixGL.wrap vscode)
-  vscode-langservers-extracted
-  vtsls
-  yaml-language-server
-  xclip
-  xmage
-  yamllint
-  yarn
-  (python311.withPackages (ppkgs: [
-    ppkgs.plyer
-    ppkgs.dbus-python
-  ]))
-  # flakes
-  inputs.nvim.packages.x86_64-linux.nvim
-]