From a84ca742de041ea263765d1f06da480468fc39bd Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Mon, 1 Aug 2016 15:41:12 +0200
Subject: [PATCH] =?UTF-8?q?d=C3=A9placement=20de=20config=20generator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base.nix                                          |  4 ++++
 base/base.nix                                     | 10 +++++++++-
 base/config-generator.nix => config-generator.nix | 14 +-------------
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename base/config-generator.nix => config-generator.nix (95%)

diff --git a/base.nix b/base.nix
index 1af8358..a0743ab 100644
--- a/base.nix
+++ b/base.nix
@@ -2,7 +2,11 @@
 
 {
   imports = [
+    # recettes
     ./base/base.nix
     ./desktop/desktop.nix
+
+    # moulinette de configuration
+    ./config-generator.nix
   ];
 }
diff --git a/base/base.nix b/base/base.nix
index f0397a7..803aa0e 100644
--- a/base/base.nix
+++ b/base/base.nix
@@ -9,6 +9,14 @@
     ./services.nix
 
     # inclusion conditionnelle
-    ./config-generator.nix
+    ./activation-manuelle/auto-upgrade.nix
+    ./activation-manuelle/laptop.nix
+    ./activation-manuelle/locate.nix
+    ./activation-manuelle/fail2ban.nix
+    ./activation-manuelle/nix-serve-client.nix
+    ./activation-manuelle/nix-serve-server.nix
+    ./activation-manuelle/print.nix
+    ./activation-manuelle/swap.nix
+    ./activation-manuelle/users.nix
   ];
 }
diff --git a/base/config-generator.nix b/config-generator.nix
similarity index 95%
rename from base/config-generator.nix
rename to config-generator.nix
index b431fe7..67cbcbc 100644
--- a/base/config-generator.nix
+++ b/config-generator.nix
@@ -9,19 +9,7 @@ let
   host = config.networking.hostName;
 in
 
-  {
-    imports = [
-      ./activation-manuelle/auto-upgrade.nix
-      ./activation-manuelle/laptop.nix
-      ./activation-manuelle/locate.nix
-      ./activation-manuelle/fail2ban.nix
-      ./activation-manuelle/nix-serve-client.nix
-      ./activation-manuelle/nix-serve-server.nix
-      ./activation-manuelle/print.nix
-      ./activation-manuelle/swap.nix
-      ./activation-manuelle/users.nix
-    ];
-
+{
     ###### interface
 
     options = {