From f6c8e4055c8805c7882572e05f70f180b184a3c1 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 8 Nov 2023 02:04:18 -0500
Subject: flake: follow flake-utils/compat from pre-commit

---
 flake.lock | 16 ++++++++--------
 flake.nix  | 25 ++++++-------------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6a0e12f..e11932f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -29,9 +29,11 @@
     "arkenfox": {
       "inputs": {
         "flake-compat": [
+          "pre-commit",
           "flake-compat"
         ],
         "flake-utils": [
+          "pre-commit",
           "flake-utils"
         ],
         "nixpkgs": [
@@ -273,12 +275,14 @@
       "inputs": {
         "crane": "crane",
         "flake-compat": [
+          "pre-commit",
           "flake-compat"
         ],
         "flake-parts": [
           "parts"
         ],
         "flake-utils": [
+          "pre-commit",
           "flake-utils"
         ],
         "nixpkgs": [
@@ -361,9 +365,11 @@
     "nixos-wsl": {
       "inputs": {
         "flake-compat": [
+          "pre-commit",
           "flake-compat"
         ],
         "flake-utils": [
+          "pre-commit",
           "flake-utils"
         ],
         "nixpkgs": [
@@ -471,12 +477,8 @@
     },
     "pre-commit": {
       "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "flake-utils"
-        ],
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgs"
@@ -505,8 +507,6 @@
         "arkenfox": "arkenfox",
         "catppuccin": "catppuccin",
         "darwin": "darwin",
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
         "getchoo": "getchoo",
         "getchvim": "getchvim",
         "guzzle_api": "guzzle_api",
diff --git a/flake.nix b/flake.nix
index 930f3b5..efdb945 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,9 +32,9 @@
       url = "github:dwarfmaster/arkenfox-nixos";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        flake-compat.follows = "flake-compat";
+        flake-compat.follows = "pre-commit/flake-compat";
         pre-commit.follows = "pre-commit";
-        flake-utils.follows = "flake-utils";
+        flake-utils.follows = "pre-commit/flake-utils";
       };
     };
 
@@ -79,9 +79,9 @@
       url = "github:nix-community/lanzaboote";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        flake-compat.follows = "flake-compat";
+        flake-compat.follows = "pre-commit/flake-compat";
         flake-parts.follows = "parts";
-        flake-utils.follows = "flake-utils";
+        flake-utils.follows = "pre-commit/flake-utils";
         pre-commit-hooks-nix.follows = "pre-commit";
       };
     };
@@ -102,8 +102,8 @@
       url = "github:nix-community/NixOS-WSL";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        flake-compat.follows = "flake-compat";
-        flake-utils.follows = "flake-utils";
+        flake-compat.follows = "pre-commit/flake-compat";
+        flake-utils.follows = "pre-commit/flake-utils";
       };
     };
 
@@ -119,21 +119,8 @@
       inputs = {
         nixpkgs.follows = "nixpkgs";
         nixpkgs-stable.follows = "nixpkgs";
-        flake-compat.follows = "flake-compat";
-        flake-utils.follows = "flake-utils";
       };
     };
-
-    # ------------------------------
-    # -- these are just to avoid having multiple versions in flake.lock
-    # ------------------------------
-
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
-
-    flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs = {parts, ...} @ inputs:
-- 
cgit v1.2.3