wip

flake.lock

@@ -25,16 +25,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1768949235,
+        "lastModified": 1779969295,
-        "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
+        "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
+        "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
+        "ref": "master",
         "repo": "home-manager",
         "type": "github"
       }
@@ -58,18 +58,38 @@
         "url": "https://gitea.home-frikker.dedyn.io/jfrikker/kube/archive/1.0.1.tar.gz"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779604987,
+        "narHash": "sha256-ZQ5z+fVhxYKtIFwtqGp5O0PD84BM1riASvqDaN5Xs+s=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "8fba98c80b48fa013820e0163c5096922fea4ddd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769318308,
+        "lastModified": 1779560665,
-        "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=",
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -93,6 +113,7 @@
       "inputs": {
         "home-manager": "home-manager",
         "kube": "kube",
+        "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs"
       }
     }

flake.nix

@@ -3,18 +3,23 @@
 
   inputs = {
     # Specify the source of Home Manager and Nixpkgs.
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      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";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { nixpkgs, home-manager, kube, ... }:
+  outputs = { nixpkgs, home-manager, kube, nix-index-database, ... }:
     let modules-for-system = pkgs: pkgs.stdenv.mkDerivation {
           name = "home-manager-modules";
           src = pkgs.lib.fileset.toSource {
@@ -37,20 +42,22 @@
         };
     in {
       homeConfigurations.shibumi =
-        let pkgs = nixpkgs.legacyPackages.aarch64-darwin;
+        let pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; };
             modules = modules-for-system pkgs;
         in home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           
           modules =
-            (pkgs.lib.filter 
+            [
-              (n: pkgs.lib.strings.hasSuffix ".nix" n)
+              nix-index-database.homeModules.default
-              (pkgs.lib.filesystem.listFilesRecursive modules)) ++
+              "${modules}"
+            ] ++
             [{
               home.stateVersion = "22.05";
               home.username = "jfrikker";
               home.homeDirectory = "/Users/jfrikker";
               home.packages = [ pkgs.pinentry_mac ];
+              jfrikker.desktop.enable = true;
             }];
 
           extraSpecialArgs = { kube = kube.packages.aarch64-darwin.default; };
@@ -62,13 +69,16 @@
           inherit pkgs;
           
           modules = [
-            "${modules}/home.nix"
+            nix-index-database.homeModules.default
-            {
+          ] ++
-              home.stateVersion = "22.05";
+          (pkgs.lib.filter 
-              home.username = "jfrikker";
+            (n: pkgs.lib.strings.hasSuffix ".nix" n)
-              home.homeDirectory = "/home/jfrikker";
+            (pkgs.lib.filesystem.listFilesRecursive "${modules}/base")) ++
-            }
+          [{
-          ];
+            home.stateVersion = "22.05";
+            home.username = "jfrikker";
+            home.homeDirectory = "/home/jfrikker";
+          }];
 
           extraSpecialArgs = { kube = kube.packages.x86_64-linux.default; };
         };