Aligning home manager and nixpkgs versions

flake.lock

@@ -1,20 +1,23 @@
 {
   "nodes": {
-    "flake-parts": {
+    "claude-code": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1765835352,
-        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "lastModified": 1789074092,
+        "narHash": "sha256-QCXTUbd4FuwOHO7LgJws78YTRcco4xgR8RoYgKLvd9w=",
+        "owner": "sadjow",
+        "repo": "claude-code-nix",
+        "rev": "1f88b393ac054378c393f914dc83d08a6ef5daeb",
         "type": "github"
       },
       "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
+        "owner": "sadjow",
+        "repo": "claude-code-nix",
         "type": "github"
       }
     },
@@ -25,39 +28,20 @@
         ]
       },
       "locked": {
-        "lastModified": 1779969295,
-        "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
+        "lastModified": 1789267039,
+        "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
+        "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-26.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
-    "kube": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1767247330,
-        "narHash": "sha256-CxXwzmvAOO07719jzE0Zw14C9r3fQcXfPllLtt5cIzo=",
-        "rev": "4a4d79a290c92de630e503f395fc8fd709904c1b",
-        "type": "tarball",
-        "url": "https://gitea.home-frikker.dedyn.io/api/v1/repos/jfrikker/kube/archive/4a4d79a290c92de630e503f395fc8fd709904c1b.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz"
-      }
-    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -65,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779604987,
-        "narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=",
+        "lastModified": 1788680125,
+        "narHash": "sha256-amGSoDobwmp4CFvCn841ws2iuitus+HUJdD/gKgsrJA=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "8fba98c80b48fa013820e0163c5096922fea4ddd",
+        "rev": "116ad1c2adb642405ef8916f6a94c8626f971344",
         "type": "github"
       },
       "original": {
@@ -80,42 +64,42 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
+        "lastModified": 1789009968,
+        "narHash": "sha256-GB16oaxpsrnGNnGIE+0uYBqMRzB9X6FYDUvjvnJAYew=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
+        "rev": "d58a46e3bc02d91ebe04667f8397752a749c0024",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1765674936,
-        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
+        "claude-code": "claude-code",
         "home-manager": "home-manager",
-        "kube": "kube",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs"
       }
+    },
+    "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,15 +3,20 @@
 
   inputs = {
     # Specify the source of Home Manager and Nixpkgs.
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
+    claude-code = {
+      url = "github:sadjow/claude-code-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     home-manager = {
-      url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    kube = {
-      url = "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz";
+      url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    # kube = {
+    #   url = "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
 
     nix-index-database = {
       url = "github:nix-community/nix-index-database";
@@ -19,8 +24,18 @@
     };
   };
 
-  outputs = { nixpkgs, home-manager, kube, nix-index-database, ... }:
-    let modules-for-system = pkgs: pkgs.stdenv.mkDerivation {
+  outputs =
+    {
+      nixpkgs,
+      home-manager,
+      claude-code,
+      nix-index-database,
+      ...
+    }:
+    let
+      modules-for-system =
+        pkgs:
+        pkgs.stdenv.mkDerivation {
           name = "home-manager-modules";
           src = pkgs.lib.fileset.toSource {
             root = ./.;
@@ -30,60 +45,147 @@
           };
 
           buildPhase = ''
-              runHook preBuild
-              ${pkgs.emacs}/bin/emacs --batch --eval "(require 'org)" --eval '(org-babel-tangle-file "home.org")'
-              runHook postBuild
-            '';
+            runHook preBuild
+            ${pkgs.emacs}/bin/emacs --batch --eval "(require 'org)" --eval '(org-babel-tangle-file "home.org")'
+            runHook postBuild
+          '';
           installPhase = ''
-              runHook preInstall
-              cp -R target $out
-              runHook postInstall
-            '';
+            runHook preInstall
+            cp -R target $out
+            runHook postInstall
+          '';
         };
-    in {
-      homeConfigurations.shibumi =
-        let pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; };
-            modules = modules-for-system pkgs;
-        in home-manager.lib.homeManagerConfiguration {
-          inherit pkgs;
-          
-          modules =
-            [
-              nix-index-database.homeModules.default
-              "${modules}/base.nix"
-              "${modules}/desktop.nix"
-              "${modules}/shibumi.nix"
-              "${modules}/shibumi-desktop.nix"
-            ] ++
-            [{
-              home.stateVersion = "22.05";
-              home.username = "jfrikker";
-              home.homeDirectory = "/Users/jfrikker";
-              home.packages = [ pkgs.pinentry_mac ];
-            }];
-
-          extraSpecialArgs = { kube = kube.packages.aarch64-darwin.default; };
-        };
-      homeConfigurations.home =
-        let pkgs = nixpkgs.legacyPackages.x86_64-linux;
-            modules = modules-for-system pkgs;
-        in home-manager.lib.homeManagerConfiguration {
+    in
+    {
+      homeConfigurations.redbook =
+        let
+          pkgs = import nixpkgs {
+            system = "aarch64-darwin";
+            config.allowUnfree = true;
+          };
+          modules = modules-for-system pkgs;
+        in
+        home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
 
           modules = [
             nix-index-database.homeModules.default
-          ] ++
-          (pkgs.lib.filter 
-            (n: pkgs.lib.strings.hasSuffix ".nix" n)
-            (pkgs.lib.filesystem.listFilesRecursive "${modules}/base")) ++
-          [{
-            home.stateVersion = "22.05";
-            home.username = "jfrikker";
-            home.homeDirectory = "/home/jfrikker";
-          }];
+            "${modules}"
+          ]
+          ++ [
+            {
+              home.stateVersion = "22.05";
+              home.username = "jfrikker";
+              home.homeDirectory = "/Users/jfrikker";
+              home.packages = [ pkgs.pinentry_mac ];
+              jfrikker.enable = true;
+              jfrikker.desktop.enable = true;
+              jfrikker.redbook.enable = true;
+            }
+          ];
 
-          extraSpecialArgs = { kube = kube.packages.x86_64-linux.default; };
+          extraSpecialArgs = {
+            claude-code = claude-code.packages.aarch64-darwin.default;
+          };
         };
+      homeConfigurations.home =
+        let
+          pkgs = import nixpkgs {
+            system = "x86_64-linux";
+            config.allowUnfree = true;
+          };
+          modules = modules-for-system pkgs;
+        in
+        home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+
+          modules = [
+            nix-index-database.homeModules.default
+            "${modules}"
+          ]
+          ++ [
+            {
+              home.stateVersion = "22.05";
+              home.username = "jfrikker";
+              home.homeDirectory = "/home/jfrikker";
+              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;
+          };
+          modules = modules-for-system pkgs;
+        in
+        home-manager.lib.homeManagerConfiguration {
+          inherit pkgs;
+
+          modules = [
+            nix-index-database.homeModules.default
+            "${modules}"
+          ]
+          ++ [
+            {
+              home.stateVersion = "22.05";
+              home.username = "jfrikker";
+              home.homeDirectory = "/home/jfrikker";
+              # home.packages = [ pkgs.pinentry ];
+              jfrikker.enable = true;
+              jfrikker.desktop.enable = true;
+
+              programs.ghostty = {
+                enable = true;
+                settings = {
+                  font-family = "Iosevka Term Extended";
+                  font-size = 10;
+                };
+              };
+
+              programs.foot = {
+                enable = true;
+                settings = {
+                  main = {
+                    font = "Iosevka Term:size=10:width=expanded";
+                  };
+                };
+              };
+
+              home.pointerCursor = {
+                enable = true;
+                package = pkgs.vanilla-dmz;
+                name = "Vanilla-DMZ";
+                sway.enable = true;
+                gtk.enable = true;
+              };
+
+              wayland.windowManager.sway = {
+                enable = true;
+                config.modifier = "Mod4";
+                # config.terminal = "${pkgs.ghostty}/bin/ghostty";
+                config.input = {
+                  "1452:628:bcm5974" = {
+                    scroll_factor = "0.4";
+                  };
+                };
+              };
+
+              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;
     };
 }