agenix -> ragenix

3 files changed, 144 insertions, 14 deletions

diff --git a/flake.lock b/flake.lock
index 1ea4108..6679445 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,7 +4,8 @@
       "inputs": {
         "darwin": "darwin",
         "nixpkgs": [
-          "nixpkgsUnstable"
+          "ragenix",
+          "nixpkgs"
         ]
       },
       "locked": {
@@ -54,9 +55,40 @@
         "type": "github"
       }
     },
+    "crane_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": [
+          "ragenix",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "ragenix",
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "ragenix",
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1681680516,
+        "narHash": "sha256-EB8Adaeg4zgcYDJn9sR6UMjN/OHdIiMMK19+3LmmXQY=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "54b63c8eae4c50172cb50b612946ff1d2bc1c75c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
+          "ragenix",
           "agenix",
           "nixpkgs"
         ]
@@ -92,6 +124,22 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -130,6 +178,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "getchoo": {
       "inputs": {
         "flake-compat": [
@@ -519,9 +585,32 @@
         "type": "github"
       }
     },
-    "root": {
+    "ragenix": {
       "inputs": {
         "agenix": "agenix",
+        "crane": "crane_2",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgsUnstable"
+        ],
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1682237245,
+        "narHash": "sha256-xbBR7LNK+d5Yi/D6FXQGc1R6u2VV2nwr/Df5iaEbOEQ=",
+        "owner": "yaxitech",
+        "repo": "ragenix",
+        "rev": "281f68c3d477904f79ff1cd5807a8c226cd80a50",
+        "type": "github"
+      },
+      "original": {
+        "owner": "yaxitech",
+        "repo": "ragenix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
@@ -539,7 +628,8 @@
         "nixpkgsUnstable": "nixpkgsUnstable",
         "nur": "nur",
         "openwrt-imagebuilder": "openwrt-imagebuilder",
-        "pre-commit-hooks": "pre-commit-hooks"
+        "pre-commit-hooks": "pre-commit-hooks",
+        "ragenix": "ragenix"
       }
     },
     "rust-overlay": {
@@ -567,6 +657,31 @@
         "type": "github"
       }
     },
+    "rust-overlay_2": {
+      "inputs": {
+        "flake-utils": [
+          "ragenix",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "ragenix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1682129965,
+        "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "2c417c0460b788328220120c698630947547ee83",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -581,6 +696,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "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",
diff --git a/flake.nix b/flake.nix
index c7ad4a9..0cb9d9f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,10 +15,6 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-22.11";
     nixpkgsUnstable.url = "nixpkgs/nixos-unstable";
-    agenix = {
-      url = "github:ryantm/agenix";
-      inputs.nixpkgs.follows = "nixpkgsUnstable";
-    };
     # this is just to avoid having multiple versions in flake.lock
     flake-compat = {
       url = "github:edolstra/flake-compat";
@@ -90,19 +86,23 @@
       inputs.flake-compat.follows = "flake-compat";
       inputs.flake-utils.follows = "flake-utils";
     };
+    ragenix = {
+      url = "github:yaxitech/ragenix";
+      inputs.nixpkgs.follows = "nixpkgsUnstable";
+    };
   };
 
   outputs = inputs @ {
     self,
-    agenix,
-    haumea,
+    flake-parts,
     getchoo,
+    haumea,
     hercules-ci-effects,
     nixpkgs,
     nixinate,
     openwrt-imagebuilder,
     pre-commit-hooks,
-    flake-parts,
+    ragenix,
     ...
   }: let
     inherit (getchooLib.configs) mapHMUsers mapHosts;
@@ -200,7 +200,7 @@
             packages = with inputs;
             with pkgs; [
               actionlint
-              agenix.packages.${system}.agenix
+              ragenix.packages.${system}.ragenix
               alejandra
               deadnix
               fzf
diff --git a/hosts/default.nix b/hosts/default.nix
index 41c0bc4..d579dc3 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -5,7 +5,7 @@ with inputs; let
     builder = nixpkgsUnstable.lib.nixosSystem;
 
     modules = [
-      agenix.nixosModules.default
+      ragenix.nixosModules.default
       home-manager.nixosModules.home-manager
       nur.nixosModules.nur
 
@@ -62,7 +62,7 @@ in {
     system = "aarch64-linux";
 
     modules = [
-      agenix.nixosModules.default
+      ragenix.nixosModules.default
       (import "${self}/modules/base")
       (import "${self}/modules/nixos")
       (import "${self}/modules/server")
@@ -91,7 +91,7 @@ in {
     inherit (common) specialArgs system;
 
     modules = [
-      agenix.nixosModules.default
+      ragenix.nixosModules.default
       guzzle_api.nixosModules.guzzle_api
       (import "${self}/modules/base")
       (import "${self}/modules/nixos")