chore: untrack 'packages.local.nix'

feat(nvim): add typescript-language-server to runtime dependencies
fix(nvim): ensure codecompanion config structure exists before mcphub extension loads
2025-12-26 09:28:18 +01:00 · 2025-12-24 14:46:40 +01:00 · 2025-12-24 14:43:29 +01:00 · 2025-12-24 14:14:38 +01:00 · 2025-12-24 14:14:10 +01:00 · 2025-12-18 16:01:31 +01:00
27 changed files with 400 additions and 123 deletions
--- a/dots/.bin/pomo
+++ b/dots/.bin/pomo
@@ -8,19 +8,24 @@ Pomodoro timer
 - Notification on break finish
 """

-import os
 import atexit
+import os
 from argparse import ArgumentParser
 from time import sleep
+
 from plyer import notification

-POMO_PATH = os.path.join(os.getenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share")), "pomo")
+POMO_PATH = os.path.join(
+    os.getenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share")), "pomo"
+)
+

@atexit.register
 def clear():
    if os.path.exists(POMO_PATH):
        os.remove(POMO_PATH)

+
 def format_mins_secs(mins, secs):
    return f"{mins:02d}:{secs:02d}"

@@ -34,6 +39,7 @@ def make_countdown():
            os.system(f'echo -n "{time_str}" > {POMO_PATH}')
            sleep(1)
            duration -= 1
+
    return countdown


@@ -58,21 +64,23 @@ def main(args):
 def handle_signal(signal, frame):
    # Wait for clear to finish
    clear()
-    print('Exiting')
+    print("Exiting")
    exit(0)


-if __name__ == '__main__':
+if __name__ == "__main__":

    parser = ArgumentParser()
-    parser.add_argument('-w', '--work-duration', type=int,
-                        help='Session duration', default=25)
-    parser.add_argument('-b', '--break-duration', type=int,
-                        help='Break duration', default=5)
-    parser.add_argument('-r', '--repeats', type=int,
-                        help='Numer of sessions', default=1)
-    parser.add_argument('-c', '--clear', action='store_true',
-                        help='Clear timer')
+    parser.add_argument(
+        "-w", "--work-duration", type=int, help="Session duration", default=25
+    )
+    parser.add_argument(
+        "-b", "--break-duration", type=int, help="Break duration", default=5
+    )
+    parser.add_argument(
+        "-r", "--repeats", type=int, help="Numer of sessions", default=1
+    )
+    parser.add_argument("-c", "--clear", action="store_true", help="Clear timer")

    args = parser.parse_args()

--- a/dots/.bin/r5rs
+++ b/dots/.bin/r5rs
@@ -2,8 +2,8 @@

 session="r5rs"

-tmux attach-session -t $session || tmux new-session -s $session \; \
+tmux attach-session -t "$session" || tmux new-session -s "$session" \; \
  split-window -h -t $session \; \
-  send-keys -t 0 "vim" C-m \; \
-  send-keys -t 1 "plt-r5rs --no-prim" C-m \; \
-  select-pane -t 0
+  send-keys -t 1 "nvim -c \"set ft=scheme\"" C-m \; \
+  send-keys -t 2 "plt-r5rs --no-prim" C-m \; \
+  select-pane -t 1
--- a/dots/.bin/save-home
+++ b/dots/.bin/save-home
@@ -22,4 +22,5 @@ restic -r "$RESTIC_REPOSITORY:$HOSTNAME" backup \
  --one-file-system \
  --files-from="$HOME/.resticinclude" \
  --exclude-file="$HOME/.resticexclude" \
+  --exclude-if-present=".nobackup" \
  --verbose=3
--- a/dots/.bin/screen-temperature
+++ b/dots/.bin/screen-temperature
@@ -1,12 +1,12 @@
 #!/usr/bin/env python

-import sys
 import subprocess
+import sys

 DEFAULT_TEMPERATURE = 3500

 try:
-    with open('/tmp/temperature', 'r') as temp_file:
+    with open("/tmp/temperature", "r") as temp_file:
        current_temperature = int(temp_file.read())
 except FileNotFoundError:
    current_temperature = DEFAULT_TEMPERATURE
@@ -16,7 +16,8 @@ if len(sys.argv) == 1:
    print(current_temperature)
    sys.exit(0)
 elif len(sys.argv) != 2:
-    print("""
+    print(
+        """
 Usage:

  screen-temperature
@@ -27,7 +28,8 @@ Usage:

  screen-temperature <+|-><temperature>
      increase or decrease screen temperature by <temperature>
-""")
+"""
+    )
    sys.exit(1)

 temperature_change = sys.argv[1]
@@ -41,11 +43,10 @@ else:

 try:
    subprocess.run(["redshift", "-O", str(new_temperature), "-P"], check=True)
-    with open('/tmp/temperature', 'w') as temp_file:
-        temp_file.write(str(new_temperature) + '\n')
+    with open("/tmp/temperature", "w") as temp_file:
+        temp_file.write(str(new_temperature) + "\n")
    # Send notification
-    subprocess.run(
-        ["notify-send", str(new_temperature) + "K"])
+    subprocess.run(["notify-send", str(new_temperature) + "K"])
 except subprocess.CalledProcessError:
    print("Error: could not set screen temperature.")
    sys.exit(1)
--- a/dots/.bin/zk
+++ b/dots/.bin/zk
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash

+current_zettel_path="$ZK_PATH/$(cat "$ZK_PATH/current-zettel.txt")"
+
 if [ "$TERM_PROGRAM" = tmux ]; then
-  cd ~/.zk && $EDITOR "$(cat ~/.zk/current-zettel.txt)"
+  cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
 else
  echo 'Not in tmux'
  echo 'Choose an option:'
@@ -18,12 +20,12 @@ else
      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 && $EDITOR \"\$(cat ~/.zk/current-zettel.txt)\"" Enter
+        tmux send-keys -t zk:zk "cd $ZK_PATH && $EDITOR $current_zettel_path" Enter
        tmux attach -t zk
      fi
      ;;
    2)
-      cd ~/.zk && $EDITOR "$(cat ~/.zk/current-zettel.txt)"
+      cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
      ;;
    *)
      echo 'Not opening Zettelkasten'
--- a/dots/.config/nvim/after/plugin/claude-code.nvim.lua
+++ b/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
+  },
+})
--- a/dots/.config/nvim/after/plugin/codecompanion.nvim.lua
+++ b/dots/.config/nvim/after/plugin/codecompanion.nvim.lua
@@ -1,17 +1,22 @@
 require("codecompanion").setup({
  ignore_warnings = true,
-  extensions = {
-    mcphub = {
-      callback = "mcphub.extensions.codecompanion",
-      opts = {
-        make_vars = true,
-        make_slash_commands = true,
-        show_result_in_chat = true,
-      },
-    },
-  },
  strategies = {
    chat = { adapter = "openai" },
    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 {}
+
+  require("mcphub.extensions.codecompanion").setup({
+    make_vars = true,
+    make_slash_commands = true,
+    show_result_in_chat = true,
+  })
+end
--- a/dots/.config/nvim/after/plugin/conform.lua
+++ b/dots/.config/nvim/after/plugin/conform.lua
@@ -13,14 +13,15 @@ require("conform").setup({
    gdscript = { "gdformat" },
    haskell = { "ormolu" },
    html = { "prettierd", "prettier", stop_after_first = true },
-    lua = { "stylua" }, -- configured in stylua.toml
-    markdown = { "prettierd", "prettier", stop_after_first = true },
-    nix = { "nixfmt" },
    javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
    javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
    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" },
    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 },
--- a/dots/.config/nvim/after/plugin/tailwind-fold.lua
+++ b/dots/.config/nvim/after/plugin/tailwind-fold.lua
--- a/dots/.config/nvim/flake.lock
+++ b/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": 1764009888,
-        "narHash": "sha256-hJekfTiW1792txgRSM4LcHnz1lDSY87LYbsJEn2V378=",
+        "lastModified": 1765766809,
+        "narHash": "sha256-3Xp41+Sb1zIzASa1Uu1k1RMUoJ9CGyYb0GtvvpRPBqg=",
        "owner": "BirdeeHub",
        "repo": "nixCats-nvim",
-        "rev": "16ac3281f322ea15d39843829e42a44d22da3715",
+        "rev": "fe157e3ed69ed14b55ca81f597eac282caed58a2",
        "type": "github"
      },
      "original": {
@@ -17,11 +57,27 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1764947035,
-        "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=",
+        "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": 1766532406,
+        "narHash": "sha256-acLU/ag9VEoKkzOD202QASX25nG1eArXg5A0mHjKgxM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "a672be65651c80d3f592a89b3945466584a22069",
+        "rev": "8142186f001295e5a3239f485c8a49bf2de2695a",
        "type": "github"
      },
      "original": {
@@ -98,11 +154,11 @@
    "plugins-mcphub-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1759035242,
-        "narHash": "sha256-I6EbgY/2sAdtrxtmH0qbAAQvMCHhOsfolJfblV0fXOk=",
+        "lastModified": 1765628564,
+        "narHash": "sha256-nvWqCGRKhbUHsAM/zd+cwFdcoXXxf6EmcCkpN4mElf4=",
        "owner": "ravitemer",
        "repo": "mcphub.nvim",
-        "rev": "8ff40b5edc649959bb7e89d25ae18e055554859a",
+        "rev": "5193329d510a68f1f5bf189960642c925c177a3a",
        "type": "github"
      },
      "original": {
@@ -146,11 +202,11 @@
    "plugins-tailwind-fold-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1752559116,
-        "narHash": "sha256-8uefZIVsn9USEd6FyiO3m3TRKAS/vigU4t9Tk5ijd3c=",
+        "lastModified": 1766077142,
+        "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",
--- a/dots/.config/nvim/flake.nix
+++ b/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,17 +70,22 @@
              black
              clang
              clang-tools
+              delta
+              fd
              gawk
              gdtoolkit_4
              isort
-              tree-sitter
-              ormolu
-              nodePackages.prettier
+              mcp-hub
              nixd
              nixfmt
+              nodePackages.prettier
+              nodePackages.typescript-language-server
+              ormolu
              prettierd
+              rustfmt
              shellcheck-minimal
              stylua
+              tree-sitter
              vscode-langservers-extracted
            ];
          };
@@ -151,6 +160,7 @@
              fidget-nvim
              rustaceanvim
              pkgs.neovimPlugins.m-taskwarrior-d-nvim
+              claude-code-nvim
            ];
          };

@@ -187,6 +197,7 @@
    forEachSystem (
      system:
      let
+        dependencyOverlays = mkDependencyOverlays system;
        nixCatsBuilder = utils.baseBuilder luaPath {
          inherit
            nixpkgs
@@ -218,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;
--- a/dots/.config/nvim/lua/paq-setup.lua
+++ b/dots/.config/nvim/lua/paq-setup.lua
@@ -43,4 +43,5 @@ require("nixCatsUtils.catPacker").setup({
  { "zbirenbaum/copilot-cmp" },
  { "qvalentin/helm-ls.nvim", ft = "helm" },
  { "mikesmithgh/kitty-scrollback.nvim" },
+  { "greggh/claude-code.nvim" },
 })
--- a/flake.lock
+++ b/flake.lock
@@ -29,11 +29,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1765080359,
-        "narHash": "sha256-BvAgmqgswcokD2eWoyO3uB1k1VTdpxDHGSx0RYRFjDg=",
+        "lastModified": 1766046711,
+        "narHash": "sha256-PijxRQcvSgQae3qBdY4+IGMsMFL67N3D7sBJdZxDii4=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "35f8ab2ecd954b3a348aa0e253878211c48a0aa7",
+        "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": 1764998300,
-        "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=",
+        "lastModified": 1765980955,
+        "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb",
+        "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
        "type": "github"
      },
      "original": {
@@ -81,13 +103,32 @@
        "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": {
-        "lastModified": 1764371082,
-        "narHash": "sha256-yxFxEKXFuXFyFIDZY1gla2OyuqcIE3uT8KDDgTmm3cE=",
+        "lastModified": 1765747965,
+        "narHash": "sha256-EHZRRC3piD6vKd4hXiqC+CcDUQCOzrH/CNAF9zBqpDQ=",
        "ref": "main",
-        "rev": "b9c2ce32cc4c95d7ff01372faea2668407ef8d27",
+        "rev": "a8e8d953f579939bd72b5f5c6ed332910b598554",
        "shallow": true,
        "type": "git",
        "url": "ssh://git@github.com/hektor/nix-secrets"
@@ -101,11 +142,11 @@
    },
    "nixCats": {
      "locked": {
-        "lastModified": 1764009888,
-        "narHash": "sha256-hJekfTiW1792txgRSM4LcHnz1lDSY87LYbsJEn2V378=",
+        "lastModified": 1765766809,
+        "narHash": "sha256-3Xp41+Sb1zIzASa1Uu1k1RMUoJ9CGyYb0GtvvpRPBqg=",
        "owner": "BirdeeHub",
        "repo": "nixCats-nvim",
-        "rev": "16ac3281f322ea15d39843829e42a44d22da3715",
+        "rev": "fe157e3ed69ed14b55ca81f597eac282caed58a2",
        "type": "github"
      },
      "original": {
@@ -153,11 +194,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1764950072,
-        "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
+        "lastModified": 1765779637,
+        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f61125a668a320878494449750330ca58b78c557",
+        "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"
@@ -259,11 +317,11 @@
    "plugins-mcphub-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1759035242,
-        "narHash": "sha256-I6EbgY/2sAdtrxtmH0qbAAQvMCHhOsfolJfblV0fXOk=",
+        "lastModified": 1765628564,
+        "narHash": "sha256-nvWqCGRKhbUHsAM/zd+cwFdcoXXxf6EmcCkpN4mElf4=",
        "owner": "ravitemer",
        "repo": "mcphub.nvim",
-        "rev": "8ff40b5edc649959bb7e89d25ae18e055554859a",
+        "rev": "5193329d510a68f1f5bf189960642c925c177a3a",
        "type": "github"
      },
      "original": {
@@ -307,11 +365,11 @@
    "plugins-tailwind-fold-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1752559116,
-        "narHash": "sha256-8uefZIVsn9USEd6FyiO3m3TRKAS/vigU4t9Tk5ijd3c=",
+        "lastModified": 1766077142,
+        "narHash": "sha256-SwcDLlygXUSV/dytPXA5Y45OpUhjnExc8SZg5a8MZ2k=",
        "owner": "razak17",
        "repo": "tailwind-fold.nvim",
-        "rev": "d9e7ca11691d252b35795726dff087bf013b2ebf",
+        "rev": "e2ba5ee1ca9b74208709fe9d7314b8aa753b26a7",
        "type": "github"
      },
      "original": {
@@ -340,11 +398,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765079830,
-        "narHash": "sha256-i9GMbBLkeZ7MVvy7+aAuErXkBkdRylHofrAjtpUPKt8=",
+        "lastModified": 1765836173,
+        "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "aeb517262102f13683d7a191c7e496b34df8d24c",
+        "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63",
        "type": "github"
      },
      "original": {
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@@ -6,14 +6,78 @@
  ...
 }:

+let
+  username = "h";
+in
 {
  imports = [
-    (import ../astyanax {
-      inherit inputs;
+    ../../modules/desktop/niri
+    ../../modules/git.nix
+    ../../modules/k9s.nix
+    (import ../../modules/taskwarrior.nix {
+      inherit config;
+      inherit pkgs;
+    })
+    (import ../../modules/keepassxc.nix { inherit pkgs; })
+    (import ../../modules/anki.nix {
      inherit config;
      inherit pkgs;
    })
  ];

-  programs.taskwarrior.config.recurrence = lib.mkForce "on";
+  home.stateVersion = "25.05";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
+
+  xdg.userDirs.createDirectories = false;
+  xdg.userDirs.download = "${config.home.homeDirectory}/dl";
+
+  programs = {
+    bash = {
+      enable = true;
+      enableCompletion = true;
+      initExtra = ''
+        for f in /home/${username}/.bashrc.d/*; do
+          [ -f "$f" ] && source "$f"
+        done
+
+        source /home/${username}/.bash_aliases/all
+        source /home/${username}/.bash_aliases/lang-js
+
+        # host-specific config goes here
+        # ...
+
+        export PATH=${../../../dots/.bin}:$PATH
+      '';
+    };
+    firefox = import ../../modules/firefox.nix {
+      inherit inputs;
+      inherit pkgs;
+      inherit config;
+    };
+    fzf = {
+      enable = true;
+      enableBashIntegration = true;
+    };
+    home-manager.enable = true;
+    taskwarrior.config.recurrence = lib.mkForce "on";
+  };
+
+  home.packages = import ../packages.nix {
+    inherit pkgs;
+    inherit config;
+  };
+
+  home.file = {
+    ".inputrc".source = ../../../dots/.inputrc;
+    ".bashrc.d/prompt".source = ../../../dots/.bashrc.d/prompt;
+    ".bashrc.d/editor".source = ../../../dots/.bashrc.d/editor;
+    ".bash_aliases/all".source = ../../../dots/.bash_aliases/all;
+    ".bash_aliases/lang-js".source = ../../../dots/.bash_aliases/lang-js;
+    ".config/kitty/kitty.conf".source = ../../../dots/.config/kitty/kitty.conf;
+    ".config/kitty/themes/zenwritten_light.conf".source =
+      ../../../dots/.config/kitty/themes/zenwritten_light.conf;
+    ".config/kitty/themes/zenwritten_dark.conf".source =
+      ../../../dots/.config/kitty/themes/zenwritten_dark.conf;
+  };
 }
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -13,7 +13,6 @@ in
    ../../modules/desktop/niri
    ../../modules/git.nix
    ../../modules/k9s.nix
-    (import ../../modules/shikane.nix { inherit pkgs; })
    (import ../../modules/taskwarrior.nix {
      inherit config;
      inherit pkgs;
@@ -33,12 +32,12 @@ in
      enable = true;
      enableCompletion = true;
      initExtra = ''
-        for f in /home/h/.bashrc.d/*; do
+        for f in /home/${username}/.bashrc.d/*; do
          [ -f "$f" ] && source "$f"
        done

-        source /home/h/.bash_aliases/all
-        source /home/h/.bash_aliases/lang-js
+        source /home/${username}/.bash_aliases/all
+        source /home/${username}/.bash_aliases/lang-js

        # host-specific config goes here
        # ...
@@ -58,7 +57,7 @@ in
    home-manager.enable = true;
  };

-  home.packages = import ./packages.nix {
+  home.packages = import ../packages.nix {
    inherit pkgs;
    inherit config;
  };
--- a/home/hosts/astyanax/packages.nix
+++ b/home/hosts/astyanax/packages.nix
@@ -3,27 +3,20 @@
 with pkgs;
 [
  bash-completion
-  bash-language-server
  bat
-  brightnessctl
  entr
-  eslint_d
  feh
  fzf
  gh
  git
-  haskell-language-server
  haskellPackages.pandoc-crossref
-  haskellPackages.hadolint
  htop
  jq
  kitty
-  lua-language-server
  nixfmt-rfc-style
  nmap
  nodejs_24
  nvimpager
-  ormolu
  pandoc
  parallel
  pass
@@ -33,21 +26,11 @@ with pkgs;
  silver-searcher
  sops
  sshfs
-  stylelint
-  svelte-language-server
-  tailwindcss-language-server
  tldr
  tmux
  tmuxp
  tree
-  tree-sitter
-  typescript-language-server
  unzip
-  vim-language-server
  vimPlugins.vim-plug
-  vtsls
  wget
-  xbanish
-  xclip
-  yaml-language-server
 ]
--- a/home/modules/anki.nix
+++ b/home/modules/anki.nix
@@ -1,6 +1,16 @@
+{ config, pkgs, ... }:
+
 {
-  enable = true;
-  # sync = {
-  #   username = config.sops.secrets."email/personal".path;
-  # };
+  programs.anki = {
+    enable = true;
+    addons = with pkgs.ankiAddons; [
+      anki-connect
+      puppy-reinforcement
+      review-heatmap
+    ];
+    sync = {
+      usernameFile = "${config.sops.secrets."anki_sync_user".path}";
+      keyFile = "${config.sops.secrets."anki_sync_key".path}";
+    };
+  };
 }
--- a/home/modules/desktop/niri/default.nix
+++ b/home/modules/desktop/niri/default.nix
@@ -3,6 +3,8 @@
 {
  imports = [
    ../../fuzzel
+    ../../mako
+    ../../shikane
    ../../waybar
  ];

--- a/home/modules/firefox.nix
+++ b/home/modules/firefox.nix
@@ -5,9 +5,6 @@
  nativeMessagingHosts = with pkgs; [
    tridactyl-native
  ];
-  policies = {
-    DefaultDownloadDirectory = "\${home}/dl";
-  };
  profiles = {
    default = {
      settings = {
@@ -57,6 +54,7 @@
    };
  };
  policies = {
+    DefaultDownloadDirectory = "\${home}/dl";
    ExtensionSettings = {
      "jid1-ZAdIEUB7XOzOJw@jetpack" = {
        default_area = "navbar";
--- a/home/modules/keepassxc.nix
+++ b/home/modules/keepassxc.nix
@@ -7,5 +7,5 @@
      Browser.Enabled = true;
    };
  };
-  # programs.firefox.nativeMessagingHosts = [ pkgs.keepassxc ]; # FIXME: Resolve 'Access error for config file /home/h/.config/keepassxc/keepassxc.ini' error
+  # programs.firefox.nativeMessagingHosts = [ pkgs.keepassxc ]; # FIXME: Resolve 'Access error for config file $HOME/.config/keepassxc/keepassxc.ini' error
 }
--- a/home/modules/mako/default.nix
+++ b/home/modules/mako/default.nix
@@ -0,0 +1,5 @@
+{
+  services.mako = {
+    enable = true;
+  };
+}
--- a/home/modules/shikane/default.nix
+++ b/home/modules/shikane/default.nix
--- a/hosts/andromache/default.nix
+++ b/hosts/andromache/default.nix
@@ -122,6 +122,7 @@ in
  };

  networking = {
+    # TODO: generate unique hostId on actual host with: head -c 8 /etc/machine-id
    hostId = "80eef97e";
    interfaces = {
      eno1 = {
--- a/hosts/astyanax/default.nix
+++ b/hosts/astyanax/default.nix
@@ -83,6 +83,7 @@ in
  };

  networking = {
+    # TODO: generate unique hostId on actual host with: head -c 8 /etc/machine-id
    hostId = "80eef97e";
  };

--- a/hosts/hecuba/default.nix
+++ b/hosts/hecuba/default.nix
@@ -9,11 +9,6 @@
    ../../modules/ssh/hardened-openssh.nix
  ];

-  environment.systemPackages = with pkgs; [
-    vim
-    git
-  ];
-
  fileSystems."/" = {
    device = "/dev/disk/by-label/nixos";
    fsType = "ext4";
@@ -48,6 +43,16 @@
    firewall.enable = true;
  };

+  environment.systemPackages = with pkgs; [
+    vim
+    git
+  ];
+
+  services.fail2ban = {
+    enable = true;
+    maxretry = 5;
+  };
+
  services.openssh = {
    enable = true;
    harden = true;
--- a/hosts/vm/default.nix
+++ b/hosts/vm/default.nix
@@ -33,7 +33,7 @@ in
    })
  ];

-  secrets.username = "h";
+  secrets.username = username;

  environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ];

--- a/modules/secrets/default.nix
+++ b/modules/secrets/default.nix
@@ -27,6 +27,8 @@ in
        "taskwarrior_sync_encryption_secret".owner = config.users.users.${cfg.username}.name;
        "email_personal".owner = config.users.users.${cfg.username}.name;
        "email_work".owner = config.users.users.${cfg.username}.name;
+        "anki_sync_user".owner = config.users.users.${cfg.username}.name;
+        "anki_sync_key".owner = config.users.users.${cfg.username}.name;
      };

      templates."taskrc.d/sync" = {
Author	SHA1	Message	Date
Hektor Misplon	d06a181e0a	chore: untrack 'packages.local.nix'	2025-12-26 09:28:18 +01:00
Hektor Misplon	28d935975b	feat(nvim): add typescript-language-server to runtime dependencies	2025-12-24 14:46:40 +01:00
Hektor Misplon	cebca892b8	fix(nvim): ensure codecompanion config structure exists before mcphub extension loads	2025-12-24 14:43:29 +01:00
Hektor Misplon	fdb4df09be	chore: update flake.lock with nvim mcp-hub input 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>	2025-12-24 14:14:38 +01:00
Hektor Misplon	ee301f1ae6	feat(nvim): add mcp-hub, fd, and delta dependencies - add mcp-hub flake input for MCP integration - create system-aware dependency overlays - add mcp-hub, fd, delta to lspsAndRuntimeDeps - remove duplicate tailwind-fold.lua file 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>	2025-12-24 14:14:10 +01:00
Hektor Misplon	2030093433	feat: set up 'claude-code.nvim' plugin	2025-12-18 16:01:31 +01:00
Hektor Misplon	0233c339aa	chore: add TODO for unique 'networking.hostId'	2025-12-18 13:40:26 +01:00
Hektor Misplon	57706b7292	refactor: use username variable consistently Replaced hardcoded "h" username references with variables: - hosts/vm: use username variable for secrets.username - home configs: use username variable in bash initExtra paths - keepassxc: update comment to use $HOME instead of /home/h 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>	2025-12-18 13:39:43 +01:00
Hektor Misplon	7ce3609579	fix(firefox): merge duplicate policies declarations Second policies declaration was overwriting the first, causing DefaultDownloadDirectory setting to be lost. Merged both into single policies block. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>	2025-12-18 13:39:43 +01:00
Hektor Misplon	51d0399f21	fix: format rust using 'rustfmt'	2025-12-15 18:18:20 +01:00
Hektor Misplon	d232d8fad6	refactor: decouple 'andromache' home config from 'astyanax'	2025-12-15 12:19:38 +01:00
Hektor Misplon	413c6a4a63	chore: update neovim flake (and main flake)	2025-12-15 12:01:19 +01:00
Hektor Misplon	af20454965	refactor: import shikane 'desktop/niri' instead of directly	2025-12-15 11:57:22 +01:00
Hektor Misplon	ae17c411d4	feat: add plain 'mako' service for notifications	2025-12-14 23:45:58 +01:00
Hektor Misplon	f8bac5414b	feat: declare anki config	2025-12-14 22:44:45 +01:00
Hektor Misplon	b8b7f6bce7	fix: migrate 'r5rs' script to neovim	2025-12-14 22:11:14 +01:00
Hektor Misplon	eb0b192b5e	fix: ignore directories that contain '.nobackup' in 'save-home'	2025-12-14 22:11:14 +01:00
Hektor Misplon	f60b26c676	chore: format using 'black'	2025-12-14 22:11:14 +01:00
Hektor Misplon	67dcddb55c	chore: clean up 'astyanax' packages	2025-12-09 23:43:56 +01:00
Hektor Misplon	ce732af957	feat: add 'fail2ban' to 'hecuba' host	2025-12-09 23:10:24 +01:00
Hektor Misplon	098bbbb5d2	refactor: use environment variable for zettelkasten path	2025-12-09 12:43:07 +01:00
Hektor Misplon	61a5ef7714	feat: add 'rustfmt' for rust formatting	2025-12-08 20:16:18 +01:00