1 files changed, 26 insertions, 35 deletions

diff --git a/flake.nix b/flake.nix
index d48b4df..813d9cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,102 +5,93 @@
     extra-substituters = [
       "https://getchoo.cachix.org" # personal cache
       "https://nix-community.cachix.org" # nix-community
-      "https://hercules-ci.cachix.org" # hercules-ci
       "https://wurzelpfropf.cachix.org" # ragenix
     ];
     extra-trusted-public-keys = [
       "getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
       "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
     ];
   };
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-22.11";
-    nixpkgsUnstable.url = "nixpkgs/nixos-unstable";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "nixpkgs/nixos-22.11";
+
+    # this is just to avoid having multiple versions in flake.lock
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
     };
-    # this is just to avoid having multiple versions in flake.lock
     flake-utils.url = "github:numtide/flake-utils";
+
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgsUnstable";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
     };
+
     getchoo = {
-      url = "github:getchoo/overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:getchoo/nix-exprs";
       inputs.flake-compat.follows = "flake-compat";
     };
+
     guzzle_api = {
       url = "github:getchoo/guzzle_api";
-      inputs.nixpkgs.follows = "nixpkgsUnstable";
       inputs.pre-commit-hooks.follows = "pre-commit-hooks";
     };
-    hercules-ci-agent = {
-      url = "github:hercules-ci/hercules-ci-agent";
-      inputs.flake-parts.follows = "flake-parts";
-      inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks";
-    };
-    hercules-ci-effects = {
-      url = "github:hercules-ci/hercules-ci-effects";
-      inputs.nixpkgs.follows = "nixpkgsUnstable";
-      inputs.flake-parts.follows = "flake-parts";
-      inputs.hercules-ci-agent.follows = "hercules-ci-agent";
-    };
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     lanzaboote = {
       url = "github:nix-community/lanzaboote";
-      inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-compat.follows = "flake-compat";
       inputs.flake-utils.follows = "flake-utils";
-      inputs.flake-parts.follows = "flake-parts";
       inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks";
     };
+
     nixinate = {
       url = "github:MatthewCroughan/nixinate";
-      inputs.nixpkgs.follows = "nixpkgsUnstable";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
+
     nixos-wsl = {
       url = "github:nix-community/NixOS-WSL/main";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-compat.follows = "flake-compat";
       inputs.flake-utils.follows = "flake-utils";
     };
+
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nur.url = "github:nix-community/NUR";
+
     openwrt-imagebuilder = {
       url = "github:astro/nix-openwrt-imagebuilder";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     pre-commit-hooks = {
       url = "github:cachix/pre-commit-hooks.nix";
-      inputs.nixpkgs.follows = "nixpkgsUnstable";
+      inputs.nixpkgs.follows = "nixpkgs";
       inputs.nixpkgs-stable.follows = "nixpkgs";
       inputs.flake-compat.follows = "flake-compat";
       inputs.flake-utils.follows = "flake-utils";
     };
-    ragenix = {
-      url = "github:yaxitech/ragenix";
-      inputs.nixpkgs.follows = "nixpkgsUnstable";
-    };
+
+    ragenix.url = "github:yaxitech/ragenix";
   };
 
-  outputs = inputs: let
-    inherit (inputs) getchoo;
-    inherit (inputs.flake-parts.lib) mkFlake;
-  in
-    mkFlake {inherit inputs;} {
+  outputs = inputs:
+    inputs.flake-parts.lib.mkFlake
+    {inherit inputs;}
+    {
       imports = [
         ./hosts
-        ./users
         ./modules/flake
-        getchoo.flakeModules.homeConfigurations
+        ./users
+        inputs.getchoo.flakeModules.default
       ];
     };
 }