diff --git a/configurations/home/srid@zest.nix b/configurations/home/srid@zest.nix index 91aba5a..f5f11c1 100644 --- a/configurations/home/srid@zest.nix +++ b/configurations/home/srid@zest.nix @@ -9,7 +9,7 @@ in flake.inputs.self.homeModules.default flake.inputs.self.homeModules.darwin-only "${homeMod}/gui/1password.nix" - # "${homeMod}/claude-code" + "${homeMod}/claude-code" "${homeMod}/work/juspay.nix" diff --git a/flake.lock b/flake.lock index b771396..074592c 100644 --- a/flake.lock +++ b/flake.lock @@ -61,7 +61,10 @@ "nix-ai-tools", "nixpkgs" ], - "systems": "systems_3" + "systems": [ + "nix-ai-tools", + "systems" + ] }, "locked": { "lastModified": 1771437256, @@ -77,6 +80,40 @@ "type": "github" } }, + "bun2nix": { + "inputs": { + "flake-parts": [ + "nix-ai-tools", + "flake-parts" + ], + "import-tree": "import-tree", + "nixpkgs": [ + "nix-ai-tools", + "nixpkgs" + ], + "systems": [ + "nix-ai-tools", + "systems" + ], + "treefmt-nix": [ + "nix-ai-tools", + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1770895533, + "narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=", + "owner": "nix-community", + "repo": "bun2nix", + "rev": "c843f477b15f51151f8c6bcc886954699440a6e1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "bun2nix", + "type": "github" + } + }, "co-log-effectful": { "flake": false, "locked": { @@ -177,11 +214,11 @@ "devour-flake": { "flake": false, "locked": { - "lastModified": 1761148089, - "narHash": "sha256-Cd9aWk4P2VGYrK2X28D3vVub2kQIaba7tCTVg+G0AII=", + "lastModified": 1770055559, + "narHash": "sha256-peb6VlxIDoqaHkGPanQ35p8SXy9t54NIJ8XJHgMSuFg=", "owner": "srid", "repo": "devour-flake", - "rev": "03d5d9112a79aa6ef80495b325fd015d806b98eb", + "rev": "e65d15fd4ef46dbde90ac59be581b2a286c35d0f", "type": "github" }, "original": { @@ -377,6 +414,27 @@ } }, "flake-parts_5": { + "inputs": { + "nixpkgs-lib": [ + "nix-ai-tools", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -397,7 +455,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "vira", @@ -736,6 +794,21 @@ "type": "github" } }, + "import-tree": { + "locked": { + "lastModified": 1763762820, + "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=", + "owner": "vic", + "repo": "import-tree", + "rev": "3c23749d8013ec6daa1d7255057590e9ca726646", + "type": "github" + }, + "original": { + "owner": "vic", + "repo": "import-tree", + "type": "github" + } + }, "jumphost-nix": { "flake": false, "locked": { @@ -750,15 +823,16 @@ }, "landrun-nix": { "locked": { - "lastModified": 1762803344, - "narHash": "sha256-HRQe5Umj8+U+euoqlL/Z4DqrKGF/EuglbD0zPNf9dPs=", - "owner": "srid", + "lastModified": 1772789454, + "narHash": "sha256-rKYiBL0KOtMfkgJCGxsICCvXLsqj/dzsF5seimW3edA=", + "owner": "adrian-gierakowski", "repo": "landrun-nix", - "rev": "e3811659e279d92104a1de82e94877f870065696", + "rev": "664d588939df5f6d7be80c99175decf7ee5de498", "type": "github" }, "original": { - "owner": "srid", + "owner": "adrian-gierakowski", + "ref": "darwin-implementation-via-sandbox-exec", "repo": "landrun-nix", "type": "github" } @@ -799,22 +873,23 @@ "nix-ai-tools": { "inputs": { "blueprint": "blueprint", - "nixpkgs": [ - "nixpkgs" - ], + "bun2nix": "bun2nix", + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_4", + "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1771627137, - "narHash": "sha256-KS5RwfY5jYxfUSEk7Rm9GJE95nKnBT4l9gTAB48nD2Q=", + "lastModified": 1772801106, + "narHash": "sha256-GC2p++UMNTLMFs5KnuJCXGm9PwgzXz/RMtRBDP8Y4nc=", "owner": "numtide", - "repo": "nix-ai-tools", - "rev": "cc09466a29eafbb98e014a9c700074512f869821", + "repo": "llm-agents.nix", + "rev": "96ad1f1a0d38b62403202dba08f7a5f890ab244a", "type": "github" }, "original": { "owner": "numtide", - "repo": "nix-ai-tools", + "repo": "llm-agents.nix", "type": "github" } }, @@ -953,7 +1028,7 @@ "nixos-vscode-server": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1684517665, @@ -1030,6 +1105,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1772674223, + "narHash": "sha256-/suKbHSaSmuC9UY7G0VRQ3aO+QKqxAQPQ19wG7QNkF8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "66d9241e3dc2296726dc522e62dbfe89c7b449f3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1682526928, "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", @@ -1042,7 +1133,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1771419570, "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=", @@ -1058,7 +1149,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1765803225, "narHash": "sha256-xwaZV/UgJ04+ixbZZfoDE8IsOWjtvQZICh9aamzPnrg=", @@ -1076,7 +1167,7 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "nixpkgs": [ "nixpkgs" ], @@ -1162,7 +1253,7 @@ "nixos-hardware": "nixos-hardware", "nixos-unified": "nixos-unified_2", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", "vira": "vira" } @@ -1327,11 +1418,11 @@ ] }, "locked": { - "lastModified": 1770228511, - "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", "type": "github" }, "original": { @@ -1377,7 +1468,7 @@ "inputs": { "co-log-effectful": "co-log-effectful", "devour-flake": "devour-flake", - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_7", "fourmolu-nix": "fourmolu-nix_3", "git-hooks": "git-hooks_5", "haskell-flake": "haskell-flake_3", @@ -1387,7 +1478,7 @@ "nix-serve-ng": "nix-serve-ng", "nix-systems": "nix-systems", "nixos-unified": "nixos-unified_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "process-compose-flake": "process-compose-flake_2", "record-hasfield": "record-hasfield", "servant-event-stream": "servant-event-stream", @@ -1395,16 +1486,15 @@ "warp-tls-simple": "warp-tls-simple" }, "locked": { - "lastModified": 1772463598, - "narHash": "sha256-cXy69YIjZ+4pPanmctn+ReHhUEtY+GJXihcEYkAt7gM=", + "lastModified": 1772585334, + "narHash": "sha256-PQMgtlst98me4JSJarU1R+HMQDqxIf/AzJg/mm0eSa8=", "owner": "juspay", "repo": "vira", - "rev": "83e78a8d0530de7f8468ea546764d50c7328de7c", + "rev": "858ab06405097224f6841450c323f6bff21e62be", "type": "github" }, "original": { "owner": "juspay", - "ref": "github", "repo": "vira", "type": "github" } diff --git a/flake.nix b/flake.nix index a7e2f18..c357c7e 100644 --- a/flake.nix +++ b/flake.nix @@ -29,10 +29,12 @@ nixos-vscode-server.url = "github:nix-community/nixos-vscode-server"; nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - vira.url = "github:juspay/vira/github"; - nix-ai-tools.url = "github:numtide/nix-ai-tools"; - nix-ai-tools.inputs.nixpkgs.follows = "nixpkgs"; - landrun-nix.url = "github:srid/landrun-nix"; + # vira.url = "github:juspay/vira/github"; + vira.url = "github:juspay/vira"; + nix-ai-tools.url = "github:numtide/llm-agents.nix"; + # nix-ai-tools.inputs.nixpkgs.follows = "nixpkgs"; + # landrun-nix.url = "github:srid/landrun-nix"; + landrun-nix.url = "github:adrian-gierakowski/landrun-nix/darwin-implementation-via-sandbox-exec"; AI.url = "path:vendor/AI"; AI.flake = false; jumphost-nix.url = "path:vendor/jumphost-nix"; diff --git a/modules/flake-parts/claude-sandboxed.nix b/modules/flake-parts/claude-sandboxed.nix index 9da672e..89de66b 100644 --- a/modules/flake-parts/claude-sandboxed.nix +++ b/modules/flake-parts/claude-sandboxed.nix @@ -6,8 +6,8 @@ in { imports = [ landrun-nix.flakeModule ]; - perSystem = { pkgs, system, lib, ... }: { - landrunApps.claude = lib.mkIf (lib.hasInfix "linux" system) { + perSystem = { pkgs, ... }: { + landrunApps.claude = { program = "${pkgs.claude-code}/bin/claude"; imports = [ landrunModules.gh @@ -34,6 +34,7 @@ in "ANTHROPIC_MODEL" "ANTHROPIC_API_KEY" "ANTHROPIC_BASE_URL" + "CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS" ]; }; }; diff --git a/modules/home/claude-code/default.nix b/modules/home/claude-code/default.nix index d27226d..b5e6413 100644 --- a/modules/home/claude-code/default.nix +++ b/modules/home/claude-code/default.nix @@ -16,11 +16,8 @@ in programs.claude-code = { enable = true; - # Use sandboxed version on Linux, plain version on macOS - package = - if pkgs.stdenv.isLinux - then flake.inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.claude # see claude-sandboxed.nix - else pkgs.claude-code; + # Use sandboxed version + package = flake.inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.claude; # see claude-sandboxed.nix # Set the claude-code directory for auto-wiring autoWire.dir = AI;