From dcb425341d94dbf0172f9f3d3ccd9fb870956612 Mon Sep 17 00:00:00 2001
From: David Arnold <dgx.arnold@gmail.com>
Date: Tue, 20 Jul 2021 18:33:45 -0500
Subject: [PATCH] update: digga/fup refactoring

---
 flake.lock | 66 +++++++++++++++++++++++++++---------------------------
 flake.nix  | 18 +++++++--------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3b84f5bd..b855e569 100644
--- a/flake.lock
+++ b/flake.lock
@@ -159,6 +159,7 @@
         "deploy": "deploy",
         "devshell": "devshell",
         "flake-utils": "flake-utils",
+        "flake-utils-plus": "flake-utils-plus",
         "home-manager": [
           "home"
         ],
@@ -168,15 +169,14 @@
         "nixos-generators": "nixos-generators",
         "nixpkgs": [
           "nixos"
-        ],
-        "utils": "utils"
+        ]
       },
       "locked": {
-        "lastModified": 1626470112,
-        "narHash": "sha256-hC5I3A1HxfGi45avpYBf8zXi1hQkHYWgRgUM4sF9byI=",
+        "lastModified": 1626826189,
+        "narHash": "sha256-Ao4zLLMvs0Q8mDMtTbi7JyUHZAPUkZpo1OArgKLTOzA=",
         "owner": "divnix",
         "repo": "digga",
-        "rev": "f25928ed0bf05ab20af5a8231d264ae01b42ab34",
+        "rev": "e97d0ec012df585529eefe0381e087d73261e76e",
         "type": "github"
       },
       "original": {
@@ -217,6 +217,28 @@
         "type": "github"
       }
     },
+    "flake-utils-plus": {
+      "inputs": {
+        "flake-utils": [
+          "digga",
+          "flake-utils"
+        ]
+      },
+      "locked": {
+        "lastModified": 1626825599,
+        "narHash": "sha256-hgjuzvLE+jlt9z6k5MDbc0Fod4k5frZGnN7zArrlpd4=",
+        "owner": "gytis-ivaskevicius",
+        "repo": "flake-utils-plus",
+        "rev": "ea46e02fb86785d3c883d658b194d69799386673",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gytis-ivaskevicius",
+        "ref": "staging",
+        "repo": "flake-utils-plus",
+        "type": "github"
+      }
+    },
     "home": {
       "inputs": {
         "nixpkgs": [
@@ -373,7 +395,7 @@
         ],
         "flake-utils": [
           "digga",
-          "utils",
+          "flake-utils-plus",
           "flake-utils"
         ],
         "nixpkgs": [
@@ -429,6 +451,10 @@
           "digga",
           "flake-utils"
         ],
+        "flake-utils-plus": [
+          "digga",
+          "flake-utils-plus"
+        ],
         "home": "home",
         "latest": "latest",
         "naersk": "naersk_2",
@@ -442,33 +468,7 @@
           "nixos"
         ],
         "nur": "nur",
-        "nvfetcher": "nvfetcher",
-        "utils": [
-          "digga",
-          "utils"
-        ]
-      }
-    },
-    "utils": {
-      "inputs": {
-        "flake-utils": [
-          "digga",
-          "flake-utils"
-        ]
-      },
-      "locked": {
-        "lastModified": 1626288344,
-        "narHash": "sha256-TioHDqWJkw37jjx4DVrH6LCzwrUfAqXbWl4rKR91fpA=",
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "5c6ee69f6957afc2fe22c094717d6d78516418b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gytis-ivaskevicius",
-        "ref": "staging",
-        "repo": "flake-utils-plus",
-        "type": "github"
+        "nvfetcher": "nvfetcher"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index d9f6d0a8..4ff6ba5f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,7 +33,7 @@
       nvfetcher.url = "github:berberman/nvfetcher";
       nvfetcher.inputs.nixpkgs.follows = "latest";
       nvfetcher.inputs.flake-compat.follows = "digga/deploy/flake-compat";
-      nvfetcher.inputs.flake-utils.follows = "digga/utils/flake-utils";
+      nvfetcher.inputs.flake-utils.follows = "digga/flake-utils-plus/flake-utils";
 
       ci-agent.url = "github:hercules-ci/hercules-ci-agent";
       ci-agent.inputs.nix-darwin.follows = "darwin";
@@ -51,7 +51,7 @@
       nixpkgs.follows = "nixos";
       nixlib.follows = "digga/nixlib";
       blank.follows = "digga/blank";
-      utils.follows = "digga/utils";
+      flake-utils-plus.follows = "digga/flake-utils-plus";
       flake-utils.follows = "digga/flake-utils";
       # end ANTI CORRUPTION LAYER
     };
@@ -81,7 +81,7 @@
 
         channels = {
           nixos = {
-            imports = [ (digga.lib.importers.overlays ./overlays) ];
+            imports = [ (digga.lib.importOverlays ./overlays) ];
             overlays = [
               digga.overlays.patchedNix
               nur.overlay
@@ -109,7 +109,7 @@
           hostDefaults = {
             system = "x86_64-linux";
             channelName = "nixos";
-            imports = [ (digga.lib.importers.modules ./modules) ];
+            imports = [ (digga.lib.importModules ./modules) ];
             externalModules = [
               { lib.our = self.lib; }
               digga.nixosModules.nixConfig
@@ -120,14 +120,14 @@
             ];
           };
 
-          imports = [ (digga.lib.importers.hosts ./hosts) ];
+          imports = [ (digga.lib.importHosts ./hosts) ];
           hosts = {
             /* set host specific properties here */
             NixOS = { };
           };
           importables = rec {
-            profiles = digga.lib.importers.rakeLeaves ./profiles // {
-              users = digga.lib.importers.rakeLeaves ./users;
+            profiles = digga.lib.rakeLeaves ./profiles // {
+              users = digga.lib.rakeLeaves ./users;
             };
             suites = with profiles; rec {
               base = [ core users.nixos users.root ];
@@ -136,10 +136,10 @@
         };
 
         home = {
-          imports = [ (digga.lib.importers.modules ./users/modules) ];
+          imports = [ (digga.lib.importModules ./users/modules) ];
           externalModules = [ ];
           importables = rec {
-            profiles = digga.lib.importers.rakeLeaves ./users/profiles;
+            profiles = digga.lib.rakeLeaves ./users/profiles;
             suites = with profiles; rec {
               base = [ direnv git ];
             };