Switch to claude code overlay

flake.nix

@@ -33,6 +33,14 @@
       ...
     }:
     let
+      pkgs-for-system = (
+        system:
+        import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+          overlays = [ claude-code.overlays.default ];
+        }
+      );
       modules-for-system =
         pkgs:
         pkgs.stdenv.mkDerivation {
@@ -59,10 +67,7 @@
     {
       homeConfigurations.redbook =
         let
-          pkgs = import nixpkgs {
-            system = "aarch64-darwin";
-            config.allowUnfree = true;
-          };
+          pkgs = pkgs-for-system "aarch64-darwin";
           modules = modules-for-system pkgs;
         in
         home-manager.lib.homeManagerConfiguration {
@@ -83,17 +88,10 @@
               jfrikker.redbook.enable = true;
             }
           ];
-
-          extraSpecialArgs = {
-            claude-code = claude-code.packages.aarch64-darwin.default;
-          };
         };
       homeConfigurations.home =
         let
-          pkgs = import nixpkgs {
-            system = "x86_64-linux";
-            config.allowUnfree = true;
-          };
+          pkgs = pkgs-for-system "x86_64-linux";
           modules = modules-for-system pkgs;
         in
         home-manager.lib.homeManagerConfiguration {
@@ -111,17 +109,10 @@
               jfrikker.enable = true;
             }
           ];
-
-          extraSpecialArgs = {
-            claude-code = claude-code.packages.x86_64-linux.default;
-          };
         };
       homeConfigurations.home-laptop =
         let
-          pkgs = import nixpkgs {
-            system = "x86_64-linux";
-            config.allowUnfree = true;
-          };
+          pkgs = pkgs-for-system "x86_64-linux";
           modules = modules-for-system pkgs;
         in
         home-manager.lib.homeManagerConfiguration {
@@ -181,9 +172,6 @@
           ];
 
           # 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

@@ -2,7 +2,7 @@
 #+PROPERTY: header-args:elisp :lexical t
 * Categories
 #+begin_src nix :tangle target/default.nix
-  {lib, pkgs, config, claude-code, ...}: let
+  {lib, pkgs, config, ...}: let
     inherit (lib)
       mkIf
       mkMerge
@@ -781,7 +781,6 @@ Actually, nix *really* requires ~bash~. This is a plugin that allows using zsh f
   {
     programs.claude-code = {
       enable = true;
-      package = claude-code;
     };
   }
 #+END_SRC
@@ -977,6 +976,7 @@ repeats set up that only apply in that mode.
 Let's unbind some builtin keys that I don't use. I'm not sure if I'll replace them with anything or not, but at a minimum it'll avoid accidental keypresses and clean up which-key output.
 
 #+begin_src elisp
+  (require 'bind-key)
   (unbind-key "C-x RET")
   (unbind-key "C-x #")
   (unbind-key "C-x 5")
@@ -1013,7 +1013,7 @@ Ligature mode combines character sequences like <= into a single on-screen glyph
 cool, so I'm turning it on in prog mode. The enabled ligatures are font-specific, taken from [[https://github.com/mickeynp/ligature.el/wiki#jetbrains-mono][the
 ligature wiki]].
 
-#+BEGIN_SRC elisp
+#+BEGIN_SRC elisp :noweb no
   (ligature-set-ligatures 'prog-mode 
                           '("--" "---" "==" "===" "!=" "!==" "=!="
                             "=:=" "=/=" "<=" ">=" "&&" "&&&" "&=" "++" "+++" "***" ";;" "!!"
@@ -2303,29 +2303,23 @@ I like Catppuccin Frappe as my theme. Let's use it in as many places as we can.
 #+END_SRC
 
 ** Emacs
-:PROPERTIES:
-:header-args:elisp: :tangle target/emacs.el
-:END:
-
 #+BEGIN_SRC nix
   {
     programs.emacs = {
       extraPackages = epkgs: with epkgs; [
         catppuccin-theme
       ];
-      extraConfig = "(defvar my-base-font-size ${if pkgs.stdenv.isDarwin then "130" else "100"})";
+      extraConfig = ''(defvar my-base-font-size ${if pkgs.stdenv.isDarwin then "130" else "100"})
+    (require 'catppuccin-theme)
+    (setopt catppuccin-flavor 'frappe)
+    (load-theme 'catppuccin :no-confirm)
+
+    ;; (set-face-attribute 'default nil :font "JetBrainsMono Nerd Font" :height 130)
+    ;; (set-face-attribute 'fixed-pitch nil :font "JetBrainsMono Nerd Font" :height 130)
+    (set-face-attribute 'default nil :font "Iosevka Term SS14" :height my-base-font-size)
+    (set-face-attribute 'fixed-pitch nil :font "Iosevka Term SS14" :height my-base-font-size)
+    (set-face-attribute 'variable-pitch nil :font "Iosevka Etoile" :height my-base-font-size)
+  '';
     };
   }
 #+END_SRC
-
-#+BEGIN_SRC elisp
-  (require 'catppuccin-theme)
-  (setopt catppuccin-flavor 'frappe)
-  (load-theme 'catppuccin :no-confirm)
-
-  ;; (set-face-attribute 'default nil :font "JetBrainsMono Nerd Font" :height 130)
-  ;; (set-face-attribute 'fixed-pitch nil :font "JetBrainsMono Nerd Font" :height 130)
-  (set-face-attribute 'default nil :font "Iosevka Term SS14" :height my-base-font-size)
-  (set-face-attribute 'fixed-pitch nil :font "Iosevka Term SS14" :height my-base-font-size)
-  (set-face-attribute 'variable-pitch nil :font "Iosevka Etoile" :height my-base-font-size)
-#+END_SRC