refactor: remove unnecessary config wrapper in nvim

refactor: remove unnecessary config wrapper in docker
refactor: namespace git cli options under git module
2026-03-11 21:25:32 +01:00 · 2026-03-11 21:25:32 +01:00 · 2026-03-11 21:25:32 +01:00 · 2026-03-11 21:25:32 +01:00 · 2026-03-11 21:25:32 +01:00 · 2026-03-11 21:25:32 +01:00
10 changed files with 22 additions and 25 deletions
--- a/dots/.config/nvim/after/plugin/codecompanion.nvim.lua
+++ b/dots/.config/nvim/after/plugin/codecompanion.nvim.lua
@@ -13,6 +13,7 @@ if ok then
  cc_config.interactions = cc_config.interactions or {}
  cc_config.interactions.chat = cc_config.interactions.chat or {}
  cc_config.interactions.chat.tools = cc_config.interactions.chat.tools or {}
+  cc_config.interactions.chat.variables = cc_config.interactions.chat.variables or {}

  require("mcphub.extensions.codecompanion").setup({
    make_vars = true,
--- a/flake.lock
+++ b/flake.lock
@@ -121,11 +121,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1773115390,
-        "narHash": "sha256-nl1kcyM1locj//JnzC43hZIjY4z5opcTPqv1RnMZqPU=",
+        "lastModified": 1773201798,
+        "narHash": "sha256-TZQwHvIBz9hr/fci/G/AIjPSKCMtxQm/xFm3MNJ/mVg=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "aecb1fc3e18c3cdcbdd96485b392ffa4584467e8",
+        "rev": "016edd132727d8ac364454a6b443ef46c2d1c7e4",
        "type": "gitlab"
      },
      "original": {
@@ -344,11 +344,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773093840,
-        "narHash": "sha256-u/96NoAyN8BSRuM3ZimGf7vyYgXa3pLx4MYWjokuoH4=",
+        "lastModified": 1773179137,
+        "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "bb014746edb2a98d975abde4dd40fa240de4cf86",
+        "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09",
        "type": "github"
      },
      "original": {
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@@ -46,7 +46,7 @@ in
  browser.primary = "librewolf";
  cloud.hetzner.enable = true;
  comms.signal.enable = true;
-  github.enable = true;
+  git.github.enable = true;
  shell.bash.aliases.lang-js = true;
  shell.bash.addBinToPath = true;

--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -44,7 +44,7 @@ in
  browser.primary = "librewolf";
  cloud.hetzner.enable = true;
  comms.signal.enable = true;
-  github.enable = true;
+  git.github.enable = true;
  shell.bash.aliases.lang-js = true;
  shell.bash.addBinToPath = true;

--- a/home/hosts/work/default.nix
+++ b/home/hosts/work/default.nix
@@ -31,7 +31,7 @@ in
    ../../modules/keepassxc
    ../../modules/kitty.nix
    ../../modules/music
-    ../../modules/nodejs.nix
+    ../../modules/nodejs
    ../../modules/nvim
    ../../modules/pandoc
    ../../modules/secrets
@@ -39,7 +39,7 @@ in
    ../../modules/stylix
    ../../modules/taskwarrior
    ../../modules/terminal
-    ../../modules/vscode.nix
+    ../../modules/vscode
  ];

  sops = {
@@ -104,8 +104,8 @@ in
  };
  database.mssql.enable = true;
  database.postgresql.enable = true;
-  github.enable = true;
-  gitlab.enable = true;
+  git.github.enable = true;
+  git.gitlab.enable = true;
  secrets.vault.enable = true;

  programs = {
--- a/home/modules/docker/default.nix
+++ b/home/modules/docker/default.nix
@@ -1,9 +1,7 @@
 { pkgs, ... }:

 {
-  config = {
-    home.packages = with pkgs; [
-      dive
-    ];
-  };
+  home.packages = with pkgs; [
+    dive
+  ];
 }
--- a/home/modules/git/default.nix
+++ b/home/modules/git/default.nix
@@ -7,7 +7,7 @@
 }:

 {
-  options = {
+  options.git = {
    github.enable = lib.mkEnableOption "Github CLI";
    gitlab.enable = lib.mkEnableOption "Gitlab CLI";
  };
@@ -20,7 +20,7 @@
      ".gitignore".source = dotsPath + "/.gitignore";
    };

-    programs.gh.enable = config.github.enable;
-    home.packages = lib.optionals config.gitlab.enable [ pkgs.glab ];
+    programs.gh.enable = config.git.github.enable;
+    home.packages = lib.optionals config.git.gitlab.enable [ pkgs.glab ];
  };
 }
--- a/home/modules/nodejs/default.nix
+++ b/home/modules/nodejs/default.nix
--- a/home/modules/nvim/default.nix
+++ b/home/modules/nvim/default.nix
@@ -1,9 +1,7 @@
 { pkgs, inputs, ... }:

 {
-  config = {
-    home.packages = [
-      inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.nvim
-    ];
-  };
+  home.packages = [
+    inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.nvim
+  ];
 }
--- a/home/modules/vscode/default.nix
+++ b/home/modules/vscode/default.nix