2 files changed, 34 insertions, 14 deletions

diff --git a/flakes/lib/flake.lock b/flakes/lib/flake.lock
index 3ca158e..ca5d027 100644
--- a/flakes/lib/flake.lock
+++ b/flakes/lib/flake.lock
@@ -4,20 +4,20 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
+        "nix-github-actions": "nix-github-actions",
         "nixpkgs": "nixpkgs",
         "stable": "stable"
       },
       "locked": {
-        "lastModified": 1687954574,
-        "narHash": "sha256-YasVTaNXq2xqZdejyIhuyqvNypmx+K/Y1ZZ4+raeeII=",
-        "owner": "immae",
+        "lastModified": 1739900653,
+        "narHash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=",
+        "owner": "zhaofengli",
         "repo": "colmena",
-        "rev": "e427171150a35e23204c4c15a2483358d22a0eff",
+        "rev": "2370d4336eda2a9ef29fce10fa7076ae011983ab",
         "type": "github"
       },
       "original": {
-        "owner": "immae",
-        "ref": "add-lib-get-flake",
+        "owner": "zhaofengli",
         "repo": "colmena",
         "type": "github"
       }
@@ -89,6 +89,27 @@
         "type": "github"
       }
     },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "colmena",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737420293,
+        "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
     "nixos-2305": {
       "locked": {
         "lastModified": 1687938137,
@@ -249,16 +270,16 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1669735802,
-        "narHash": "sha256-qtG/o/i5ZWZLmXw108N2aPiVsxOcidpHJYNkT45ry9Q=",
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "731cc710aeebecbf45a258e977e8b68350549522",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flakes/lib/flake.nix b/flakes/lib/flake.nix
index 5b78fb6..b5bd7ee 100644
--- a/flakes/lib/flake.nix
+++ b/flakes/lib/flake.nix
@@ -2,8 +2,7 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs";
   inputs.flake-parts.url = "github:hercules-ci/flake-parts";
   inputs.disko.url = "github:nix-community/disko";
-  # replace with zhaofengli/colmena once https://github.com/zhaofengli/colmena/pull/161 is merged
-  inputs.colmena.url = "github:immae/colmena/add-lib-get-flake";
+  inputs.colmena.url = "github:zhaofengli/colmena";
   inputs.nixos-anywhere.url = "github:numtide/nixos-anywhere";
   inputs.nixos-anywhere.inputs.disko.follows = "disko";
   inputs.nixos-anywhere.inputs.flake-parts.follows = "flake-parts";
@@ -45,11 +44,11 @@
 
           };
           flake = {
-            nixosConfigurations.${name} = (colmena.lib.fromRawFlake self).nodes.${name};
+            nixosConfigurations.${name} = (colmena.lib.makeHive self.outputs.colmena).nodes.${name};
             nixosConfigurations."${name}WithEncryption" = let
               selfWithEncryption = nixpkgs.lib.recursiveUpdate self { outputs.colmena.meta.specialArgs.cryptKeyFile = "/run/decrypt-key"; };
             in
-              (colmena.lib.fromRawFlake selfWithEncryption).nodes.${name};
+              (colmena.lib.makeHive selfWithEncryption.outputs.colmena).nodes.${name};
             colmena = {
               meta.nixpkgs = nixpkgs.legacyPackages.${system};
               meta.specialArgs = moduleArgs;