From 08db1fa28dc5928f2e1399c2f4e90c270439cb0d Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Thu, 23 Jun 2022 11:51:51 +0200
Subject: [PATCH] Clean up flake.lock

---
 flake.lock | 89 ++++++------------------------------------------------
 flake.nix  |  7 ++++-
 2 files changed, 16 insertions(+), 80 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8c4dec2f..0bd301dd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,7 +2,9 @@
   "nodes": {
     "accentor": {
       "inputs": {
-        "api": "api",
+        "api": [
+          "accentor-api"
+        ],
         "devshell": [
           "devshell"
         ],
@@ -12,7 +14,9 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "web": "web"
+        "web": [
+          "accentor-web"
+        ]
       },
       "locked": {
         "lastModified": 1655952929,
@@ -100,36 +104,6 @@
         "type": "github"
       }
     },
-    "api": {
-      "inputs": {
-        "devshell": [
-          "accentor",
-          "devshell"
-        ],
-        "flake-utils": [
-          "accentor",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "accentor",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1655829579,
-        "narHash": "sha256-vYcfo1Op1bzw7WnB7AlYEbm+hsOWKQhMGzQSGT9n5rk=",
-        "owner": "accentor",
-        "repo": "api",
-        "rev": "4722a2d08b3da1b5f4b39017786d6f3c242da497",
-        "type": "github"
-      },
-      "original": {
-        "owner": "accentor",
-        "ref": "v0.17.3",
-        "repo": "api",
-        "type": "github"
-      }
-    },
     "blobs": {
       "flake": false,
       "locked": {
@@ -171,7 +145,9 @@
     },
     "emacs-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -221,21 +197,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1653893745,
-        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -373,7 +334,7 @@
         "agenix": "agenix",
         "devshell": "devshell",
         "emacs-overlay": "emacs-overlay",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixos-mailserver": "nixos-mailserver",
         "nixpkgs": "nixpkgs",
@@ -427,36 +388,6 @@
         "repo": "flake-utils-plus",
         "type": "github"
       }
-    },
-    "web": {
-      "inputs": {
-        "devshell": [
-          "accentor",
-          "devshell"
-        ],
-        "flake-utils": [
-          "accentor",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "accentor",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1651315771,
-        "narHash": "sha256-sgO9Ps9uKjMmEZ2wk6nO2+rEA7QN/ToOiUPQO2Bitcc=",
-        "owner": "accentor",
-        "repo": "web",
-        "rev": "8d573abed88681a6b098fe0339aa06f2aeea074b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "accentor",
-        "ref": "v0.30.1",
-        "repo": "web",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index ad952c1e..49b6a6d1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,9 +5,11 @@
     accentor = {
       url = "github:accentor/flake";
       inputs = {
+        api.follows = "accentor-api";
         devshell.follows = "devshell";
         flake-utils.follows = "flake-utils";
         nixpkgs.follows = "nixpkgs";
+        web.follows = "accentor-web";
       };
     };
     accentor-api = {
@@ -39,7 +41,10 @@
     };
     emacs-overlay = {
       url = "github:nix-community/emacs-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
     };
     flake-utils.url = "github:numtide/flake-utils";
     home-manager = {