Switching to unstable

flake.lock

@@ -1,26 +1,5 @@
 {
   "nodes": {
-    "claude-code": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1791071338,
-        "narHash": "sha256-YBAFoulgm9qEavWtmb2gHwk7lgpVZL7vtr4+yi6H3UU=",
-        "owner": "sadjow",
-        "repo": "claude-code-nix",
-        "rev": "b17e42820330bd34ab890632c2f6f80daf4e517f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sadjow",
-        "repo": "claude-code-nix",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -28,16 +7,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1790996401,
+        "lastModified": 1791484883,
-        "narHash": "sha256-f+kOxEmOUnQazVAmGg0i8hzwgd1kX/geY+k/Dpheye8=",
+        "narHash": "sha256-iKxFHJrg7Sltwhq3ssCZYQ4CFEDVvReVVuVuO9dj3sE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "db7d5e2332710f5abb088f6b5de927d7f9511b35",
+        "rev": "dfadbe5162d5e86bc0808badec8f346f81b4b3f0",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-26.05",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -64,23 +43,22 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1791143449,
+        "lastModified": 1791456040,
-        "narHash": "sha256-9+n3ReS2y9xS199LoJjKUWHwZrISGHWgkD/LUZTDZyA=",
+        "narHash": "sha256-H83yz/do+hjOO0uujHyH8RgtIQP2v7Mw+cLwcZK/xKc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0d9e9b832d03ac387417e16ce1febf73b2e631e1",
+        "rev": "e7439b6b14ad3cc35d05608ebca9bce01a25f5f8",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-26.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
-        "claude-code": "claude-code",
         "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
@@ -106,21 +84,6 @@
         "repo": "nur-expressions",
         "type": "sourcehut"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -3,14 +3,10 @@
 
   inputs = {
     # Specify the source of Home Manager and Nixpkgs.
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    claude-code = {
-      url = "github:sadjow/claude-code-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-26.05";
+      url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     # kube = {
@@ -33,7 +29,6 @@
     {
       nixpkgs,
       home-manager,
-      claude-code,
       nix-index-database,
       rycee,
       ...
@@ -44,7 +39,6 @@
         import nixpkgs {
           inherit system;
           config.allowUnfree = true;
-          overlays = [ claude-code.overlays.default ];
         }
       );
       modules-for-system =
@@ -230,9 +224,6 @@
 
             programs.emacs.package = pkgs.emacs-pgtk;
           }];
-
-        # extraSpecialArgs = { kube = kube.packages.x86_64-linux.default; };
-        extraSpecialArgs = { claude-code = claude-code.packages.x86_64-linux.default; };
       };
       packages.x86_64-linux.default = modules-for-system nixpkgs.legacyPackages.x86_64-linux;
       packages.aarch64-darwin.default = modules-for-system nixpkgs.legacyPackages.aarch64-darwin;

home.org

@@ -42,7 +42,7 @@ carefully so it doesn't get carried away...
   {
     home.packages = with pkgs; [
       rlwrap
-      (sbcl.withPackages (ps: with ps; [
+      ((sbcl.withPackages (ps: with ps; [
         alexandria
         cl-markup
         cl-mock
@@ -75,7 +75,14 @@ carefully so it doesn't get carried away...
         trivial-open-browser
         trivial-timeout
         uuid
-      ]))
+      ])).overrideAttrs (o: {
+        # Work around nixpkgs' new empty-PATH-segment check in makeWrapper; the
+        # lisp wrapper intentionally uses a trailing `:` (ASDF "inherit config").
+        installPhase = builtins.replaceStrings
+          [ "--prefix CL_SOURCE_REGISTRY :" "--prefix ASDF_OUTPUT_TRANSLATIONS :" ]
+          [ "--set CL_SOURCE_REGISTRY" "--set ASDF_OUTPUT_TRANSLATIONS" ]
+          o.installPhase;
+      }))
     ];
   }
 #+END_SRC
@@ -807,21 +814,6 @@ Actually, nix *really* requires ~bash~. This is a plugin that allows using zsh f
 :END:
 
 #+BEGIN_SRC nix
-  (let gptel = (epkgs: epkgs.melpaBuild {
-        pname = "gptel";
-        version = "0.9.9.6";
-        src = pkgs.fetchFromGitHub {
-          owner = "karthink";
-          repo = "gptel";
-          rev = "v0.9.9.6";
-          sha256 = "sha256-jurm3AQz+NiKZh7ssJkQYP73EmBEoyjzuC4phARYBak=";
-        };
-        recipe = pkgs.writeText "gptel-recipe" ''
-                (gptel :repo "karthink/gptel" :fetcher github)
-              '';
-        packageRequires = [ epkgs.transient ];
-      });
-  in
   {
     programs.claude-code = {
       enable = true;
@@ -847,7 +839,6 @@ Actually, nix *really* requires ~bash~. This is a plugin that allows using zsh f
 
       gptel = {
         enable = true;
-        package = gptel;
         command = ["gptel"];
         bind."C-c g" = "gptel-menu";
         custom = {
@@ -863,27 +854,13 @@ Actually, nix *really* requires ~bash~. This is a plugin that allows using zsh f
 
       gptel-agent = {
         enable = true;
-        package = (epkgs: epkgs.melpaBuild {
-            pname = "gptel-agent";
-            version = "20260823";
-            src = pkgs.fetchFromGitHub {
-              owner = "karthink";
-              repo = "gptel-agent";
-              rev = "326e0abb8c6db0e5c4c421bd9af495932ae94b62";
-              sha256 = "sha256-2eqY1MebzsDOpf3YEHy6o31TbpLA2iIPZMMVrscLYMk=";
-            };
-            recipe = pkgs.writeText "gptel-agent-recipe" ''
-              (gptel-agent :fetcher github :repo "karthink/gptel-agent" :files (:defaults "agents"))
-            '';
-            packageRequires = [ (gptel epkgs) ];
-        });
         after = ["gptel"];
         config = ''
           <<emacs-gptel-agent-config>>
         '';
       };
     };
-  })
+  }
 #+END_SRC
 
 #+BEGIN_SRC elisp :tangle no :noweb-ref emacs-gptel-config