chore: initial commit for draft MR

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

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

.gitignore

@@ -1,10 +1,8 @@
-#
-.claude/
-home/hosts/work/packages.local.nix
-
 # ---> Nix
 # Ignore build outputs from performing a nix-build or `nix build` command
 result
 result-*
 
 nixos-efi-vars.fd
+
+home/hosts/work/packages.local.nix

deploy/README.md

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

deploy/colmena.nix

@@ -1,28 +0,0 @@
-{
-  self,
-  inputs,
-}:
-
-inputs.colmena.lib.makeHive {
-  meta = {
-    nixpkgs = import inputs.nixpkgs {
-      system = "x86_64-linux";
-    };
-
-    nodeNixpkgs = builtins.mapAttrs (_: v: v.pkgs) self.nixosConfigurations;
-    nodeSpecialArgs = builtins.mapAttrs (_: v: v._module.specialArgs or { }) self.nixosConfigurations;
-  };
-
-  astyanax.deployment.tags = [ "local" ];
-
-  andromache.deployment.tags = [ "local" ];
-
-  vm.deployment.tags = [ "local" ];
-
-  hecuba.deployment = {
-    targetHost = "hecuba";
-    targetUser = "username";
-    targetPort = 22;
-    tags = [ "cloud" ];
-  };
-}

dots/.bashrc.d/editor

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

dots/.bin/setup-gnome

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

dots/.bin/taskdeps

@@ -1,144 +0,0 @@
-#!/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/kitty/kitty.conf

@@ -56,7 +56,7 @@ hide_window_decorations yes
 
 #: Tab bar {{{
 
-tab_bar_edge bottom
+tab_bar_edge top
 tab_bar_style powerline
 tab_bar_min_tabs 1
 tab_powerline_style slanted

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

@@ -1,61 +1 @@
-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
-  },
-})
+require("claude-code").setup()

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

@@ -1,22 +1,16 @@
-require("codecompanion").setup({
-  ignore_warnings = 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
+-- require("codecompanion").setup({
+--   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" },
+--   },
+-- })

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

@@ -1,6 +1,6 @@
 require("conform").setup({
   format_after_save = {
-    lsp_fallback = false,
+    lsp_fallback = true,
     async = false,
     timeout_ms = 500,
   },
@@ -13,15 +13,14 @@ 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

@@ -0,0 +1,78 @@
+-- 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,12 +5,14 @@ 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", fzf.live_grep_native)
+vim.keymap.set("n", "<leader>fg", function()
+  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)
 vim.keymap.set("n", "<leader>fhi", fzf.search_history)
 vim.keymap.set("n", "<leader>fma", fzf.marks)
-vim.keymap.set("n", "<leader>fmp", fzf.man_pages)
+vim.keymap.set("n", "<leader>fma", fzf.man_pages)
 
-vim.keymap.set("i", "<c-f>", fzf.complete_path)
+vim.keymap.set("i", "<c-f>", fzf.complete_file)

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

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

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

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

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

@@ -1,5 +1,8 @@
 require("neodev").setup() -- should setup before lspconfig
 
+-- vim.g.coq_settings = { auto_start = 'shut-up' }
+-- local capabilities = coq.lsp_ensure_capabilities()
+
 local cmp_nvim_lsp = require("cmp_nvim_lsp")
 local capabilities = cmp_nvim_lsp.default_capabilities()
 
@@ -14,11 +17,9 @@ local servers = {
       format = false,
     },
   },
-  emmet_language_server = {},
+  -- emmet_language_server = {},
   gdscript = {},
-  helm_ls = {
-    filetypes = { "yaml", "helm", "yaml.helm-values" },
-  },
+  helm_ls = { filetypes = { "helm", "yaml.helm-values" } },
   hls = { filetypes = { "haskell", "lhaskell", "cabal" } },
   html = {},
   jsonls = {
@@ -61,31 +62,27 @@ local servers = {
       Lua = {},
     },
   },
+  -- marksman = {},
+  -- TODO: This completion ain't working yet
   nixd = {
-    settings = {
-      nixd = {
-        nixpkgs = {
-          expr = "import <nixpkgs> { }",
-          expr = 'import (builtins.getFlake ("git+file://" + toString ../../../../../.)).inputs.nixpkgs { }',
-        },
-      },
-      options = {
-        nixos = {
-          expr = '(builtins.getFlake ("git+file://" + toString ../../../../../.)).nixosConfigurations."'
-            .. vim.fn.hostname()
-            .. '".options',
-        },
-        home_manager = {
-          expr = '(builtins.getFlake ("git+file://" + toString ../../../../../.)).homeConfigurations."'
-            .. vim.fn.expand("$USER")
-            .. "@"
-            .. vim.fn.hostname()
-            .. '".options',
-        },
+    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 = {
@@ -95,48 +92,43 @@ local servers = {
     },
   },
   tailwindcss = {},
-  -- vtsls = {},
-  ts_ls = {},
-  -- vtsls = {
-  --   maxTsServerMemory = 16384,
-  --   filetypes = {
-  --     "javascript",
-  --     "javascriptreact",
-  --     "javascript.jsx",
-  --     "typescript",
-  --     "typescriptreact",
-  --     "typescript.tsx",
-  --   },
-  --   settings = {
-  --     complete_function_calls = true,
-  --     vtsls = {
-  --       enableMoveToFileCodeAction = true,
-  --       autoUseWorkspaceTsdk = true,
-  --       experimental = {
-  --         completion = {
-  --           enableServerSideFuzzyMatch = true,
-  --         },
-  --       },
-  --     },
-  --     typescript = {
-  --       updateImportsOnFileMove = { enabled = "always" },
-  --       suggest = {
-  --         completeFunctionCalls = true,
-  --       },
-  --       inlayHints = {
-  --         enumMemberValues = { enabled = true },
-  --         functionLikeReturnTypes = { enabled = true },
-  --         parameterNames = { enabled = "literals" },
-  --         parameterTypes = { enabled = true },
-  --         propertyDeclarationTypes = { enabled = true },
-  --         variableTypes = { enabled = false },
-  --       },
-  --     },
-  --   },
-  -- },
+  terraformls = {},
+  -- ts_ls = {},
+  vtsls = {
+    maxTsServerMemory = 16384,
+    filetypes = {
+      "javascript",
+      "javascriptreact",
+      "javascript.jsx",
+      "typescript",
+      "typescriptreact",
+      "typescript.tsx",
+    },
+    settings = {
+      complete_function_calls = true,
+      vtsls = {
+        enableMoveToFileCodeAction = true,
+        autoUseWorkspaceTsdk = true,
+        experimental = { completion = { enableServerSideFuzzyMatch = true } },
+      },
+      typescript = {
+        updateImportsOnFileMove = { enabled = "always" },
+        suggest = { completeFunctionCalls = true },
+        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 },
-  -- javascriptreact = { eslint_linter },
+  javascript = { eslint_linter },
+  javascriptreact = { eslint_linter },
   gdscript = { "gdlint" },
   latex = { "chktex" },
   -- lua = { "luacheck", "selene" },
@@ -22,10 +22,9 @@ require("lint").linters_by_ft = {
   -- python = { "pylint" },
   sh = { "shellcheck" },
   svelte = { eslint_linter },
-  systemd = { "systemdlint" },
-  -- typescript = { eslint_linter },
-  -- typescriptreact = { eslint_linter },
-  yaml = { "yamllint" },
+  typescript = { eslint_linter },
+  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

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

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

@@ -2,12 +2,12 @@ local ts = require("treesj")
 local vim = vim
 local keymap = vim.keymap
 local opt = vim.opt
-local treesitter = require("nvim-treesitter")
+local treesitter_configs = require("nvim-treesitter.configs")
 
 local nixCatsUtils = require("nixCatsUtils")
 local is_nix = nixCatsUtils.isNixCats
 
-treesitter.setup({
+treesitter_configs.setup({
   -- Basically added what I might need from the docs
   -- <https://github.com/nvim-treesitter/nvim-treesitter?tab=readme-ov-file#supported-languages>
   ensure_installed = is_nix and {} or {

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
-autocmd VimEnter * lcd %:p:h
+" " Change local buffer to directory of current file after the plugin has loaded
+" 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,52 +1,12 @@
 {
   "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": 1769578476,
-        "narHash": "sha256-4+KbiBcC6hQ3sh0UbPXjy6TOfLh9yhskRlfPzyZ2FH4=",
+        "lastModified": 1765766809,
+        "narHash": "sha256-3Xp41+Sb1zIzASa1Uu1k1RMUoJ9CGyYb0GtvvpRPBqg=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "48f8be4bdafccfa19ceaaf08071a15eca36fdb1d",
+        "rev": "fe157e3ed69ed14b55ca81f597eac282caed58a2",
         "type": "github"
       },
       "original": {
@@ -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": 1769740369,
-        "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=",
+        "lastModified": 1765934234,
+        "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a",
+        "rev": "af84f9d270d404c17699522fab95bbf928a2d92f",
         "type": "github"
       },
       "original": {
@@ -103,14 +47,30 @@
         "type": "github"
       }
     },
+    "plugins-crazy-node-movement": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693654676,
+        "narHash": "sha256-hQcQEp39zFN2zphMfcr97yRVcuHhBsSkzKO7XNloDpQ=",
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "rev": "d5cf01cc44c5715501d3d6fe439af7c8b7fa5df2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "type": "github"
+      }
+    },
     "plugins-helm-ls-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768584652,
-        "narHash": "sha256-jnMc87OjURNcqsva0npYgVyUrWc5C6L7yHpNvt9eSmg=",
+        "lastModified": 1761915179,
+        "narHash": "sha256-W9NRa84l5Cs62OsDeqb+LMxk8oYjhVBCB3o3UmE9a0I=",
         "owner": "qvalentin",
         "repo": "helm-ls.nvim",
-        "rev": "f0b9a1723890971a6d84890b50dbf5f40974ea1b",
+        "rev": "d6f3a8d4ad59b4f54cd734267dfb5411679ea608",
         "type": "github"
       },
       "original": {
@@ -122,11 +82,11 @@
     "plugins-m-taskwarrior-d-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1767960157,
-        "narHash": "sha256-ov0qi4LhIlwqrBzSbTJ6APC5qjl2d/vlKWJfW5ZiDrg=",
+        "lastModified": 1764933759,
+        "narHash": "sha256-4lN/ZQTQ7uMcpjePbf2k913Bs9AYYS6da3iZbckA6oI=",
         "owner": "huantrinh1802",
         "repo": "m_taskwarrior_d.nvim",
-        "rev": "107247387cd81823046bc2b8e71150c8edf041d3",
+        "rev": "279d2c8bcd2779500c1bea71fb9249c97cdb503b",
         "type": "github"
       },
       "original": {
@@ -138,11 +98,11 @@
     "plugins-mcphub-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768730387,
-        "narHash": "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=",
+        "lastModified": 1765628564,
+        "narHash": "sha256-nvWqCGRKhbUHsAM/zd+cwFdcoXXxf6EmcCkpN4mElf4=",
         "owner": "ravitemer",
         "repo": "mcphub.nvim",
-        "rev": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f",
+        "rev": "5193329d510a68f1f5bf189960642c925c177a3a",
         "type": "github"
       },
       "original": {
@@ -186,11 +146,11 @@
     "plugins-tailwind-fold-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1766077142,
-        "narHash": "sha256-SwcDLlygXUSV/dytPXA5Y45OpUhjnExc8SZg5a8MZ2k=",
+        "lastModified": 1752559116,
+        "narHash": "sha256-8uefZIVsn9USEd6FyiO3m3TRKAS/vigU4t9Tk5ijd3c=",
         "owner": "razak17",
         "repo": "tailwind-fold.nvim",
-        "rev": "e2ba5ee1ca9b74208709fe9d7314b8aa753b26a7",
+        "rev": "d9e7ca11691d252b35795726dff087bf013b2ebf",
         "type": "github"
       },
       "original": {
@@ -201,10 +161,10 @@
     },
     "root": {
       "inputs": {
-        "mcp-hub": "mcp-hub",
         "nixCats": "nixCats",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "plugins-beancount-nvim": "plugins-beancount-nvim",
+        "plugins-crazy-node-movement": "plugins-crazy-node-movement",
         "plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
         "plugins-m-taskwarrior-d-nvim": "plugins-m-taskwarrior-d-nvim",
         "plugins-mcphub-nvim": "plugins-mcphub-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";
@@ -12,6 +11,10 @@
       url = "github:huantrinh1802/m_taskwarrior_d.nvim";
       flake = false;
     };
+    plugins-crazy-node-movement = {
+      url = "github:theHamsta/crazy-node-movement";
+      flake = false;
+    };
     plugins-beancount-nvim = {
       url = "github:polarmutex/beancount.nvim";
       flake = false;
@@ -48,11 +51,8 @@
       forEachSystem = utils.eachSystem nixpkgs.lib.platforms.all;
       extra_pkg_config = { };
 
-      mkDependencyOverlays = system: [
+      dependencyOverlays = [
         (utils.standardPluginOverlay inputs)
-        (final: prev: {
-          mcp-hub = inputs.mcp-hub.packages.${system}.default;
-        })
       ];
 
       categoryDefinitions =
@@ -66,33 +66,19 @@
               black
               clang
               clang-tools
-              delta
-              emmet-language-server
-              eslint_d
-              fd
               gawk
               gdtoolkit_4
-              hadolint
-              helm-ls
               isort
-              lua-language-server
-              mcp-hub
               nixd
               nixfmt
               nodePackages.prettier
-              nodePackages.typescript-language-server
               ormolu
               prettierd
-              rust-analyzer
               rustfmt
               shellcheck-minimal
-              stylelint
               stylua
               tree-sitter
               vscode-langservers-extracted
-              vtsls
-              yaml-language-server
-              yamllint
             ];
           };
 
@@ -142,6 +128,7 @@
               pkgs.neovimPlugins.shipwright-nvim
               lush-nvim
               zenbones-nvim
+              pkgs.neovimPlugins.crazy-node-movement
               nvim-treesitter.withAllGrammars
               nvim-treesitter-textobjects
               # nvim-treesitter-context
@@ -182,17 +169,19 @@
         };
 
       packageDefinitions = {
-        nvim = _: {
-          settings = {
-            suffix-path = true;
-            suffix-LD = true;
-            wrapRc = true;
-            aliases = [ "vim" ];
+        nvim =
+          { ... }:
+          {
+            settings = {
+              suffix-path = true;
+              suffix-LD = true;
+              wrapRc = true;
+              aliases = [ "vim" ];
+            };
+            categories = {
+              general = true;
+            };
           };
-          categories = {
-            general = true;
-          };
-        };
       };
       defaultPackageName = "nvim";
     in
@@ -200,7 +189,6 @@
     forEachSystem (
       system:
       let
-        dependencyOverlays = mkDependencyOverlays system;
         nixCatsBuilder = utils.baseBuilder luaPath {
           inherit
             nixpkgs
@@ -220,7 +208,7 @@
             name = defaultPackageName;
             packages = [ defaultPackage ];
             inputsFrom = [ ];
-            shellHook = "";
+            shellHook = '''';
           };
         };
 
@@ -232,32 +220,31 @@
           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 extra_pkg_config;
-          dependencyOverlays = mkDependencyOverlays;
+          inherit nixpkgs dependencyOverlays extra_pkg_config;
         } categoryDefinitions packageDefinitions defaultPackageName;
 
         nixosModules.default = nixosModule;

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

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

dots/.config/nvim/init.lua

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

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

@@ -34,14 +34,17 @@ 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" },
-  { 'olimorris/codecompanion.nvim' },
-  { "ravitemer/mcphub.nvim",                       build = "pnpm install -g mcp-hub@latest" },
+  -- { "jamesblckwell/nvimkit.nvim" },
+  { "olimorris/codecompanion.nvim" },
+  { "ravitemer/mcphub.nvim", build = "pnpm install -g mcp-hub@latest" },
   { "zbirenbaum/copilot.lua" },
   { "zbirenbaum/copilot-cmp" },
   { "qvalentin/helm-ls.nvim", ft = "helm" },
+  { "saghen/blink.download" },
+  { "ramilito/kubectl.nvim" },
   { "mikesmithgh/kitty-scrollback.nvim" },
-  { "greggh/claude-code.nvim" },
+  { "chrisgrieser/nvim-early-retirement" },
+  { "euclio/vim-markdown-composer" },
 })

dots/.config/tmux/tmux.conf

@@ -39,22 +39,10 @@ bind-key -T root F7 select-window -t 7
 bind-key -T root F8 select-window -t 8
 bind-key -T root F9 select-window -t 9
 
-
-# bind-key j command-prompt -p "join pane from:"  "join-pane -s '%%'"
-# bind-key s command-prompt -p "send pane to:"  "join-pane -t '%%'"
-bind-key -T root S-F1 join-pane -s :1
-bind-key -T root S-F2 join-pane -s :2
-bind-key -T root S-F3 join-pane -s :3
-bind-key -T root S-F4 join-pane -s :4
-bind-key -T root S-F5 join-pane -s :5
-bind-key -T root S-F6 join-pane -s :6
-bind-key -T root S-F7 join-pane -s :7
-bind-key -T root S-F8 join-pane -s :8
-bind-key -T root S-F9 join-pane -s :9
-
 # 1-based indexing makes most sense for keyboard layouts (where number row start at 1)
 set  -g base-index 1
 set  -g pane-base-index 1
+setw -g automatic-rename
 
 # statusbar
 set -g status-position top
@@ -65,7 +53,7 @@ set -g status-left "#[bg=colour235,fg=colour255] #S  #[fg=colour235,bg=default]
 set -g status-right ""
 %else
 set -g status-left '#h '
-set -g status-right '#(uptime | cut -f 4-5 -d " " | cut -f 1 -d ",") %a %l:%M:%S %p %Y-%m-%d'
+set -g status-right '#(uptime | cut -f 4-5 -d " " | cut -f 1 -d ",") %a%l:%M:%S %p %Y-%m-%d'
 %endif
 
 # theming
@@ -87,5 +75,3 @@ set-hook -g after-new-session 'if -F "#{==:#{session_name},ssh}" "source ${XDG_C
 if-shell "test '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 4 \)'" 'bind-key -Tcopy-mode-vi v send -X begin-selection; bind-key -Tcopy-mode-vi y send -X copy-selection-and-cancel'
 if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 4\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'bind-key -t vi-copy v begin-selection; bind-key -t vi-copy y copy-selection'
 if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 2\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'set-option -g status-utf8 on'
-
-set -g allow-passthrough on

flake.lock

@@ -1,29 +1,5 @@
 {
   "nodes": {
-    "colmena": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "stable": "stable"
-      },
-      "locked": {
-        "lastModified": 1762034856,
-        "narHash": "sha256-QVey3iP3UEoiFVXgypyjTvCrsIlA4ecx6Acaz5C8/PQ=",
-        "owner": "zhaofengli",
-        "repo": "colmena",
-        "rev": "349b035a5027f23d88eeb3bc41085d7ee29f18ed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli",
-        "repo": "colmena",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -31,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768920986,
-        "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=",
+        "lastModified": 1746728054,
+        "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "de5708739256238fb912c62f03988815db89ec9a",
+        "rev": "ff442f5d1425feb86344c028298548024f21256d",
         "type": "github"
       },
       "original": {
@@ -53,11 +29,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1769745834,
-        "narHash": "sha256-/7EzWXFrHiF2LiuQPFUD1jhICcRa30QVa/uQCPu1Q/g=",
+        "lastModified": 1765771449,
+        "narHash": "sha256-ZoHRPmTzwC1ndX3NQB/b/WKtU1WduAJdLI4j8eW/QFM=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "ec30ecfdee4b0df2325c2672db21684e806f4b69",
+        "rev": "5bcf9a2aeb4d361c2ff918a146b3fcc1e136b9ca",
         "type": "gitlab"
       },
       "original": {
@@ -67,60 +43,7 @@
         "type": "gitlab"
       }
     },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-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": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "inputs": {
         "systems": "systems"
       },
@@ -145,11 +68,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769776025,
-        "narHash": "sha256-70a1kVC08AMTvPc7iqQsJbbD4Y1fukakMVudz4oY9SM=",
+        "lastModified": 1765682243,
+        "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0fba737f8d5571d41467f3d99a878e11b8c0f0f0",
+        "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
         "type": "github"
       },
       "original": {
@@ -158,104 +81,13 @@
         "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-formatter-pack": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-on-droid",
-          "nixpkgs"
-        ],
-        "nmd": "nmd",
-        "nmt": "nmt"
-      },
-      "locked": {
-        "lastModified": 1705252799,
-        "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=",
-        "owner": "Gerschtli",
-        "repo": "nix-formatter-pack",
-        "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerschtli",
-        "repo": "nix-formatter-pack",
-        "type": "github"
-      }
-    },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "colmena",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729742964,
-        "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
-    "nix-on-droid": {
-      "inputs": {
-        "home-manager": [
-          "home-manager"
-        ],
-        "nix-formatter-pack": "nix-formatter-pack",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-docs": "nixpkgs-docs",
-        "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
-        "nmd": "nmd_2"
-      },
-      "locked": {
-        "lastModified": 1720396533,
-        "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",
-        "owner": "nix-community",
-        "repo": "nix-on-droid",
-        "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.05",
-        "repo": "nix-on-droid",
-        "type": "github"
-      }
-    },
     "nix-secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1769114809,
-        "narHash": "sha256-xRZeYJAq/AcEZqsevIn1POBswP4rFYhOsQxaJP6xxpM=",
+        "lastModified": 1765747965,
+        "narHash": "sha256-EHZRRC3piD6vKd4hXiqC+CcDUQCOzrH/CNAF9zBqpDQ=",
         "ref": "main",
-        "rev": "b14f3b416336bf44343941322745d6144582560e",
+        "rev": "a8e8d953f579939bd72b5f5c6ed332910b598554",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@github.com/hektor/nix-secrets"
@@ -269,11 +101,11 @@
     },
     "nixCats": {
       "locked": {
-        "lastModified": 1769578476,
-        "narHash": "sha256-4+KbiBcC6hQ3sh0UbPXjy6TOfLh9yhskRlfPzyZ2FH4=",
+        "lastModified": 1765766809,
+        "narHash": "sha256-3Xp41+Sb1zIzASa1Uu1k1RMUoJ9CGyYb0GtvvpRPBqg=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "48f8be4bdafccfa19ceaaf08071a15eca36fdb1d",
+        "rev": "fe157e3ed69ed14b55ca81f597eac282caed58a2",
         "type": "github"
       },
       "original": {
@@ -284,7 +116,7 @@
     },
     "nixgl": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -305,11 +137,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1769302137,
-        "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
+        "lastModified": 1764440730,
+        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
+        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
         "type": "github"
       },
       "original": {
@@ -321,11 +153,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769461804,
-        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "lastModified": 1765472234,
+        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
         "type": "github"
       },
       "original": {
@@ -335,116 +167,14 @@
         "type": "github"
       }
     },
-    "nixpkgs-docs": {
-      "locked": {
-        "lastModified": 1705957679,
-        "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-for-bootstrap": {
-      "locked": {
-        "lastModified": 1720244366,
-        "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
-        "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"
-      }
-    },
-    "nmd": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1666190571,
-        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
-        "owner": "rycee",
-        "repo": "nmd",
-        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "rycee",
-        "repo": "nmd",
-        "type": "gitlab"
-      }
-    },
-    "nmd_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-on-droid",
-          "nixpkgs-docs"
-        ],
-        "scss-reset": "scss-reset"
-      },
-      "locked": {
-        "lastModified": 1705050560,
-        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
-        "owner": "~rycee",
-        "repo": "nmd",
-        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
-        "type": "sourcehut"
-      },
-      "original": {
-        "owner": "~rycee",
-        "repo": "nmd",
-        "type": "sourcehut"
-      }
-    },
-    "nmt": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1648075362,
-        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
-        "owner": "rycee",
-        "repo": "nmt",
-        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "rycee",
-        "repo": "nmt",
-        "type": "gitlab"
-      }
-    },
     "nvim": {
       "inputs": {
-        "mcp-hub": "mcp-hub",
         "nixCats": "nixCats",
         "nixpkgs": [
           "nixpkgs"
         ],
         "plugins-beancount-nvim": "plugins-beancount-nvim",
+        "plugins-crazy-node-movement": "plugins-crazy-node-movement",
         "plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
         "plugins-m-taskwarrior-d-nvim": "plugins-m-taskwarrior-d-nvim",
         "plugins-mcphub-nvim": "plugins-mcphub-nvim",
@@ -478,14 +208,30 @@
         "type": "github"
       }
     },
+    "plugins-crazy-node-movement": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693654676,
+        "narHash": "sha256-hQcQEp39zFN2zphMfcr97yRVcuHhBsSkzKO7XNloDpQ=",
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "rev": "d5cf01cc44c5715501d3d6fe439af7c8b7fa5df2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "type": "github"
+      }
+    },
     "plugins-helm-ls-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768584652,
-        "narHash": "sha256-jnMc87OjURNcqsva0npYgVyUrWc5C6L7yHpNvt9eSmg=",
+        "lastModified": 1761915179,
+        "narHash": "sha256-W9NRa84l5Cs62OsDeqb+LMxk8oYjhVBCB3o3UmE9a0I=",
         "owner": "qvalentin",
         "repo": "helm-ls.nvim",
-        "rev": "f0b9a1723890971a6d84890b50dbf5f40974ea1b",
+        "rev": "d6f3a8d4ad59b4f54cd734267dfb5411679ea608",
         "type": "github"
       },
       "original": {
@@ -497,11 +243,11 @@
     "plugins-m-taskwarrior-d-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1767960157,
-        "narHash": "sha256-ov0qi4LhIlwqrBzSbTJ6APC5qjl2d/vlKWJfW5ZiDrg=",
+        "lastModified": 1764933759,
+        "narHash": "sha256-4lN/ZQTQ7uMcpjePbf2k913Bs9AYYS6da3iZbckA6oI=",
         "owner": "huantrinh1802",
         "repo": "m_taskwarrior_d.nvim",
-        "rev": "107247387cd81823046bc2b8e71150c8edf041d3",
+        "rev": "279d2c8bcd2779500c1bea71fb9249c97cdb503b",
         "type": "github"
       },
       "original": {
@@ -513,11 +259,11 @@
     "plugins-mcphub-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768730387,
-        "narHash": "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=",
+        "lastModified": 1765628564,
+        "narHash": "sha256-nvWqCGRKhbUHsAM/zd+cwFdcoXXxf6EmcCkpN4mElf4=",
         "owner": "ravitemer",
         "repo": "mcphub.nvim",
-        "rev": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f",
+        "rev": "5193329d510a68f1f5bf189960642c925c177a3a",
         "type": "github"
       },
       "original": {
@@ -561,11 +307,11 @@
     "plugins-tailwind-fold-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1766077142,
-        "narHash": "sha256-SwcDLlygXUSV/dytPXA5Y45OpUhjnExc8SZg5a8MZ2k=",
+        "lastModified": 1752559116,
+        "narHash": "sha256-8uefZIVsn9USEd6FyiO3m3TRKAS/vigU4t9Tk5ijd3c=",
         "owner": "razak17",
         "repo": "tailwind-fold.nvim",
-        "rev": "e2ba5ee1ca9b74208709fe9d7314b8aa753b26a7",
+        "rev": "d9e7ca11691d252b35795726dff087bf013b2ebf",
         "type": "github"
       },
       "original": {
@@ -576,11 +322,9 @@
     },
     "root": {
       "inputs": {
-        "colmena": "colmena",
         "disko": "disko",
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
-        "nix-on-droid": "nix-on-droid",
         "nix-secrets": "nix-secrets",
         "nixgl": "nixgl",
         "nixos-hardware": "nixos-hardware",
@@ -589,22 +333,6 @@
         "sops-nix": "sops-nix"
       }
     },
-    "scss-reset": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1631450058,
-        "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
-        "owner": "andreymatin",
-        "repo": "scss-reset",
-        "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
-        "type": "github"
-      },
-      "original": {
-        "owner": "andreymatin",
-        "repo": "scss-reset",
-        "type": "github"
-      }
-    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -612,11 +340,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769469829,
-        "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=",
+        "lastModified": 1765684837,
+        "narHash": "sha256-fJCnsYcpQxxy/wit9EBOK33c0Z9U4D3Tvo3gf2mvHos=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff",
+        "rev": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc",
         "type": "github"
       },
       "original": {
@@ -625,22 +353,6 @@
         "type": "github"
       }
     },
-    "stable": {
-      "locked": {
-        "lastModified": 1750133334,
-        "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "36ab78dab7da2e4e27911007033713bab534187b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,

flake.nix

@@ -22,11 +22,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix-on-droid = {
-      url = "github:nix-community/nix-on-droid/release-24.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "home-manager";
-    };
     nixgl = {
       url = "github:nix-community/nixGL";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -39,10 +34,6 @@
       url = "path:./dots/.config/nvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    colmena = {
-      url = "github:zhaofengli/colmena";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
@@ -54,15 +45,12 @@
       sops-nix,
       nix-secrets,
       home-manager,
-      nix-on-droid,
       nixgl,
       firefox-addons,
       nvim,
-      colmena,
     }@inputs:
     let
-      inherit (self) outputs;
-      inherit (inputs.nixpkgs) lib;
+      lib = inputs.nixpkgs.lib;
       utils = import ./utils { inherit lib; };
       hostDirNames = utils.dirNames ./hosts;
       system = "x86_64-linux";
@@ -70,7 +58,6 @@
         inherit system;
         overlays = [ nixgl.overlay ];
       };
-      dotsPath = ./dots;
     in
     {
       nix.nixPath = [
@@ -80,40 +67,15 @@
         host:
         nixpkgs.lib.nixosSystem {
           modules = [ ./hosts/${host} ];
-          specialArgs = {
-            inherit inputs outputs dotsPath;
-          };
+          specialArgs = { inherit inputs; };
         }
       );
       homeConfigurations = {
         work = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           modules = [ ./home/hosts/work ];
-          extraSpecialArgs = {
-            inherit inputs outputs dotsPath;
-          };
+          extraSpecialArgs = { inherit inputs; };
         };
       };
-      # https://github.com/nix-community/nix-on-droid/blob/master/templates/advanced/flake.nix
-      nixOnDroidConfigurations = {
-        pixel = nix-on-droid.lib.nixOnDroidConfiguration {
-          modules = [ ./phone ];
-          extraSpecialArgs = {
-            inherit inputs outputs dotsPath;
-          };
-          pkgs = import nixpkgs {
-            system = "aarch64-linux";
-            overlays = [ nix-on-droid.overlays.default ];
-          };
-          home-manager-path = home-manager.outPath;
-        };
-      };
-
-      colmenaHive = import ./deploy/colmena.nix {
-        inherit
-          self
-          inputs
-          ;
-      };
     };
 }

home/hosts/andromache/default.nix

@@ -11,46 +11,73 @@ let
 in
 {
   imports = [
-    ../../modules/cloud
-    ../../modules/comms
     ../../modules/desktop/niri
-    ../../modules/3d
-    ../../modules/git
+    ../../modules/git.nix
     ../../modules/k9s.nix
-    ../../modules/kitty.nix
-    ../../modules/nvim.nix
-    ../../modules/ssh.nix
-    ../../modules/taskwarrior.nix
-    ../../modules/keepassxc.nix
-    ../../modules/anki.nix
-    ../../modules/photography
-    ../../modules/browser
-    ../../modules/shell
+    (import ../../modules/taskwarrior.nix {
+      inherit config;
+      inherit pkgs;
+    })
+    (import ../../modules/keepassxc.nix { inherit pkgs; })
+    (import ../../modules/anki.nix {
+      inherit config;
+      inherit pkgs;
+    })
   ];
 
-  home = {
-    stateVersion = "25.05";
-    inherit username;
-    homeDirectory = "/home/${username}";
-  };
+  home.stateVersion = "25.05";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
 
   xdg.userDirs.createDirectories = false;
   xdg.userDirs.download = "${config.home.homeDirectory}/dl";
 
-  browser.primary = "librewolf";
-  cloud.hetzner.enable = true;
-  comms.signal.enable = true;
-  github.enable = true;
-
-  shell.bash = {
-    enable = true;
-    aliases.lang-js = true;
-  };
-
   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; };
+  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;
+  };
 }

home/hosts/astyanax/default.nix

@@ -1,4 +1,5 @@
 {
+  inputs,
   config,
   pkgs,
   ...
@@ -9,42 +10,50 @@ let
 in
 {
   imports = [
-    ../../modules/ai-tools.nix
-    ../../modules/anki.nix
-    ../../modules/cloud
-    ../../modules/comms
     ../../modules/desktop/niri
-    ../../modules/git
+    ../../modules/git.nix
     ../../modules/k9s.nix
-    ../../modules/kitty.nix
-    ../../modules/nvim.nix
-    ../../modules/ssh.nix
-    ../../modules/taskwarrior.nix
-    ../../modules/keepassxc.nix
-    ../../modules/browser
-    ../../modules/shell
+    (import ../../modules/taskwarrior.nix {
+      inherit config;
+      inherit pkgs;
+    })
+    (import ../../modules/keepassxc.nix { inherit pkgs; })
   ];
 
-  home = {
-    stateVersion = "25.05";
-    inherit username;
-    homeDirectory = "/home/${username}";
-  };
+  home.stateVersion = "25.05";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
 
   xdg.userDirs.createDirectories = false;
   xdg.userDirs.download = "${config.home.homeDirectory}/dl";
 
-  browser.primary = "librewolf";
-  cloud.hetzner.enable = true;
-  comms.signal.enable = true;
-  github.enable = true;
-
-  shell.bash = {
-    enable = true;
-    aliases.lang-js = true;
-  };
-
   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;
   };
 
@@ -52,4 +61,17 @@ in
     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;
+  };
 }

home/hosts/packages.nix

@@ -12,6 +12,7 @@ with pkgs;
   haskellPackages.pandoc-crossref
   htop
   jq
+  kitty
   nixfmt-rfc-style
   nmap
   nodejs_24
@@ -20,12 +21,14 @@ with pkgs;
   parallel
   pass
   pnpm
-  python3
   ripgrep
+  signal-desktop
   silver-searcher
   sops
   sshfs
   tldr
+  tmux
+  tmuxp
   tree
   unzip
   vimPlugins.vim-plug

home/hosts/work/default.nix

@@ -10,67 +10,30 @@ let
 in
 {
   imports = [
-    inputs.sops-nix.homeManagerModules.sops
-    ../../modules/ai-tools.nix
-    ../../modules/cloud
-    ../../modules/comms
     ../../modules/dconf.nix
-    ../../modules/git
+    ../../modules/git.nix
     ../../modules/k9s.nix
-    ../../modules/keepassxc.nix
-    ../../modules/kitty.nix
-    ../../modules/nvim.nix
-    ../../modules/browser
-    ../../modules/shell
-    ../../modules/taskwarrior.nix
+    (import ../../modules/keepassxc.nix { inherit pkgs; })
   ];
 
-  sops = {
-    age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
-    defaultSopsFile = "${inputs.nix-secrets}/secrets.yaml";
-
-    secrets = {
-      taskwarrior_sync_server_url = { };
-      taskwarrior_sync_server_client_id = { };
-      taskwarrior_sync_encryption_secret = { };
-      anki_sync_user = { };
-      anki_sync_key = { };
-    };
-
-    templates."taskrc.d/sync" = {
-      content = ''
-        sync.server.url=${config.sops.placeholder.taskwarrior_sync_server_url}
-        sync.server.client_id=${config.sops.placeholder.taskwarrior_sync_server_client_id}
-        sync.encryption_secret=${config.sops.placeholder.taskwarrior_sync_encryption_secret}
-      '';
-    };
-  };
-
   nixpkgs.config.allowUnfree = true;
 
-  home = {
-    stateVersion = "25.05";
-    inherit username;
-    homeDirectory = "/home/${username}";
-  };
+  home.stateVersion = "25.05";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
 
   targets.genericLinux.nixGL = {
-    inherit (inputs.nixgl) packages;
+    packages = inputs.nixgl.packages;
     defaultWrapper = "mesa";
   };
 
-  browser.primary = "firefox";
-  browser.secondary = "chromium";
-  cloud.azure.enable = true;
-  comms.signal.enable = true;
-  comms.teams.enable = true;
-  github.enable = true;
-  gitlab.enable = true;
-
-  shell.bash.enable = true;
-  starship.enable = true;
-
   programs = {
+    # editorconfig.enable = true;
+    firefox = import ../../modules/firefox.nix {
+      inherit inputs;
+      inherit pkgs;
+      inherit config;
+    };
     gh.enable = true;
     kubecolor.enable = true;
   };

home/hosts/work/packages.local.nix

@@ -0,0 +1,98 @@
+{
+  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
+]

home/hosts/work/packages.nix

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

home/modules/3d/default.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    bambu-studio
-    blender
-    openscad-lsp
-    openscad-unstable
-    orca-slicer
-  ];
-}

home/modules/ai-tools.nix

@@ -1,40 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  config = {
-    home.packages = with pkgs; [
-      aider-chat
-      (pkgs.stdenv.mkDerivation {
-        name = "ccline";
-        src = pkgs.fetchurl {
-          url = "https://github.com/Haleclipse/CCometixLine/releases/download/v1.0.8/ccline-linux-x64.tar.gz";
-          hash = "sha256-Joe3Dd6uSMGi66QT6xr2oY/Tz8rA5RuKa6ckBVJIzI0=";
-        };
-
-        unpackPhase = ''
-          tar xzf $src
-        '';
-
-        installPhase = ''
-          mkdir -p $out/bin
-          cp ccline $out/bin/
-          chmod +x $out/bin/ccline
-        '';
-
-        meta = with pkgs.lib; {
-          description = "CCometixLine Linux x64 CLI (Claude Code statusline)";
-          homepage = "https://github.com/Haleclipse/CCometixLine";
-          license = licenses.mit;
-          platforms = [ "x86_64-linux" ];
-        };
-      })
-      # claude-code
-      # (config.lib.nixGL.wrap code-cursor)
-      # github-copilot-cli
-      mcp-nixos
-      opencode
-    ];
-  };
-}

home/modules/anki.nix

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

home/modules/browser/bookmarks.nix

@@ -1,19 +0,0 @@
-{
-  nixos = {
-    name = "NixOS";
-    bookmarks = [
-      {
-        name = "wiki";
-        url = "https://wiki.nixos.org/wiki/NixOS_Wiki";
-      }
-      {
-        name = "packages";
-        url = "https://search.nixos.org/packages";
-      }
-      {
-        name = "options";
-        url = "https://search.nixos.org/options";
-      }
-    ];
-  };
-}

home/modules/browser/chromium.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  config = lib.mkIf (config.browser.primary == "chromium" || config.browser.secondary == "chromium") {
-    home.packages = [ pkgs.chromium ];
-  };
-}

home/modules/browser/default.nix

@@ -1,31 +0,0 @@
-{ lib, ... }:
-
-{
-  options.browser = {
-    primary = lib.mkOption {
-      type = lib.types.enum [
-        "firefox"
-        "chromium"
-        "librewolf"
-      ];
-      default = "firefox";
-    };
-
-    secondary = lib.mkOption {
-      type = lib.types.nullOr (
-        lib.types.enum [
-          "firefox"
-          "chromium"
-          "librewolf"
-        ]
-      );
-      default = null;
-    };
-  };
-
-  imports = [
-    ./firefox.nix
-    ./librewolf.nix
-    ./chromium.nix
-  ];
-}

home/modules/browser/firefox.nix

@@ -1,10 +0,0 @@
-{ config, lib, inputs, pkgs, ... }:
-
-{
-  config = lib.mkIf (config.browser.primary == "firefox" || config.browser.secondary == "firefox") {
-    programs.firefox = {
-      enable = true;
-    }
-    // (import ./firefox-base.nix { inherit inputs pkgs; });
-  };
-}

home/modules/browser/librewolf.nix

@@ -1,12 +0,0 @@
-{ config, lib, inputs, pkgs, ... }:
-
-{
-  config =
-    lib.mkIf (config.browser.primary == "librewolf" || config.browser.secondary == "librewolf")
-      {
-        programs.librewolf = {
-          enable = true;
-        }
-        // (import ./firefox-base.nix { inherit inputs pkgs; });
-      };
-}

home/modules/cloud/azure.nix

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

home/modules/cloud/default.nix

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

home/modules/cloud/hetzner.nix

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

home/modules/comms/default.nix

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

home/modules/comms/signal.nix

@@ -1,13 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  config = lib.mkIf config.comms.signal.enable {
-    home.packages = with pkgs; [
-      (if config.lib ? nixGL then config.lib.nixGL.wrap signal-desktop else signal-desktop)
-    ];
-  };
-}

home/modules/comms/teams.nix

@@ -1,14 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  config = lib.mkIf config.comms.teams.enable {
-    home.packages = with pkgs; [
-      (if config.lib ? nixGL then config.lib.nixGL.wrap teams-for-linux else teams-for-linux)
-    ];
-  };
-}

home/modules/dconf.nix

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

home/modules/desktop/niri/default.nix

@@ -15,11 +15,4 @@
       wlsunset
     ];
   };
-
-  services.gammastep = {
-    enable = true;
-    provider = "manual";
-    latitude = 51.05;
-    longitude = 3.71667;
-  };
 }

home/modules/firefox.nix

@@ -1,10 +1,7 @@
-{ inputs, pkgs }:
-
-let
-  bookmarks = import ./bookmarks.nix;
-in
+{ inputs, pkgs, ... }:
 
 {
+  enable = true;
   nativeMessagingHosts = with pkgs; [
     tridactyl-native
   ];
@@ -13,7 +10,7 @@ in
       settings = {
         "signon.rememberSignons" = false;
         "findbar.highlightAll" = true;
-        "extensions.autoDisableScopes" = 0;
+        "extensions.autoDisableScopes" = 0; # Enable extensions by default <https://nix-community.github.io/home-manager/options.xhtml#opt-programs.firefox.profiles._name_.extensions.packages>
       };
       extensions = {
         packages = with inputs.firefox-addons.packages.${pkgs.system}; [
@@ -33,7 +30,23 @@ in
           {
             toolbar = true;
             bookmarks = [
-              bookmarks.nixos
+              {
+                name = "NixOS";
+                bookmarks = [
+                  {
+                    name = "wiki";
+                    url = "https://wiki.nixos.org/wiki/NixOS_Wiki";
+                  }
+                  {
+                    name = "packages";
+                    url = "https://search.nixos.org/packages";
+                  }
+                  {
+                    name = "options";
+                    url = "https://search.nixos.org/options";
+                  }
+                ];
+              }
             ];
           }
         ];

home/modules/git.nix

@@ -0,0 +1,8 @@
+{
+  programs.git.enable = true;
+  home.file = {
+    ".gitconfig".source = ../../dots/.gitconfig;
+    ".gitconfig.work".source = ../../dots/.gitconfig.work;
+    ".gitignore".source = ../../dots/.gitignore;
+  };
+}

home/modules/git/default.nix

@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  dotsPath,
-  ...
-}:
-
-{
-  options = {
-    github.enable = lib.mkEnableOption "Github CLI";
-    gitlab.enable = lib.mkEnableOption "Gitlab CLI";
-  };
-
-  config = {
-    programs.git.enable = true;
-    home.file = {
-      ".gitconfig".source = dotsPath + "/.gitconfig";
-      ".gitconfig.work".source = dotsPath + "/.gitconfig.work";
-      ".gitignore".source = dotsPath + "/.gitignore";
-    };
-
-    programs.gh.enable = config.github.enable;
-    home.packages = with pkgs; lib.optionals (config.gitlab.enable) [ glab ];
-  };
-}

home/modules/kitty.nix

@@ -1,23 +0,0 @@
-{ pkgs, config, lib, dotsPath, ... }:
-
-{
-  config = {
-    home.packages = [
-      (if config.lib ? nixGL
-        then config.lib.nixGL.wrap pkgs.kitty
-        else pkgs.kitty)
-    ];
-    programs.bash.shellAliases = {
-      icat = "kitty +kitten icat";
-    };
-
-    home.file = {
-      ".config/kitty/kitty.conf".source = dotsPath + "/.config/kitty/kitty.conf";
-      ".config/kitty/nvim.conf".source = dotsPath + "/.config/kitty/nvim.conf";
-      ".config/kitty/themes/zenwritten_light.conf".source =
-        dotsPath + "/.config/kitty/themes/zenwritten_light.conf";
-      ".config/kitty/themes/zenwritten_dark.conf".source =
-        dotsPath + "/.config/kitty/themes/zenwritten_dark.conf";
-    };
-  };
-}

home/modules/nvim.nix

@@ -1,9 +0,0 @@
-{ pkgs, inputs, ... }:
-
-{
-  config = {
-    home.packages = [
-      inputs.nvim.packages.${pkgs.system}.nvim
-    ];
-  };
-}

home/modules/photography/default.nix

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

home/modules/shell/bash.nix

@@ -1,74 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  dotsPath,
-  ...
-}:
-let
-  cfg = config.shell.bash;
-  inherit (config.home) username;
-in
-{
-  options.shell.bash = {
-    enable = lib.mkEnableOption "bash configuration";
-
-    aliases = {
-      all = lib.mkOption {
-        type = lib.types.bool;
-        default = true;
-        description = "Enable common aliases";
-      };
-      lang-js = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = "Enable JavaScript/Node.js aliases";
-      };
-    };
-
-    addBinToPath = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = "Add dots .bin directory to PATH";
-    };
-
-    extraInit = lib.mkOption {
-      type = lib.types.lines;
-      default = "";
-      description = "Additional bash initialization";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    shell-utils.enable = lib.mkDefault true;
-
-    programs.bash = {
-      enable = true;
-      enableCompletion = true;
-      initExtra = ''
-        for f in /home/${username}/.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"}
-
-        ${cfg.extraInit}
-      '';
-    };
-
-    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";
-    }
-    // lib.optionalAttrs cfg.aliases.lang-js {
-      ".bash_aliases/lang-js".source = dotsPath + "/.bash_aliases/lang-js";
-    };
-  };
-}

home/modules/shell/default.nix

@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./bash.nix
-    ./utils.nix
-    ./prompt.nix
-    ../tmux.nix
-  ];
-}

home/modules/shell/prompt.nix

@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  options.starship = {
-    enable = lib.mkEnableOption "starship prompt";
-  };
-
-  config = lib.mkIf config.starship.enable {
-    programs.starship = {
-      enable = true;
-    };
-  };
-}

home/modules/shell/utils.nix

@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  options.shell-utils = {
-    enable = lib.mkEnableOption "shell utilities";
-  };
-
-  config = lib.mkIf config.shell-utils.enable {
-    programs.fzf = {
-      enable = true;
-      enableBashIntegration = lib.mkDefault true;
-    };
-
-    home.packages = with pkgs; [
-      ripgrep
-      bat
-      jq
-      entr
-      parallel
-    ];
-  };
-}

home/modules/ssh.nix

@@ -1,25 +0,0 @@
-{
-  outputs,
-  lib,
-  ...
-}:
-let
-  nixosConfigs = builtins.attrNames outputs.nixosConfigurations;
-  homeConfigs = map (n: lib.last (lib.splitString "@" n)) (
-    builtins.attrNames outputs.homeConfigurations
-  );
-  allHosts = lib.unique (homeConfigs ++ nixosConfigs);
-  hostsWithKeys = lib.filter (
-    hostname: builtins.pathExists ../../hosts/${hostname}/ssh_host.pub
-  ) allHosts;
-in
-{
-  programs.ssh = {
-    enable = true;
-    enableDefaultConfig = false;
-
-    matchBlocks = lib.genAttrs hostsWithKeys (hostname: {
-      host = hostname;
-    });
-  };
-}

home/modules/taskwarrior.nix

@@ -1,45 +1,31 @@
 {
   config,
-  lib,
   pkgs,
-  dotsPath,
-  osConfig ? null,
   ...
 }:
 
-let
-  hmSopsAvailable = config ? sops && config.sops ? templates;
-  osSopsAvailable = osConfig != null && osConfig ? sops && osConfig.sops ? templates;
-  sopsAvailable = hmSopsAvailable || osSopsAvailable;
-
-  sopsTemplates = if hmSopsAvailable then config.sops.templates else osConfig.sops.templates;
-in
 {
-  warnings =
-    lib.optional (!sopsAvailable && config.programs.taskwarrior.enable)
-      "taskwarrior is enabled, but sops templates are not available. taskwarrior sync will not be configured.";
-
   home.packages = with pkgs; [
+    python314
     libnotify
-    taskopen
   ];
 
   home.file = {
     ".config/task/taskrc" = {
       force = true; # overwrite when present
-      source = dotsPath + "/.config/task/taskrc";
+      source = ../../dots/.config/task/taskrc;
     };
-    ".config/task/taskrc.d/aliases".source = dotsPath + "/.config/task/taskrc.d/aliases";
-    ".config/task/taskrc.d/colors".source = dotsPath + "/.config/task/taskrc.d/colors";
-    ".config/task/taskrc.d/contexts".source = dotsPath + "/.config/task/taskrc.d/contexts";
-    ".config/task/taskrc.d/reports".source = dotsPath + "/.config/task/taskrc.d/reports";
-    ".config/task/taskrc.d/udas".source = dotsPath + "/.config/task/taskrc.d/udas";
-    ".config/task/taskrc.d/urgency".source = dotsPath + "/.config/task/taskrc.d/urgency";
+    ".config/task/taskrc.d/aliases".source = ../../dots/.config/task/taskrc.d/aliases;
+    ".config/task/taskrc.d/colors".source = ../../dots/.config/task/taskrc.d/colors;
+    ".config/task/taskrc.d/contexts".source = ../../dots/.config/task/taskrc.d/contexts;
+    ".config/task/taskrc.d/reports".source = ../../dots/.config/task/taskrc.d/reports;
+    ".config/task/taskrc.d/udas".source = ../../dots/.config/task/taskrc.d/udas;
+    ".config/task/taskrc.d/urgency".source = ../../dots/.config/task/taskrc.d/urgency;
     ".local/share/task/hooks/on-exit.sync.py" = {
-      source = dotsPath + "/.local/share/task/hooks/on-exit.sync.py";
+      source = ../../dots/.local/share/task/hooks/on-exit.sync.py;
     };
     ".local/share/task/scripts/sync-and-notify.sh" = {
-      source = dotsPath + "/.local/share/task/scripts/sync-and-notify.sh";
+      source = ../../dots/.local/share/task/scripts/sync-and-notify.sh;
       executable = true;
     };
   };
@@ -49,10 +35,17 @@ in
     package = taskwarrior3;
     colorTheme = "dark-256";
     config = {
+      # sync = {
+      #   server.url = "${builtins.readFile config.sops.secrets."taskwarrior_sync_server_url".path}";
+      #   server.client_id = "${builtins.readFile
+      #     config.sops.secrets."taskwarrior_sync_server_client_id".path
+      #   }";
+      #   encryption_secret = "${builtins.readFile
+      #     config.sops.secrets."taskwarrior_sync_encryption_secret".path
+      #   }";
+      # };
       recurrence = "off";
     };
-    extraConfig = lib.optionalString sopsAvailable ''
-      include ${sopsTemplates."taskrc.d/sync".path}
-    '';
+    extraConfig = "include ${config.sops.templates."taskrc.d/sync".path}";
   };
 }

home/modules/tmux.nix

@@ -1,25 +0,0 @@
-{
-  pkgs,
-  dotsPath,
-  ...
-}:
-{
-  config = {
-    home.packages = with pkgs; [
-      tmux
-      tmuxp
-      reptyr
-    ];
-
-    home.file = {
-      ".config/tmux/tmux.conf".source = dotsPath + "/.config/tmux/tmux.conf";
-      ".config/tmux/tmux.regular.conf".source = dotsPath + "/.config/tmux/tmux.regular.conf";
-      ".config/tmux/themes/zenwritten_light.tmux".source =
-        dotsPath + "/.config/tmux/themes/zenwritten_light.tmux";
-      ".config/tmux/themes/zenwritten_dark.tmux".source =
-        dotsPath + "/.config/tmux/themes/zenwritten_dark.tmux";
-      ".config/tmux/hooks/tmux.ssh.conf".source = dotsPath + "/.config/tmux/hooks/tmux.ssh.conf";
-      ".config/tmux/hooks/tmux.regular.conf".source = dotsPath + "/.config/tmux/hooks/tmux.regular.conf";
-    };
-  };
-}

hosts/andromache/default.nix

@@ -1,61 +1,48 @@
 {
   lib,
   inputs,
-  outputs,
   config,
   pkgs,
   ...
 }:
+
 let
   username = "h";
-  hostName = "andromache";
   wolInterfaces = import ./wol-interfaces.nix;
 in
 {
   imports = [
     ../../modules/common
-    ./hard.nix
-    inputs.nixos-hardware.nixosModules.common-cpu-intel
-    inputs.nixos-hardware.nixosModules.common-pc
-    inputs.nixos-hardware.nixosModules.common-pc-ssd
+    inputs.disko.nixosModules.disko
     inputs.sops-nix.nixosModules.sops
+    inputs.home-manager.nixosModules.default
+    ./hard.nix
     ../../modules/boot/bootloader.nix
     (import ../../modules/disko/zfs-encrypted-root.nix {
-      inherit lib config;
       device = "/dev/nvme1n1";
+      inherit lib;
+      inherit config;
     })
     ../../modules/desktops/niri
     ../../modules/bluetooth
     ../../modules/keyboard
-    (import ../../modules/networking { inherit hostName; })
+    (import ../../modules/networking { hostName = "andromache"; })
     ../../modules/users
     ../../modules/audio
     ../../modules/localization
     ../../modules/fonts
     ../../modules/ssh/hardened-openssh.nix
-    (import ../../modules/secrets { inherit lib inputs config; })
+    (import ../../modules/secrets {
+      inherit lib;
+      inherit inputs;
+      inherit config;
+    })
     ../../modules/docker
   ];
 
-  home-manager.users.${username} = import ../../home/hosts/andromache {
-    inherit
-      inputs
-      config
-      pkgs
-      lib
-      ;
-  };
-
-  networking.hostName = hostName;
-
-  ssh.username = username;
-  ssh.authorizedHosts = [ "astyanax" ];
-
   secrets.username = username;
   docker.user = username;
 
-  nix.settings.secret-key-files = [ config.sops.secrets.nix_signing_key_andromache.path ];
-
   disko.devices = {
     disk.data = {
       type = "disk";
@@ -89,38 +76,49 @@ in
     };
   };
 
+  environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ];
 
-  services = {
-    xserver = {
-      videoDrivers = [ "nvidia" ];
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.${username} = import ../../home/hosts/andromache {
+      inherit lib;
+      inherit inputs;
+      inherit config;
+      inherit pkgs;
     };
+  };
 
-    openssh = {
-      enable = true;
-      harden = true;
-    };
+  services.xserver = {
+    videoDrivers = [ "nvidia" ];
+  };
 
-    syncthing = {
-      enable = true;
-      openDefaultPorts = true;
-      settings = {
-        devices = {
-          # "device1" = {
-          #   id = "DEVICE-ID-GOES-HERE";
-          # };
-        };
-        folders = {
-          "/home/${username}/sync" = {
-            id = "sync";
-            devices = [ ];
-          };
+  services.openssh = {
+    enable = true;
+    harden = true;
+  };
+
+  services.syncthing = {
+    enable = true;
+    openDefaultPorts = true;
+    settings = {
+      devices = {
+        # "device1" = {
+        #   id = "DEVICE-ID-GOES-HERE";
+        # };
+      };
+      folders = {
+        "/home/${username}/sync" = {
+          id = "sync";
+          devices = [ ];
         };
       };
     };
-    locate = {
-      enable = true;
-      package = pkgs.plocate;
-    };
+  };
+
+  services.locate = {
+    enable = true;
+    package = pkgs.plocate;
   };
 
   networking = {
@@ -129,7 +127,7 @@ in
     interfaces = {
       eno1 = {
         wakeOnLan.enable = true;
-        inherit (wolInterfaces.eno1) macAddress;
+        macAddress = wolInterfaces.eno1.macAddress;
       };
     };
     firewall = {

hosts/andromache/hard.nix

@@ -14,21 +14,19 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot = {
-    initrd.availableKernelModules = [
-      "vmd"
-      "xhci_pci"
-      "ahci"
-      "nvme"
-      "usbhid"
-      "usb_storage"
-      "uas"
-      "sd_mod"
-    ];
-    initrd.kernelModules = [ ];
-    kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ ];
-  };
+  boot.initrd.availableKernelModules = [
+    "vmd"
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "uas"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/andromache/ssh_host.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG7TMnKO4EqISk2s/xy+3P2xn8XcMOuzZrSiYTZT+8m2 root@andromache

hosts/andromache/ssh_user.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOOXPEhdKOVnb6mkeLLUcFGt+mnUR5pMie17JtjrxwgO h@andromache

hosts/astyanax/default.nix

@@ -1,11 +1,11 @@
 {
   lib,
   inputs,
-  outputs,
   config,
   pkgs,
   ...
 }:
+
 let
   username = "h";
   hostName = "astyanax";
@@ -14,49 +14,34 @@ in
 {
   imports = [
     ../../modules/common
-    ./hard.nix
-    inputs.nixos-hardware.nixosModules.common-pc
-    inputs.nixos-hardware.nixosModules.common-pc-ssd
-    # inputs.nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel-gen7 (not available yet?)
+    inputs.nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel
+    inputs.disko.nixosModules.disko
     inputs.sops-nix.nixosModules.sops
+    inputs.home-manager.nixosModules.default
+    ./hard.nix
     ../../modules/boot/bootloader.nix
     (import ../../modules/disko/zfs-encrypted-root.nix {
-      inherit lib config;
+      inherit lib;
+      inherit config;
       device = "/dev/nvme0n1";
     })
     ../../modules/desktops/niri
     ../../modules/bluetooth
     ../../modules/keyboard
-    (import ../../modules/networking { inherit hostName; })
+    (import ../../modules/networking { hostName = hostName; })
     ../../modules/users
     ../../modules/audio
     ../../modules/localization
     ../../modules/fonts
     ../../modules/ssh/hardened-openssh.nix
-    # ../../modules/vpn/wireguard.nix
-    (import ../../modules/secrets { inherit lib inputs config; })
-    ../../modules/docker
+    (import ../../modules/secrets {
+      inherit lib;
+      inherit inputs;
+      inherit config;
+      inherit username;
+    })
   ];
 
-  home-manager.users.${username} = import ../../home/hosts/astyanax {
-    inherit
-      inputs
-      config
-      pkgs
-      lib
-      ;
-  };
-
-  networking.hostName = hostName;
-
-  ssh.username = username;
-  ssh.authorizedHosts = [ "andromache" ];
-
-  secrets.username = username;
-  docker.user = username;
-
-  nix.settings.secret-key-files = [ config.sops.secrets.nix_signing_key_astyanax.path ];
-
   hardware = {
     cpu.intel.updateMicrocode = true;
     # https://wiki.nixos.org/wiki/Intel_Graphics
@@ -74,7 +59,10 @@ in
     LIBVA_DRIVER_NAME = "iHD";
   };
 
+  secrets.username = username;
+
   environment.systemPackages = [
+    inputs.nvim.packages.x86_64-linux.nvim
     (pkgs.writeShellApplication {
       name = "wol-andromache";
       runtimeInputs = [ pkgs.wakeonlan ];
@@ -84,35 +72,46 @@ in
     })
   ];
 
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.${username} = import ../../home/hosts/astyanax {
+      inherit inputs;
+      inherit config;
+      inherit pkgs;
+    };
+  };
+
   networking = {
     # TODO: generate unique hostId on actual host with: head -c 8 /etc/machine-id
     hostId = "80eef97e";
   };
 
-  services = {
-    fwupd.enable = true;
-    openssh = {
-      enable = true;
-      harden = true;
-    };
-    syncthing = {
-      enable = true;
-      openDefaultPorts = true;
-      folders = {
-        "/home/h/sync" = {
-          id = "sync";
-          devices = [ ];
-        };
-      };
-      devices = {
-        # "device1" = {
-        #   id = "DEVICE-ID-GOES-HERE";
-        # };
+  services.throttled.enable = false;
+
+  services.openssh = {
+    enable = true;
+    harden = true;
+  };
+
+  services.syncthing = {
+    enable = true;
+    openDefaultPorts = true;
+    folders = {
+      "/home/h/sync" = {
+        id = "sync";
+        devices = [ ];
       };
     };
-    locate = {
-      enable = true;
-      package = pkgs.plocate;
+    devices = {
+      # "device1" = {
+      #   id = "DEVICE-ID-GOES-HERE";
+      # };
     };
   };
+
+  services.locate = {
+    enable = true;
+    package = pkgs.plocate;
+  };
 }

hosts/astyanax/hard.nix

@@ -14,18 +14,16 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot = {
-    initrd.availableKernelModules = [
-      "xhci_pci"
-      "thunderbolt"
-      "nvme"
-      "uas"
-      "sd_mod"
-    ];
-    initrd.kernelModules = [ ];
-    kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ ];
-  };
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "thunderbolt"
+    "nvme"
+    "uas"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/astyanax/ssh_host.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO8+UOyZbvQeHfFfYox3SQi42KJ0S3RZj79iswSsZeFy root@nixos

hosts/astyanax/ssh_user.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIzP1PjIDb1tN9nhPOK88HYDtTNk9SN9ZpEem2id49Fa h@astyanax

hosts/hecuba/default.nix

@@ -1,35 +1,14 @@
-{
-  lib,
-  inputs,
-  outputs,
-  config,
-  pkgs,
-  ...
-}:
+{ pkgs, ... }:
 
 # Also see <https://wiki.nixos.org/wiki/Install_NixOS_on_Hetzner_Cloud>
 
-let
-  username = "username";
-  hostName = "hecuba";
-in
 {
   imports = [
-    ../../modules/common
     ./hard.nix
+    ../../modules/common
     ../../modules/ssh/hardened-openssh.nix
-    ../../modules/docker
   ];
 
-  networking.hostName = hostName;
-  ssh.username = username;
-  ssh.authorizedHosts = [
-    "andromache"
-    "astyanax"
-  ];
-
-  docker.user = username;
-
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";
     fsType = "ext4";
@@ -52,17 +31,16 @@ in
     username = {
       isNormalUser = true;
       extraGroups = [ "wheel" ];
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOOXPEhdKOVnb6mkeLLUcFGt+mnUR5pMie17JtjrxwgO h@andromache"
+      ];
     };
   };
 
   security.sudo.wheelNeedsPassword = false;
 
-  networking.firewall = {
-    enable = true;
-    allowedTCPPorts = [
-      80
-      443
-    ];
+  networking = {
+    firewall.enable = true;
   };
 
   environment.systemPackages = with pkgs; [
@@ -79,15 +57,4 @@ in
     enable = true;
     harden = true;
   };
-
-  nix.settings = {
-    trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "astyanax:JY2qJkZUFSax47R3c1nq53AZ8GnLfNqz6mSnJ60cLZ4="
-      "andromache:XM4VLrEw63RB/3v/56OxzH/Yw+kKXKMBLKCb7UGAXzo="
-    ];
-    auto-optimise-store = true;
-    keep-derivations = false;
-    keep-outputs = false;
-  };
 }

hosts/hecuba/hard.nix

@@ -14,21 +14,17 @@
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "ahci"
-        "xhci_pci"
-        "virtio_pci"
-        "virtio_scsi"
-        "sd_mod"
-        "sr_mod"
-      ];
-      kernelModules = [ ];
-    };
-    kernelModules = [ ];
-    extraModulePackages = [ ];
-  };
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "xhci_pci"
+    "virtio_pci"
+    "virtio_scsi"
+    "sd_mod"
+    "sr_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/hecuba/ssh_host.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIffzYkin2QHGoaOKXbQv6pbim8SU1J+3vAf2vXerMj root@nixos

hosts/vm/default.nix

@@ -1,24 +1,25 @@
 {
   lib,
   inputs,
-  outputs,
   config,
   pkgs,
   ...
 }:
+
 let
   username = "h";
-  hostName = "vm";
 in
 {
   imports = [
     ../../modules/common
-    ./hard.nix
+    inputs.disko.nixosModules.disko
     inputs.sops-nix.nixosModules.sops
+    inputs.home-manager.nixosModules.default
+    ./hard.nix
     ./disk.nix
     ../../modules/boot/bootloader.nix
     ../../modules/keyboard
-    (import ../../modules/networking { inherit hostName; })
+    (import ../../modules/networking { hostName = "vm"; })
     ../../modules/users
     ../../modules/audio
     ../../modules/localization
@@ -26,25 +27,20 @@ in
     ../../modules/fonts
     ../../modules/ssh/hardened-openssh.nix
     (import ../../modules/secrets {
-      inherit lib inputs config;
+      inherit lib;
+      inherit inputs;
+      inherit config;
     })
   ];
 
-  home-manager.users.${username} = import ../../home/hosts/vm {
-    inherit inputs config pkgs;
-  };
-
-  networking.hostName = hostName;
-  ssh.username = username;
-
   secrets.username = username;
 
+  environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ];
+
   disko = {
-    devices.disk.main = {
-      device = "/dev/vda";
-      imageName = "nixos-vm";
-      imageSize = "32G";
-    };
+    devices.disk.main.device = "/dev/vda";
+    devices.disk.main.imageName = "nixos-vm";
+    devices.disk.main.imageSize = "32G";
   };
 
   virtualisation.vmVariantWithDisko = {
@@ -59,12 +55,21 @@ in
     };
   };
 
-  services = {
-    qemuGuest.enable = true;
-    spice-vdagentd.enable = true;
-    openssh = {
-      enable = true;
-      harden = true;
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.${username} = import ../../home/hosts/vm {
+      inherit inputs;
+      inherit config;
+      inherit pkgs;
     };
   };
+
+  services.qemuGuest.enable = true;
+  services.spice-vdagentd.enable = true;
+
+  services.openssh = {
+    enable = true;
+    harden = true;
+  };
 }

hosts/vm/hard.nix

@@ -14,20 +14,16 @@
     (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "ahci"
-        "xhci_pci"
-        "virtio_pci"
-        "sr_mod"
-        "virtio_blk"
-      ];
-      kernelModules = [ ];
-    };
-    kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ ];
-  };
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "xhci_pci"
+    "virtio_pci"
+    "sr_mod"
+    "virtio_blk"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

modules/audio/default.nix

@@ -1,15 +1,13 @@
-_:
+{ ... }:
 
 {
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
-  services = {
-    pulseaudio.enable = false;
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-    pulseaudio.extraConfig = "load-module module-switch-on-connect";
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
   };
+  services.pulseaudio.extraConfig = "load-module module-switch-on-connect";
 }

modules/boot/bootloader.nix

@@ -1,4 +1,4 @@
-_:
+{ ... }:
 
 {
   boot.loader.systemd-boot.enable = true;

modules/common/default.nix

@@ -1,16 +1,4 @@
 {
-  inputs,
-  outputs,
-  dotsPath,
-  ...
-}:
-
-{
-  imports = [
-    inputs.disko.nixosModules.disko
-    inputs.home-manager.nixosModules.default
-  ];
-
   system.stateVersion = "25.05";
 
   nix.settings.experimental-features = [
@@ -19,38 +7,4 @@
   ];
 
   nixpkgs.config.allowUnfree = true;
-
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = {
-      inherit inputs outputs dotsPath;
-    };
-  };
-
-  nix = {
-    optimise = {
-      automatic = true;
-      dates = [ "05:00" ];
-    };
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 30d";
-    };
-  };
-
-  system.autoUpgrade = {
-    enable = true;
-    flake = inputs.self.outPath;
-    operation = "switch";
-    flags = [
-      "--recreate-lock-file"
-      "--commit-lock-file"
-      "--print-build-logs"
-    ];
-    dates = "05:00";
-    randomizedDelaySec = "45min";
-    allowReboot = false;
-  };
 }

modules/desktops/niri/default.nix

@@ -1,16 +1,8 @@
 {
   programs.niri.enable = true;
 
-  services = {
-    dbus.enable = true;
-    logind.settings.Login = {
-      HandleLidSwitch = "suspend";
-      IdleAction = "suspend";
-      IdleActionSec = 1800;
-    };
-
-    displayManager.ly = {
-      enable = true;
-    };
+  services.dbus.enable = true;
+  xdg = {
+    portal.enable = true;
   };
 }

modules/disko/zfs-encrypted-root.nix

@@ -11,7 +11,7 @@
       disk = {
         root = {
           type = "disk";
-          inherit (config) device;
+          device = config.device;
           content = {
             type = "gpt";
             partitions = {

modules/fonts/default.nix

@@ -1,16 +1,5 @@
-{ pkgs, ... }:
-
 {
   imports = [
     ./iosevka.nix
   ];
-
-  fonts = {
-    # disable default font packages (see https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/config/fonts/packages.nix)
-    enableDefaultPackages = false;
-    packages = with pkgs; [
-      dejavu_fonts
-      liberation_ttf
-    ];
-  };
 }

modules/fonts/iosevka.nix

@@ -1,14 +1,7 @@
 { pkgs, ... }:
 
 {
-  fonts = {
-    packages = with pkgs; [
-      (iosevka-bin.override { variant = "SGr-IosevkaTermSS08"; })
-    ];
-    fontconfig = {
-      defaultFonts = {
-        monospace = [ "Iosevka Term SS08" ];
-      };
-    };
-  };
+  fonts.packages = with pkgs; [
+    (iosevka-bin.override { variant = "SGr-IosevkaTermSS08"; })
+  ];
 }

modules/localization/default.nix

@@ -1,4 +1,4 @@
-_:
+{ ... }:
 
 {
   time.timeZone = "Europe/Brussels";

modules/networking/default.nix

@@ -5,7 +5,7 @@
 
 {
   networking = {
-    inherit hostName;
+    hostName = hostName;
     wireless.iwd.enable = true;
     networkmanager.wifi.backend = "iwd";
     nftables.enable = true;

modules/secrets/default.nix

@@ -16,6 +16,7 @@ in
   };
   config = {
     sops = {
+      validateSopsFiles = false;
       defaultSopsFile = "${builtins.toString inputs.nix-secrets}/secrets.yaml";
       defaultSopsFormat = "yaml";
       age.keyFile = "/home/${cfg.username}/.config/sops/age/keys.txt";
@@ -28,64 +29,33 @@ in
         "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;
-        "hcloud".owner = config.users.users.${cfg.username}.name;
-        "nix_signing_key_astyanax" = { };
-        "nix_signing_key_andromache" = { };
-        "opencode_api_key".owner = config.users.users.${cfg.username}.name;
       };
 
-      templates = {
-        "taskrc.d/sync" = {
-          owner = config.users.users.${cfg.username}.name;
-          content = ''
-            sync.server.url=${config.sops.placeholder."taskwarrior_sync_server_url"}
-            sync.server.client_id=${config.sops.placeholder."taskwarrior_sync_server_client_id"}
-            sync.encryption_secret=${config.sops.placeholder."taskwarrior_sync_encryption_secret"}
-          '';
-        };
+      templates."taskrc.d/sync" = {
+        owner = config.users.users.${cfg.username}.name;
+        content = ''
+          sync.server.url=${config.sops.placeholder."taskwarrior_sync_server_url"}
+          sync.server.client_id=${config.sops.placeholder."taskwarrior_sync_server_client_id"}
+          sync.encryption_secret=${config.sops.placeholder."taskwarrior_sync_encryption_secret"}
+        '';
+      };
 
-        ".gitconfig.email" = {
-          owner = config.users.users.${cfg.username}.name;
-          path = "/home/${cfg.username}/.gitconfig.email";
-          content = ''
-            [user]
-              email = ${config.sops.placeholder."email_personal"}
-          '';
-        };
+      templates.".gitconfig.email" = {
+        owner = config.users.users.${cfg.username}.name;
+        path = "/home/${cfg.username}/.gitconfig.email";
+        content = ''
+          [user]
+            email = ${config.sops.placeholder."email_personal"}
+        '';
+      };
 
-        ".gitconfig.work.email" = {
-          owner = config.users.users.${cfg.username}.name;
-          path = "/home/${cfg.username}/.gitconfig.work.email";
-          content = ''
-            [user]
-              email = ${config.sops.placeholder."email_work"}
-          '';
-        };
-
-        "hcloud/cli.toml" = {
-          owner = config.users.users.${cfg.username}.name;
-          path = "/home/${cfg.username}/.config/hcloud/cli.toml";
-          content = ''
-            active_context = "server"
-
-            [[contexts]]
-              name = "server"
-              token = "${config.sops.placeholder."hcloud"}"
-          '';
-        };
-
-        "opencode/auth.json" = {
-          owner = config.users.users.${cfg.username}.name;
-          path = "/home/${cfg.username}/.local/share/opencode/auth.json";
-          content = ''
-            {
-              "zai-coding-plan": {
-                "type": "api",
-                "key": "${config.sops.placeholder."opencode_api_key"}"
-              }
-            }
-          '';
-        };
+      templates.".gitconfig.work.email" = {
+        owner = config.users.users.${cfg.username}.name;
+        path = "/home/${cfg.username}/.gitconfig.work.email";
+        content = ''
+          [user]
+            email = ${config.sops.placeholder."email_work"}
+        '';
       };
     };
   };

modules/ssh/authorized-keys.nix

@@ -1,24 +0,0 @@
-{ lib, config, ... }:
-{
-  options.ssh = {
-    authorizedHosts = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-    };
-    username = lib.mkOption {
-      type = lib.types.str;
-      default = "h";
-    };
-  };
-
-  # auto generate authorized_keys from `authorizedHosts`
-  config.users.users.${config.ssh.username}.openssh.authorizedKeys.keys = lib.flatten (
-    map (
-      hostname:
-      let
-        keyFile = ../../hosts/${hostname}/ssh_user.pub;
-      in
-      lib.optionals (builtins.pathExists keyFile) (lib.splitString "\n" (builtins.readFile keyFile))
-    ) config.ssh.authorizedHosts
-  );
-}

modules/ssh/extract-keys.nix

@@ -1,24 +0,0 @@
-{ lib, config, ... }:
-let
-  inherit (config.ssh) username;
-in
-{
-  # auto extract SSH keys
-  system.activationScripts.extractSshKeys = lib.stringAfter [ "etc" ] ''
-    HOST_KEY="/etc/ssh/ssh_host_ed25519_key.pub"
-    HOST_DIR="/home/${username}/nix/hosts/${config.networking.hostName}"
-
-    if [ -f "$HOST_KEY" ] && [ -d "$HOST_DIR" ]; then
-      cp "$HOST_KEY" "$HOST_DIR/ssh_host.pub"
-      chown ${username}:users "$HOST_DIR/ssh_host.pub"
-      chmod 644 "$HOST_DIR/ssh_host.pub"
-    fi
-
-    USER_KEY="/home/${username}/.ssh/id_ed25519.pub"
-    if [ -f "$USER_KEY" ] && [ -d "$HOST_DIR" ]; then
-      cp "$USER_KEY" "$HOST_DIR/ssh_user.pub"
-      chown ${username}:users "$HOST_DIR/ssh_user.pub"
-      chmod 644 "$HOST_DIR/ssh_user.pub"
-    fi
-  '';
-}

modules/ssh/hardened-openssh.nix

@@ -4,17 +4,9 @@ let
   cfg = config.services.openssh;
 in
 {
-  imports = [
-    ./known-hosts.nix
-    ./authorized-keys.nix
-    ./extract-keys.nix
-  ];
-
   options.services.openssh.harden = mkEnableOption "harden ssh server configuration";
-
   config = {
     networking.firewall.allowedTCPPorts = [ 22 ];
-
     services.openssh.settings = optionalAttrs cfg.harden {
       PermitRootLogin = "no";
       PasswordAuthentication = false;

modules/ssh/known-hosts.nix

@@ -1,19 +0,0 @@
-{
-  lib,
-  config,
-  outputs,
-  ...
-}:
-let
-  hosts = lib.attrNames outputs.nixosConfigurations;
-  hostsWithKeys = lib.filter (
-    hostname: builtins.pathExists ../../hosts/${hostname}/ssh_host.pub
-  ) hosts;
-in
-{
-  # auto generate known_hosts for all hosts in flake
-  programs.ssh.knownHosts = lib.genAttrs hostsWithKeys (hostname: {
-    publicKeyFile = ../../hosts/${hostname}/ssh_host.pub;
-    extraHostNames = lib.optional (hostname == config.networking.hostName) "localhost";
-  });
-}

modules/x/default.nix

@@ -1,4 +1,4 @@
-_:
+{ ... }:
 
 {
   services.xserver.windowManager.xmonad = {

phone/default.nix

@@ -1,26 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  environment.packages = with pkgs; [
-    neovim
-  ];
-
-  environment.etcBackupExtension = ".bak";
-
-  system.stateVersion = "24.05";
-
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-
-  time.timeZone = "Europe/Brussels";
-
-  home-manager = {
-    config = ./home.nix;
-    backupFileExtension = "hm-bak";
-    useGlobalPkgs = true;
-  };
-}

phone/home.nix

@@ -1,3 +0,0 @@
-{
-  home.stateVersion = "24.05";
-}