From 56cd177d3e5d253f16eaf6a60ec34b8f9cfd6e81 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom@hubrecht.ovh>
Date: Mon, 2 Oct 2023 13:53:20 +0200
Subject: [PATCH] feat(nix-lib): Update to 0.1.5 and switch to using mkConfig

---
 machines/compute01/_configuration.nix | 21 +++++----------------
 machines/storage01/_configuration.nix | 21 +++++----------------
 machines/web01/_configuration.nix     | 21 +++++----------------
 npins/sources.json                    |  6 +++---
 4 files changed, 18 insertions(+), 51 deletions(-)

diff --git a/machines/compute01/_configuration.nix b/machines/compute01/_configuration.nix
index 30cee5b..af765f6 100644
--- a/machines/compute01/_configuration.nix
+++ b/machines/compute01/_configuration.nix
@@ -1,19 +1,14 @@
 { dgn-lib, ... }:
 
-let
-  inherit (dgn-lib)
-    enableModules
-    mkImports
-    recursiveFuse;
-
-  # List of modules to enable
+dgn-lib.mkConfig {
   enabledModules = [
+    # List of modules to enable
     "dgn-dns"
     "dgn-web"
   ];
 
-  # List of services to enable
   enabledServices = [
+    # List of services to enable
     "ds-fr"
     "kanidm"
     "mastodon"
@@ -22,12 +17,6 @@ let
     "satosa"
     "zammad"
   ];
-in
 
-recursiveFuse [
-  (enableModules enabledModules)
-
-  {
-    imports = mkImports ./. enabledServices;
-  }
-]
+  root = ./.;
+}
diff --git a/machines/storage01/_configuration.nix b/machines/storage01/_configuration.nix
index 464cc65..d9bb98f 100644
--- a/machines/storage01/_configuration.nix
+++ b/machines/storage01/_configuration.nix
@@ -1,29 +1,18 @@
 { dgn-lib, ... }:
 
-let
-  inherit (dgn-lib)
-    enableModules
-    mkImports
-    recursiveFuse;
-
-  # List of modules to enable
+dgn-lib.mkConfig {
   enabledModules = [
+    # List of modules to enable
     "dgn-web"
   ];
 
-  # List of services to enable
   enabledServices = [
+    # List of services to enable
     "atticd"
     "forgejo"
     "garage"
     "peertube"
   ];
-in
 
-recursiveFuse [
-  (enableModules enabledModules)
-
-  {
-    imports = mkImports ./. enabledServices;
-  }
-]
+  root = ./.;
+}
diff --git a/machines/web01/_configuration.nix b/machines/web01/_configuration.nix
index 3cb864c..dae67b3 100644
--- a/machines/web01/_configuration.nix
+++ b/machines/web01/_configuration.nix
@@ -1,29 +1,18 @@
 { dgn-lib, ... }:
 
-let
-  inherit (dgn-lib)
-    enableModules
-    mkImports
-    recursiveFuse;
-
-  # List of modules to enable
+dgn-lib.mkConfig {
   enabledModules = [
+    # List of modules to enable
     "dgn-web"
   ];
 
-  # List of services to enable
   enabledServices = [
+    # List of services to enable
     "metis"
     "linkal"
     "plausible"
     # "wordpress"
   ];
-in
 
-recursiveFuse [
-  (enableModules enabledModules)
-
-  {
-    imports = mkImports ./. enabledServices;
-  }
-]
+  root = ./.;
+}
diff --git a/npins/sources.json b/npins/sources.json
index 61f2916..8ff94a7 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -84,10 +84,10 @@
       },
       "pre_releases": false,
       "version_upper_bound": null,
-      "version": "0.1.4",
-      "revision": "7f41fb168f0a97481d06019b3de305ebff9ee348",
+      "version": "0.1.5",
+      "revision": "5260bfd4e8aaffef455bfa0edf3d0a2db81de989",
       "url": null,
-      "hash": "1ymx3ayi189xcinpc6r71qvwgqsvz96y7dwdxzlrjawr08c95wm2"
+      "hash": "18c9mcjx1v4zlgl91dgiq4rrcayz05fy8v5pq00dlyfm3chrqvxx"
     },
     "nix-patches": {
       "type": "GitRelease",