Aligning home manager and nixpkgs versions

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1787169825,
-        "narHash": "sha256-3MmWHAzeoFHfwjUCQC01olBN+MC4xoSuR7D0bpPr+EE=",
+        "lastModified": 1789074092,
+        "narHash": "sha256-QCXTUbd4FuwOHO7LgJws78YTRcco4xgR8RoYgKLvd9w=",
         "owner": "sadjow",
         "repo": "claude-code-nix",
-        "rev": "f575914388682670df73e80c9caf82063b659699",
+        "rev": "1f88b393ac054378c393f914dc83d08a6ef5daeb",
         "type": "github"
       },
       "original": {
@@ -28,16 +28,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1787176219,
-        "narHash": "sha256-djoRr6jBpe35q/0JwAvXpFXg1Ktf+X54NU2RLR7wnHw=",
+        "lastModified": 1789267039,
+        "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c53d643b3737e2fcd04e6cb3b3580ef50b2087a0",
+        "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-26.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -49,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786852476,
-        "narHash": "sha256-IM5CYtf86W4w8eUPpKcY/LpdHElmVBtJhaKnoTKxZEA=",
+        "lastModified": 1788680125,
+        "narHash": "sha256-amGSoDobwmp4CFvCn841ws2iuitus+HUJdD/gKgsrJA=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "c7962dc97b45129df8d751bedaf37beb5a17706e",
+        "rev": "116ad1c2adb642405ef8916f6a94c8626f971344",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787101114,
-        "narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=",
+        "lastModified": 1789009968,
+        "narHash": "sha256-GB16oaxpsrnGNnGIE+0uYBqMRzB9X6FYDUvjvnJAYew=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b18a4b905f8d028dc4476412e6d6891728695379",
+        "rev": "d58a46e3bc02d91ebe04667f8397752a749c0024",
         "type": "github"
       },
       "original": {

flake.nix

@@ -8,9 +8,9 @@
       url = "github:sadjow/claude-code-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    
+
     home-manager = {
-      url = "github:nix-community/home-manager/master";
+      url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     # kube = {
@@ -24,8 +24,18 @@
     };
   };
 
-  outputs = { nixpkgs, home-manager, claude-code, 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 = ./.;
@@ -33,62 +43,149 @@
               ./home.org
             ];
           };
-          
+
           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 {
+    in
+    {
       homeConfigurations.redbook =
-        let pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; };
-            modules = modules-for-system pkgs;
-        in home-manager.lib.homeManagerConfiguration {
+        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}/redbook.nix"
-              "${modules}/redbook-desktop.nix"
-            ] ++
-            [{
+
+          modules = [
+            nix-index-database.homeModules.default
+            "${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 = { claude-code = claude-code.packages.aarch64-darwin.default; };
+          extraSpecialArgs = {
+            claude-code = claude-code.packages.aarch64-darwin.default;
+          };
         };
       homeConfigurations.home =
-        let pkgs = nixpkgs.legacyPackages.x86_64-linux;
-            modules = modules-for-system pkgs;
-        in home-manager.lib.homeManagerConfiguration {
+        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
-          ] ++
-          (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 = "/home/jfrikker";
+              jfrikker.enable = true;
+            }
+          ];
 
-          extraSpecialArgs = { claude-code = claude-code.packages.x86_64-linux.default; };
+          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;
     };
 }