chore: disable 'lutris' temporarily (failed openldap test)

chore: update lockfile
fix: centralize and nixifiy in 'zk' module
2026-04-26 13:14:05 +02:00 · 2026-04-26 12:36:47 +02:00 · 2026-04-26 12:32:45 +02:00
45 changed files with 261 additions and 418 deletions
--- a/dots/.config/nvim/after/plugin/hydra.lua
+++ b/dots/.config/nvim/after/plugin/hydra.lua
@@ -1,35 +0,0 @@
-local hydra_repl = "hydra-repl"
-
-if not vim.fn.executable(hydra_repl) then
-  return
-end
-
-local function send(lines)
-  vim.system({ hydra_repl, table.concat(lines, "\n") })
-end
-
-local function get_paragraph(buf)
-  local start_ = vim.fn.search("^$", "bnW")
-  local end_ = vim.fn.search("^$", "nW") - 1
-  if end_ < vim.api.nvim_win_get_cursor(0)[1] then
-    end_ = vim.api.nvim_buf_line_count(buf)
-  end
-  return vim.api.nvim_buf_get_lines(buf, start_, end_, false)
-end
-
-local function get_selection(buf)
-  return vim.api.nvim_buf_get_lines(buf, vim.fn.line("'<") - 1, vim.fn.line("'>"), false)
-end
-
-vim.api.nvim_create_autocmd("FileType", {
-  pattern = "javascript",
-  callback = function(e)
-    if vim.fn.fnamemodify(vim.api.nvim_buf_get_name(e.buf), ":e") ~= "hydra" then
-      return
-    end
-
-    local buf = e.buf
-    vim.keymap.set("n", "<CR>", function() send(get_paragraph(buf)) end, { buffer = buf, desc = "hydra: send block" })
-    vim.keymap.set("v", "<CR>", function() send(get_selection(buf)) end, { buffer = buf, desc = "hydra: send selection" })
-  end,
-})
--- a/dots/.config/nvim/after/plugin/wiki.vim.lua
+++ b/dots/.config/nvim/after/plugin/wiki.vim.lua
@@ -13,16 +13,11 @@ nm <leader>ww <plug>(wiki-index)
 " nm <leader>s <plug>(wiki-link-follow-split)
 " nm <leader>v <plug>(wiki-link-follow-vsplit)

-function! ZKContextualEcho()
-  let l:name = expand('%:t')
-  if l:name =~ '_' | echo 'hierarchical relation'
-  elseif l:name =~ '--' | echo 'relation'
-  elseif l:name =~ '<>' | echo 'dichotomy'
-  elseif l:name =~ 'my-' | echo 'personal file'
-  elseif l:name =~ 'project_' | echo 'project file'
-  endif
-endfunction
-execute 'autocmd BufEnter' g:zk_path . '/*.md' 'call ZKContextualEcho()'
+autocmd BufEnter *.md if expand('%:t') =~ '_' | echo 'hierarchical relation' | endif
+autocmd BufEnter *.md if expand('%:t') =~ '--' | echo 'relation' | endif
+autocmd BufEnter *.md if expand('%:t') =~ '<>' | echo 'dichotomy' | endif
+autocmd BufEnter *.md if expand('%:t') =~ 'my-' | echo 'personal file' | endif
+autocmd BufEnter *.md if expand('%:t') =~ 'project_' | echo 'project file' | endif

 " Only load wiki.vim for zk directory
 let g:wiki_index_name='index'
--- a/dots/.config/nvim/flake.lock
+++ b/dots/.config/nvim/flake.lock
@@ -42,11 +42,11 @@
    },
    "nixCats": {
      "locked": {
-        "lastModified": 1777273601,
-        "narHash": "sha256-xBUa8Tl9V7IXI+VmLEuDc81La/EhoSn1C3EVSnJ3cfU=",
+        "lastModified": 1774835836,
+        "narHash": "sha256-6ok7iv/9R82vl6MYe3Lwyyb6S5bmW2PxEZtmjzlqyPs=",
        "owner": "BirdeeHub",
        "repo": "nixCats-nvim",
-        "rev": "f69ea013e328841a7def7037ed59788a76be8816",
+        "rev": "ebb9f279a55ca60ff4e37e4accf6518dc627aa8d",
        "type": "github"
      },
      "original": {
@@ -73,11 +73,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1777270315,
-        "narHash": "sha256-yKB4G6cKsQsWN7M6rZGk6gkJPDNPIzT05y4qzRyCDlI=",
+        "lastModified": 1775608838,
+        "narHash": "sha256-2ySoGH+SAi34U0PeuQgABC0WiH9LQ3tkyHTiE93KUeg=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "6368eda62c9775c38ef7f714b2555a741c20c72d",
+        "rev": "9a01fad67a57e44e1b3e1d905c6881bcfb209e8a",
        "type": "github"
      },
      "original": {
--- a/dots/.config/nvim/flake.nix
+++ b/dots/.config/nvim/flake.nix
@@ -45,23 +45,7 @@
      inherit (nixCats) utils;
      luaPath = ./.;
      forEachSystem = utils.eachSystem nixpkgs.lib.platforms.all;
-      extra_pkg_config = {
-        allowUnfreePredicate =
-          pkg:
-          builtins.elem (nixpkgs.lib.getName pkg) [
-            "vim-sandwich"
-            "jupytext.nvim"
-            "eyeliner.nvim"
-            "context_filetype.vim"
-            "editorconfig-vim"
-            "unicode.vim"
-            "quarto-nvim"
-            "vim-openscad"
-            "lsp_lines.nvim"
-            "nvim-highlight-colors"
-            "nvim-lint"
-          ];
-      };
+      extra_pkg_config = { };

      mkDependencyOverlays = system: [
        (utils.standardPluginOverlay inputs)
@@ -87,11 +71,9 @@
        {
          lspsAndRuntimeDeps = with pkgs; {
            general = [
-              nodejs_24
              black
              clang
              clang-tools
-              curl # → plenary-nvim, mcp-hub
              delta
              emmet-language-server
              eslint_d
@@ -105,8 +87,6 @@
              mcp-hub
              nixd
              nixfmt
-              prettier
-              typescript-language-server
              ormolu
              prettierd
              rust-analyzer
@@ -115,7 +95,6 @@
              stylelint
              stylua
              tree-sitter
-              tailwindcss-language-server
              typescript-language-server
              vscode-langservers-extracted
              vtsls
--- a/dots/.config/nvim/lua/ftdetect.lua
+++ b/dots/.config/nvim/lua/ftdetect.lua
@@ -9,6 +9,5 @@ vim.filetype.add({
    ["%.env.*"] = "dotenv",
    ["%.pl$"] = "prolog",
    [".*.containerfile.*"] = "dockerfile",
-    ["%.hydra$"] = "javascript",
  },
 })
--- a/dots/.config/nvim/lua/zk/cmp.lua
+++ b/dots/.config/nvim/lua/zk/cmp.lua
@@ -13,31 +13,28 @@ local function get_markdown_files(base)
  return items
 end

-function source:get_keyword_pattern()
-  return "[%w%./%-]*"
-end
-
 function source:complete(params, callback)
  local cursor_before_line = params.context.cursor_before_line
  local cursor_after_line = params.context.cursor_after_line or ""

-  if not cursor_before_line:match("%[[^%]]*%]%(") then
-    callback({})
-    return
-  end
+  local trigger = cursor_before_line:match("%[[^%]]*%]%(([^)]*)$")

-  local items = get_markdown_files(".")
-  local next_char = cursor_after_line:sub(1, 1)
+  if trigger ~= nil then
+    local items = get_markdown_files(".")
+    local next_char = cursor_after_line:sub(1, 1)

-  for _, item in ipairs(items) do
-    if next_char == ")" then
-      item.insertText = item.label
-    else
-      item.insertText = item.label .. ")"
+    for _, item in ipairs(items) do
+      if next_char == ")" then
+        item.insertText = item.label
+      else
+        item.insertText = item.label .. ")"
+      end
    end
-  end

-  callback(items)
+    callback(items)
+  else
+    callback({})
+  end
 end

 function source:get_trigger_characters()
--- a/dots/.config/tmux/hooks/tmux.ssh.conf
+++ b/dots/.config/tmux/hooks/tmux.ssh.conf
@@ -0,0 +1 @@
+set -g status-style bg=colour12,fg=colour0
--- a/dots/.config/tmux/tmux.conf
+++ b/dots/.config/tmux/tmux.conf
@@ -70,6 +70,8 @@ set -g status-right '#(uptime | cut -f 4-5 -d " " | cut -f 1 -d ",") %a %l:%M:%S

 set -g default-terminal "tmux-256color"

+set-hook -g after-new-session 'if -F "#{==:#{session_name},ssh}" "source ${XDG_CONFIG_HOME}/tmux/hooks/tmux.ssh.conf" "source ${XDG_CONFIG_HOME}/tmux/hooks/tmux.regular.conf"'
+
 # Vi copypaste mode
 if-shell "test '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 4 \)'" 'bind-key -Tcopy-mode-vi v send -X begin-selection; bind-key -Tcopy-mode-vi y send -X copy-selection-and-cancel'
 if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 4\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'bind-key -t vi-copy v begin-selection; bind-key -t vi-copy y copy-selection'
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
    "base16-helix": {
      "flake": false,
      "locked": {
-        "lastModified": 1776754714,
-        "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
+        "lastModified": 1760703920,
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
        "owner": "tinted-theming",
        "repo": "base16-helix",
-        "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
        "type": "github"
      },
      "original": {
@@ -121,11 +121,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1778040175,
-        "narHash": "sha256-SSXJp3BMjO2LrW/VLjNdGGcjd3RFEyV4FemYA6OGrYw=",
+        "lastModified": 1777176175,
+        "narHash": "sha256-l/0TJCLEarrsyHIKNhAjI4+7lkyGsFqojyx1X1h64Ks=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "3bd76b0f41e65661866bddcac57ebe83aeadb581",
+        "rev": "515c8c1296021efe49ba1b1318ff27a43e93442b",
        "type": "gitlab"
      },
      "original": {
@@ -138,11 +138,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1776136500,
-        "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
+        "lastModified": 1775176642,
+        "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
+        "rev": "179704030c5286c729b5b0522037d1d51341022c",
        "type": "github"
      },
      "original": {
@@ -342,11 +342,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1778009629,
-        "narHash": "sha256-nUoQtf4Zq7DRYJrfv904hjrxjAlWVP6a1pNNFKx3FCg=",
+        "lastModified": 1777196875,
+        "narHash": "sha256-6M/rTHxFRdKJ6WZYxrCl68qIyh3BvjWBmYC7Vufolbg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "00ed86e58bb6979a7921859fd1615d19382eac5c",
+        "rev": "38bf0202cae280174cbb80fc24a63978f16333f7",
        "type": "github"
      },
      "original": {
@@ -415,11 +415,11 @@
    },
    "nixCats": {
      "locked": {
-        "lastModified": 1777273601,
-        "narHash": "sha256-xBUa8Tl9V7IXI+VmLEuDc81La/EhoSn1C3EVSnJ3cfU=",
+        "lastModified": 1774835836,
+        "narHash": "sha256-6ok7iv/9R82vl6MYe3Lwyyb6S5bmW2PxEZtmjzlqyPs=",
        "owner": "BirdeeHub",
        "repo": "nixCats-nvim",
-        "rev": "f69ea013e328841a7def7037ed59788a76be8816",
+        "rev": "ebb9f279a55ca60ff4e37e4accf6518dc627aa8d",
        "type": "github"
      },
      "original": {
@@ -451,11 +451,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1777917524,
-        "narHash": "sha256-k+LVe9YaO2BEPB9AaCtTtOMCeGi4dxDo6gt4Un3qoPY=",
+        "lastModified": 1776983936,
+        "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "df7783100babf59001340a7a874ba3824e441ecb",
+        "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
        "type": "github"
      },
      "original": {
@@ -467,11 +467,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1777954456,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "lastModified": 1776877367,
+        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
        "type": "github"
      },
      "original": {
@@ -509,11 +509,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1777598946,
-        "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
+        "lastModified": 1775228139,
+        "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
+        "rev": "601971b9c89e0304561977f2c28fa25e73aa7132",
        "type": "github"
      },
      "original": {
@@ -665,11 +665,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1777944972,
-        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
+        "lastModified": 1776771786,
+        "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
+        "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
        "type": "github"
      },
      "original": {
@@ -714,11 +714,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1777835090,
-        "narHash": "sha256-VLH8zPweblCOvpnQXp4fVs7f6Q79YhXF5XFKlOrvIFk=",
+        "lastModified": 1776893932,
+        "narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "7989a1054b01153212dede6005abfd1576b8328c",
+        "rev": "84971726c7ef0bb3669a5443e151cc226e65c518",
        "type": "github"
      },
      "original": {
@@ -776,11 +776,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1777041405,
-        "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
+        "lastModified": 1772661346,
+        "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
+        "rev": "13b5b0c299982bb361039601e2d72587d6846294",
        "type": "github"
      },
      "original": {
@@ -792,11 +792,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1777169200,
-        "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
+        "lastModified": 1772934010,
+        "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
+        "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d",
        "type": "github"
      },
      "original": {
@@ -808,11 +808,11 @@
    "tinted-zed": {
      "flake": false,
      "locked": {
-        "lastModified": 1777463218,
-        "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
+        "lastModified": 1772909925,
+        "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=",
        "owner": "tinted-theming",
        "repo": "base16-zed",
-        "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
+        "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -76,10 +76,7 @@
          nixpkgs.lib.nixosSystem {
            modules = [
              ./hosts/${host}
-              {
-                nixpkgs.hostPlatform = (myUtils.hostMeta ./hosts/${host}).system;
-                host.name = host;
-              }
+              { nixpkgs.hostPlatform = (myUtils.hostMeta ./hosts/${host}).system; }
            ];
            specialArgs = {
              inherit
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@@ -47,10 +47,7 @@
    printing.enable = true;
    modeling.enable = true;
  };
-  ai-tools = {
-    claude-code.enable = true;
-    opencode.enable = true;
-  };
+  ai-tools.opencode.enable = true;
  browser.primary = "librewolf";
  cloud.hetzner.enable = true;
  comms.signal.enable = true;
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -43,10 +43,7 @@
  };

  modules."3d".printing.enable = true;
-  ai-tools = {
-    claude-code.enable = true;
-    opencode.enable = true;
-  };
+  ai-tools.opencode.enable = true;
  browser.primary = "librewolf";
  cloud.hetzner.enable = true;
  comms.signal.enable = true;
--- a/home/hosts/work/default.nix
+++ b/home/hosts/work/default.nix
@@ -73,11 +73,8 @@
    tirith.enable = true;
    opencode.enable = true;
  };
-  database = {
-    mssql.enable = true;
-    postgresql.enable = true;
-    redis.enable = true;
-  };
+  database.mssql.enable = true;
+  database.postgresql.enable = true;
  git.github.enable = true;
  git.gitlab.enable = true;
  secrets.vault.enable = true;
--- a/home/modules/ai-tools/claude-code.nix
+++ b/home/modules/ai-tools/claude-code.nix
@@ -1,60 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.ai-tools.claude-code;
-  rtk-version = "0.18.1";
-in
-{
-  options.ai-tools.claude-code.enable = lib.mkEnableOption "claude code with rtk and ccline";
-
-  config = lib.mkIf cfg.enable {
-    programs.claude-code.enable = true;
-
-    home.packages = with pkgs; [
-      (stdenv.mkDerivation {
-        name = "ccline";
-        src = fetchurl {
-          url = "https://github.com/Haleclipse/CCometixLine/releases/download/v1.0.8/ccline-linux-x64.tar.gz";
-          hash = "sha256-Joe3Dd6uSMGi66QT6xr2oY/Tz8rA5RuKa6ckBVJIzI0=";
-        };
-        unpackPhase = "tar xzf $src";
-        installPhase = ''
-          mkdir -p $out/bin
-          cp ccline $out/bin/
-          chmod +x $out/bin/ccline
-        '';
-        meta = {
-          description = "CCometixLine Linux x64 CLI (Claude Code statusline)";
-          homepage = "https://github.com/Haleclipse/CCometixLine";
-          license = lib.licenses.mit;
-          platforms = [ "x86_64-linux" ];
-        };
-      })
-      (stdenv.mkDerivation {
-        name = "rtk-${rtk-version}";
-        version = rtk-version;
-        src = fetchurl {
-          url = "https://github.com/rtk-ai/rtk/releases/download/v${rtk-version}/rtk-x86_64-unknown-linux-gnu.tar.gz";
-          hash = "sha256-XoTia5K8b00OzcKYCufwx8ApkAS31DxUCpGSU0jFs2Q=";
-        };
-        unpackPhase = "tar xzf $src";
-        installPhase = ''
-          mkdir -p $out/bin
-          cp rtk $out/bin/
-          chmod +x $out/bin/rtk
-        '';
-        meta = {
-          description = "RTK - AI coding tool enhancer";
-          homepage = "https://www.rtk-ai.app";
-          license = lib.licenses.mit;
-          platforms = [ "x86_64-linux" ];
-        };
-      })
-      mcp-nixos
-    ];
-  };
-}
--- a/home/modules/ai-tools/default.nix
+++ b/home/modules/ai-tools/default.nix
@@ -1,8 +1,116 @@
 {
-  imports = [
-    ./claude-code.nix
-    ./opencode.nix
-    ./skills.nix
-    ./tirith.nix
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.ai-tools;
+  rtk-version = "0.18.1";
+in
+{
+  options.ai-tools = {
+    claude-code.enable = lib.mkEnableOption "claude code with rtk and ccline";
+    tirith.enable = lib.mkEnableOption "tirith shell security guard";
+    opencode.enable = lib.mkEnableOption "opencode";
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf cfg.claude-code.enable {
+      home.packages = with pkgs; [
+        claude-code
+        (pkgs.stdenv.mkDerivation {
+          name = "ccline";
+          src = pkgs.fetchurl {
+            url = "https://github.com/Haleclipse/CCometixLine/releases/download/v1.0.8/ccline-linux-x64.tar.gz";
+            hash = "sha256-Joe3Dd6uSMGi66QT6xr2oY/Tz8rA5RuKa6ckBVJIzI0=";
+          };
+
+          unpackPhase = ''
+            tar xzf $src
+          '';
+
+          installPhase = ''
+            mkdir -p $out/bin
+            cp ccline $out/bin/
+            chmod +x $out/bin/ccline
+          '';
+
+          meta = with pkgs.lib; {
+            description = "CCometixLine Linux x64 CLI (Claude Code statusline)";
+            homepage = "https://github.com/Haleclipse/CCometixLine";
+            license = licenses.mit;
+            platforms = [ "x86_64-linux" ];
+          };
+        })
+        (pkgs.stdenv.mkDerivation {
+          name = "rtk-${rtk-version}";
+          version = rtk-version;
+          src = pkgs.fetchurl {
+            url = "https://github.com/rtk-ai/rtk/releases/download/v${rtk-version}/rtk-x86_64-unknown-linux-gnu.tar.gz";
+            hash = "sha256-XoTia5K8b00OzcKYCufwx8ApkAS31DxUCpGSU0jFs2Q=";
+          };
+
+          unpackPhase = ''
+            tar xzf $src
+          '';
+
+          installPhase = ''
+            mkdir -p $out/bin
+            cp rtk $out/bin/
+            chmod +x $out/bin/rtk
+          '';
+
+          meta = with pkgs.lib; {
+            description = "RTK - AI coding tool enhancer";
+            homepage = "https://www.rtk-ai.app";
+            license = licenses.mit;
+            platforms = [ "x86_64-linux" ];
+          };
+        })
+        mcp-nixos
+      ];
+    })
+    (lib.mkIf cfg.tirith.enable {
+      home.packages = with pkgs; [
+        tirith
+      ];
+    })
+    (lib.mkIf (cfg.tirith.enable && cfg.claude-code.enable) {
+      home.file.".claude/hooks/tirith-check.py" = {
+        source = ./tirith-check.py;
+        executable = true;
+      };
+
+      home.activation.tirith-claude-code = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+        ${pkgs.tirith}/bin/tirith setup claude-code --with-mcp --scope user --force 2>/dev/null || true
+      '';
+    })
+    (lib.mkIf cfg.opencode.enable {
+      home.packages = with pkgs; [
+        opencode
+      ];
+      home.file.".config/opencode/opencode.json".text = builtins.toJSON {
+        "$schema" = "https://opencode.ai/config.json";
+        permission = {
+          external_directory = {
+            "/run/secrets/" = "deny";
+            "~/.config/sops/age/keys.txt" = "deny";
+            "~/.ssh/id_rsa" = "deny";
+            "~/.ssh/id_ed25519" = "deny";
+            "~/.ssh/id_ecdsa" = "deny";
+            "~/.ssh/id_dsa" = "deny";
+            "/etc/ssh/ssh_host_rsa_key" = "deny";
+            "/etc/ssh/ssh_host_ed25519_key" = "deny";
+            "/etc/ssh/ssh_host_ecdsa_key" = "deny";
+            "/etc/ssh/ssh_host_dsa_key" = "deny";
+          };
+          command = {
+            sops = "deny";
+          };
+        };
+        plugin = [ "@mohak34/opencode-notifier@latest" ];
+      };
+    })
  ];
 }
--- a/home/modules/ai-tools/opencode.nix
+++ b/home/modules/ai-tools/opencode.nix
@@ -1,40 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.ai-tools.opencode;
-in
-{
-  options.ai-tools.opencode = {
-    enable = lib.mkEnableOption "opencode";
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = [ pkgs.opencode ];
-
-    home.file.".config/opencode/opencode.json".text = builtins.toJSON {
-      "$schema" = "https://opencode.ai/config.json";
-      permission = {
-        external_directory = {
-          "/run/secrets/" = "deny";
-          "~/.config/sops/age/keys.txt" = "deny";
-          "~/.ssh/id_rsa" = "deny";
-          "~/.ssh/id_ed25519" = "deny";
-          "~/.ssh/id_ecdsa" = "deny";
-          "~/.ssh/id_dsa" = "deny";
-          "/etc/ssh/ssh_host_rsa_key" = "deny";
-          "/etc/ssh/ssh_host_ed25519_key" = "deny";
-          "/etc/ssh/ssh_host_ecdsa_key" = "deny";
-          "/etc/ssh/ssh_host_dsa_key" = "deny";
-        };
-        command = {
-          sops = "deny";
-        };
-      };
-      plugin = [ "@mohak34/opencode-notifier@latest" ];
-    };
-  };
-}
--- a/home/modules/ai-tools/skills.nix
+++ b/home/modules/ai-tools/skills.nix
@@ -1,49 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.ai-tools.claude-code;
-
-  skillType = lib.types.submodule {
-    options = {
-      owner = lib.mkOption { type = lib.types.str; };
-      repo = lib.mkOption { type = lib.types.str; };
-      rev = lib.mkOption { type = lib.types.str; };
-      hash = lib.mkOption { type = lib.types.str; };
-      skill = lib.mkOption { type = lib.types.str; };
-    };
-  };
-
-  fetchSkill =
-    skill:
-    let
-      src = pkgs.fetchFromGitHub {
-        inherit (skill)
-          owner
-          repo
-          rev
-          hash
-          ;
-      };
-    in
-    {
-      name = ".claude/skills/${skill.skill}";
-      value = {
-        source = "${src}/${skill.skill}";
-        recursive = true;
-      };
-    };
-in
-{
-  options.ai-tools.claude-code.skills = lib.mkOption {
-    type = lib.types.listOf skillType;
-    default = [ ];
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.file = builtins.listToAttrs (map fetchSkill cfg.skills);
-  };
-}
--- a/home/modules/ai-tools/tirith.nix
+++ b/home/modules/ai-tools/tirith.nix
@@ -1,30 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.ai-tools.tirith;
-in
-{
-  options.ai-tools.tirith = {
-    enable = lib.mkEnableOption "tirith shell security guard";
-  };
-
-  config = lib.mkMerge [
-    (lib.mkIf cfg.enable {
-      home.packages = [ pkgs.tirith ];
-    })
-    (lib.mkIf (cfg.enable && config.ai-tools.claude-code.enable) {
-      home.file.".claude/hooks/tirith-check.py" = {
-        source = ./tirith-check.py;
-        executable = true;
-      };
-
-      home.activation.tirith-claude-code = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-        ${pkgs.tirith}/bin/tirith setup claude-code --with-mcp --scope user --force 2>/dev/null || true
-      '';
-    })
-  ];
-}
--- a/home/modules/database/default.nix
+++ b/home/modules/database/default.nix
@@ -9,18 +9,14 @@
  options.database = {
    mssql.enable = lib.mkEnableOption "MSSQL";
    postgresql.enable = lib.mkEnableOption "PostgreSQL";
-    redis.enable = lib.mkEnableOption "Redis";
  };

  config = lib.mkMerge [
    (lib.mkIf config.database.mssql.enable {
-      home.packages = with pkgs; [ (config.nixgl.wrap dbeaver-bin) ];
+      home.packages = [ (config.nixgl.wrap pkgs.dbeaver-bin) ];
    })
    (lib.mkIf config.database.postgresql.enable {
-      home.packages = with pkgs; [ (config.nixgl.wrap pgadmin4-desktopmode) ];
-    })
-    (lib.mkIf config.database.postgresql.enable {
-      home.packages = with pkgs; [ redis ];
+      home.packages = [ (config.nixgl.wrap pkgs.pgadmin4-desktopmode) ];
    })
  ];
 }
--- a/home/modules/dconf/default.nix
+++ b/home/modules/dconf/default.nix
@@ -41,7 +41,7 @@ in
      clock-show-weekday = true;
      color-scheme = "prefer-dark";
      enable-hot-corners = false;
-      # font-name = font;
+      font-name = font;
      locate-pointer = true;
      monospace-font-name = font;
    };
--- a/home/modules/tmux/default.nix
+++ b/home/modules/tmux/default.nix
@@ -11,5 +11,9 @@
      enable = true;
      extraConfig = builtins.readFile (dotsPath + "/.config/tmux/tmux.conf");
    };
+
+    home.file = {
+      ".config/tmux/hooks/tmux.ssh.conf".source = dotsPath + "/.config/tmux/hooks/tmux.ssh.conf";
+    };
  };
 }
--- a/home/modules/zk/scripts/zk.sh
+++ b/home/modules/zk/scripts/zk.sh
@@ -1,6 +1,6 @@
-current_zettel_path="$(cat "$ZK_PATH/current-zettel.txt")"
+current_zettel_path="$ZK_PATH/$(cat "$ZK_PATH/current-zettel.txt")"

-if [ -n "${TMUX:-}" ]; then
+if [ -n "$TMUX" ]; then
  cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
 else
  echo 'Not in tmux'
@@ -10,9 +10,13 @@ else
  read -r -p 'Enter your choice: ' choice
  case $choice in
    1)
-      if tmux has-session -t zk 2>/dev/null; then
-        tmux attach -t zk
+      # Check if a tmux session is running with a window named zk
+      if tmux list-windows -F '#{window_name}' | grep -q zk; then
+        # Attach to the session containing the 'zk' window
+        session="$(tmux list-windows -F '#{window_name} #{session_name}' | grep zk | head -n 1 | awk '{ print $2 }')"
+        tmux attach -t "$session"
      else
+        # Create session with a window named 'zk' and start nvim
        tmux new-session -s zk -n zk -d
        tmux send-keys -t zk:zk "cd $ZK_PATH && $EDITOR $current_zettel_path" Enter
        tmux attach -t zk
--- a/hosts/andromache/default.nix
+++ b/hosts/andromache/default.nix
@@ -51,7 +51,9 @@ in
    ../../modules/yubikey
  ];

-  home-manager.users.${config.host.username} = import ../../home/hosts/${config.host.name};
+  home-manager.users.${config.host.username} = import ../../home/hosts/andromache;
+
+  ssh.authorizedHosts = [ "astyanax" ];

  secrets.nixSigningKey.enable = true;

--- a/hosts/andromache/host.nix
+++ b/hosts/andromache/host.nix
@@ -1,7 +1,6 @@
 {
  host = {
    username = "h";
-    highRam = true;
-    admin = true;
+    name = "andromache";
  };
 }
--- a/hosts/astyanax/default.nix
+++ b/hosts/astyanax/default.nix
@@ -47,7 +47,9 @@ in
    ../../modules/yubikey
  ];

-  home-manager.users.${config.host.username} = import ../../home/hosts/${config.host.name};
+  home-manager.users.${config.host.username} = import ../../home/hosts/astyanax;
+
+  ssh.authorizedHosts = [ "andromache" ];

  secrets.nixSigningKey.enable = true;

--- a/hosts/astyanax/host.nix
+++ b/hosts/astyanax/host.nix
@@ -1,7 +1,6 @@
 {
  host = {
    username = "h";
-    highRam = true;
-    admin = true;
+    name = "astyanax";
  };
 }
--- a/hosts/eetion-02/default.nix
+++ b/hosts/eetion-02/default.nix
@@ -11,6 +11,13 @@
    ../../modules/ssh
  ];

+  ssh = {
+    authorizedHosts = [
+      "andromache"
+      "astyanax"
+    ];
+  };
+
  boot = {
    kernelParams = [
      "console=ttyS1,115200n8"
--- a/hosts/eetion-02/host.nix
+++ b/hosts/eetion-02/host.nix
@@ -1,5 +1,6 @@
 {
  host = {
    username = "h";
+    name = "eetion-02";
  };
 }
--- a/hosts/eetion/default.nix
+++ b/hosts/eetion/default.nix
@@ -15,6 +15,13 @@

  tailscale.enable = true;

+  ssh = {
+    authorizedHosts = [
+      "andromache"
+      "astyanax"
+    ];
+  };
+
  boot.loader = {
    grub.enable = false;
    generic-extlinux-compatible.enable = true;
--- a/hosts/eetion/host.nix
+++ b/hosts/eetion/host.nix
@@ -1,5 +1,6 @@
 {
  host = {
    username = "h";
+    name = "eetion";
  };
 }
--- a/hosts/hecuba/default.nix
+++ b/hosts/hecuba/default.nix
@@ -18,6 +18,13 @@
  ];

  networking.hostName = config.host.name;
+  ssh = {
+    authorizedHosts = [
+      "andromache"
+      "astyanax"
+    ];
+  };
+
  docker.enable = true;

  fileSystems."/" = {
--- a/hosts/hecuba/host.nix
+++ b/hosts/hecuba/host.nix
@@ -1,5 +1,6 @@
 {
  host = {
    username = "username";
+    name = "hecuba";
  };
 }
--- a/hosts/vm/host.nix
+++ b/hosts/vm/host.nix
@@ -1,5 +1,6 @@
 {
  host = {
    username = "h";
+    name = "vm";
  };
 }
--- a/images/sd-image-orange-pi-aarch64.nix
+++ b/images/sd-image-orange-pi-aarch64.nix
@@ -21,6 +21,11 @@ in
    name = "orange-pi";
  };

+  ssh.authorizedHosts = [
+    "andromache"
+    "astyanax"
+  ];
+
  nix.settings.experimental-features = [
    "nix-command"
    "flakes"
--- a/images/sd-image-raspberry-pi-aarch64.nix
+++ b/images/sd-image-raspberry-pi-aarch64.nix
@@ -21,6 +21,11 @@ in
    name = "raspberry-pi";
  };

+  ssh.authorizedHosts = [
+    "andromache"
+    "astyanax"
+  ];
+
  boot.kernelParams = [
    "console=ttyS1,115200n8"
  ];
--- a/modules/ai-tools/default.nix
+++ b/modules/ai-tools/default.nix
@@ -6,7 +6,6 @@ let
 in
 {
  config = {
-    nixpkgs.allowedUnfree = [ "claude-code" ];
    secrets.groups.opencode = [ "api-key" ];

    sops.templates."opencode/auth.json" = {
--- a/modules/boot/bootloader.nix
+++ b/modules/boot/bootloader.nix
@@ -1,11 +1,4 @@
-{ config, ... }:
-
 {
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-    tmp.useTmpfs = config.host.highRam;
-  };
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 }
--- a/modules/common/host.nix
+++ b/modules/common/host.nix
@@ -19,15 +19,5 @@
      type = lib.types.str;
      default = "en_US.UTF-8";
    };
-
-    highRam = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-    };
-
-    admin = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-    };
  };
 }
--- a/modules/desktops/gnome/default.nix
+++ b/modules/desktops/gnome/default.nix
--- a/modules/desktops/logind.nix
+++ b/modules/desktops/logind.nix
@@ -1,7 +0,0 @@
-{
-  services.logind.settings.Login = {
-    HandleLidSwitch = "suspend";
-    IdleAction = "suspend";
-    IdleActionSec = 1800;
-  };
-}
--- a/modules/desktops/niri/default.nix
+++ b/modules/desktops/niri/default.nix
@@ -9,8 +9,6 @@ let
  cfg = config.desktop;
 in
 {
-  imports = [ ../logind.nix ];
-
  options.desktop = {
    ly = {
      enable = lib.mkOption {
@@ -37,23 +35,15 @@ in
      ];
    };

-    #  error:
-    #  Failed assertions:
-    #  - h profile: xdg.portal: since you installed Home Manager via its NixOS module and
-    #  'home-manager.useUserPackages' is enabled, you need to add
-    #
-    #  environment.pathsToLink = [ `/share/applications` `/share/xdg-desktop-portal` ];
-    #
-    #  to your NixOS configuration so that the portal definitions and DE
-    #  provided configurations get linked.
-    environment.pathsToLink = [
-      "/share/applications"
-      "/share/xdg-desktop-portal"
-    ];
-
    services = {
      gnome.gnome-keyring.enable = false;
      dbus.enable = true;
+      logind.settings.Login = {
+        HandleLidSwitch = "suspend";
+        IdleAction = "suspend";
+        IdleActionSec = 1800;
+      };
+
      displayManager.ly = lib.mkIf cfg.ly.enable {
        enable = true;
      };
--- a/modules/ssh/authorized-keys.nix
+++ b/modules/ssh/authorized-keys.nix
@@ -1,12 +1,7 @@
-{
-  lib,
-  config,
-  ...
-}:
+{ lib, config, ... }:

 let
  inherit (config.host) username;
-  adminHosts = (import ../../utils { inherit lib; }).adminHosts ../../hosts;
 in
 {
  options.ssh = {
@@ -24,6 +19,6 @@ in
        keyFile = ../../hosts/${hostname}/ssh_user.pub;
      in
      lib.optionals (builtins.pathExists keyFile) (lib.splitString "\n" (builtins.readFile keyFile))
-    ) ((builtins.filter (h: h != config.host.name) adminHosts) ++ config.ssh.authorizedHosts)
+    ) config.ssh.authorizedHosts
  );
 }
--- a/utils/default.nix
+++ b/utils/default.nix
@@ -1,8 +1,12 @@
 { lib }:

 let
-  fs = import ./fs.nix { inherit lib; };
-  hosts = import ./hosts.nix { inherit lib; };
+  hosts = import ./hosts.nix;
  secrets = import ./secrets.nix { inherit lib; };
 in
-fs // hosts // secrets
+{
+  dirNames =
+    path: builtins.attrNames (lib.filterAttrs (_: type: type == "directory") (builtins.readDir path));
+}
+// hosts
+// secrets
--- a/utils/fs.nix
+++ b/utils/fs.nix
@@ -1,6 +0,0 @@
-{ lib }:
-
-{
-  dirNames =
-    path: builtins.attrNames (lib.filterAttrs (_: t: t == "directory") (builtins.readDir path));
-}
--- a/utils/hosts.nix
+++ b/utils/hosts.nix
@@ -1,8 +1,3 @@
-{ lib }:
-
-let
-  fs = import ./fs.nix { inherit lib; };
-in
 {
  hostMeta =
    hostDir:
@@ -10,10 +5,4 @@ in
      import (hostDir + "/meta.nix")
    else
      throw "meta.nix required in ${hostDir}";
-
-  adminHosts =
-    hostsPath:
-    builtins.filter (host: ((import (hostsPath + "/${host}/host.nix")).host.admin or false)) (
-      fs.dirNames hostsPath
-    );
 }
Author	SHA1	Message	Date
hektor	fdaa327ab8	chore: disable 'lutris' temporarily (failed openldap test)	2026-04-26 13:14:05 +02:00
hektor	9ec68b1939	chore: update lockfile	2026-04-26 12:36:47 +02:00
hektor	34dd35f575	fix: centralize and nixifiy in 'zk' module	2026-04-26 12:32:45 +02:00