From 37401a5e83c0d44296188f9b3079a95a0a9651ae Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Sun, 31 Jul 2022 20:52:23 +0200
Subject: [PATCH] meta: more follows

---
 flake.nix | 96 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 78 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index e1cfe66..babe002 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,33 +9,93 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05-small";
 
-    nix-super.url = "gitlab:max/nix-super-fork?host=git.privatevoid.net";
+    nix-super = {
+      url = "gitlab:max/nix-super-fork?host=git.privatevoid.net";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    home-manager.url = "github:nix-community/home-manager/master";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager = {
+      url = "github:nix-community/home-manager/master";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-compat.follows = "repin-flake-compat";
+        utils.follows = "repin-flake-utils";
+      };
+    };
 
-    deploy-rs.url = "gitlab:max/deploy-rs?host=git.privatevoid.net";
+    deploy-rs = {
+      url = "gitlab:max/deploy-rs?host=git.privatevoid.net";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-compat.follows = "repin-flake-compat";
+        utils.follows = "repin-flake-utils";
+      };
+    };
 
-    agenix.url = "github:ryantm/agenix";
-    agenix.inputs.nixpkgs.follows = "nixpkgs";
+    agenix = {
+      url = "github:ryantm/agenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    nar-serve.url = "github:numtide/nar-serve/v0.5.0";
-    nar-serve.inputs.nixpkgs.follows = "nixpkgs";
+    nar-serve = {
+      url = "github:numtide/nar-serve/v0.5.0";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "repin-flake-utils";
+      };
+    };
 
-    dream2nix.url = "github:nix-community/dream2nix";
-    dream2nix.inputs.nixpkgs.follows = "nixpkgs";
+    dream2nix = {
+      url = "github:nix-community/dream2nix";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        #alejandra.inputs.flakeCompat.follows = "repin-flake-compat";
+        flake-utils-pre-commit.follows = "repin-flake-utils";
+      };
+    };
     
-    devshell.url = "github:numtide/devshell";
-    devshell.inputs.nixpkgs.follows = "nixpkgs";
+    devshell = {
+      url = "github:numtide/devshell";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "repin-flake-utils";
+      };
+    };
     
-    mms.url = "github:mkaito/nixos-modded-minecraft-servers";
-    mms.inputs.nixpkgs.follows = "nixpkgs";
+    mms = {
+      url = "github:mkaito/nixos-modded-minecraft-servers";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        nix.follows = "nix-super";
+        flake-compat.follows = "repin-flake-compat";
+        flake-utils.follows = "repin-flake-utils";
+      };
+    };
     
-    hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent";
-    hercules-ci-effects.url = "github:hercules-ci/hercules-ci-effects";
+    hercules-ci-agent = {
+      url = "github:hercules-ci/hercules-ci-agent";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-parts.follows = "flake-parts";
+      };
+    };
+    hercules-ci-effects = {
+      url = "github:hercules-ci/hercules-ci-effects";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
 
-   flake-parts.url = "github:hercules-ci/flake-parts";
-   flake-parts.inputs.nixpkgs.follows = "nixpkgs";
+    flake-parts = {
+      url = "github:hercules-ci/flake-parts";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    
+    repin-flake-compat = {
+      url = "github:edolstra/flake-compat";
+      flake = false;
+    };
+    repin-flake-utils.url = "github:numtide/flake-utils";
   };
   outputs = { self, nixpkgs, flake-parts, ... }@inputs:
     let