Commit ee7fa002f6b0

Vincent Demeester <vincent@sbr.pm>
2025-11-20 10:32:26
refactor: Source AI dev tools from master overlay
- Simplify dependency management by removing dedicated flake input - Reduce flake.lock complexity by eliminating transitive dependencies - Centralize AI tool versioning through nixpkgs-master overlay Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent 52b4bd7
Changed files (6)
home
common
dev
ai.nix
emacs.nix
overlays
default.nix
systems
default.nix
flake.lock
flake.nix
home/common/dev/ai.nix
@@ -9,8 +9,9 @@
     aichat
     # aider-chat
     goose-cli
-    gemini-cli
-    claude-code
+    master.claude-code
+    master.claude-code-acp
+    master.gemini-cli
     # llm
     # openai-whisper
     # whisper-cpp
@@ -18,8 +19,8 @@
     # python313Packages.google-generativeai
     repomix
     # editors
-    code-cursor
-    cursor-cli
+    master.code-cursor
+    master.cursor-cli
     # inputs.code-cursor-nix.packages.x86_64-linux.cursor
     # mcp-servers
     github-mcp-server
home/common/dev/emacs.nix
@@ -183,7 +183,6 @@ in
     ugrep
     # See if I can hide this under an option
     org-capture
-    # github-copilot-cli # for copilot.el
     nodejs
     ec
     et
overlays/default.nix
@@ -32,6 +32,11 @@
       config.allowUnfree = true;
       overlays = [
         (_final: _prev: {
+          claude-code = _prev.claude-code;
+          claude-code-acp = _prev.claude-code-acp;
+          gemini-cli = _prev.gemini-cli;
+          cursor-cli = _prev.cursor-cli;
+          code-cursor = _prev.code-cursor;
           # example = prev.example.overrideAttrs (oldAttrs: rec {
           # ...
           # });
systems/default.nix
@@ -34,7 +34,6 @@
       inputs.chick-group.overlays.default
       inputs.go-org-readwise.overlays.default
       inputs.agenix.overlays.default
-      inputs.claude-code.overlays.default
 
       # Migrate to "modifications"
       (_: prev: {
flake.lock
@@ -137,27 +137,6 @@
         "type": "github"
       }
     },
-    "claude-code": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1763528496,
-        "narHash": "sha256-bnFRtncEC6/8s+KR+c350nbEKQLcKMo71/sPWxWAyR0=",
-        "owner": "sadjow",
-        "repo": "claude-code-nix",
-        "rev": "f99e592a0acce7ba10346406204113bd6bf98982",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sadjow",
-        "repo": "claude-code-nix",
-        "type": "github"
-      }
-    },
     "copilot-cli": {
       "inputs": {
         "nixpkgs": [
@@ -397,24 +376,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -845,7 +806,6 @@
         "buildkit-tekton": "buildkit-tekton",
         "chapeau-rouge": "chapeau-rouge",
         "chick-group": "chick-group",
-        "claude-code": "claude-code",
         "copilot-cli": "copilot-cli",
         "dagger": "dagger",
         "disko": "disko",
@@ -937,21 +897,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {
flake.nix
@@ -361,9 +361,6 @@
     nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/develop";
     nixos-raspberrypi.inputs.flake-compat.follows = "flake-compat";
 
-    claude-code.url = "github:sadjow/claude-code-nix";
-    claude-code.inputs.nixpkgs.follows = "nixpkgs";
-
     copilot-cli.url = "github:scarisey/copilot-cli-flake";
     copilot-cli.inputs.nixpkgs.follows = "nixpkgs";
   };