déplacement de config generator

2016-08-01 15:41:12 +02:00
parent 256ae50aea
commit a84ca742de
3 changed files with 14 additions and 14 deletions
--- a/base.nix
+++ b/base.nix
@@ -2,7 +2,11 @@

 {
  imports = [
+    # recettes
    ./base/base.nix
    ./desktop/desktop.nix
+
+    # moulinette de configuration
+    ./config-generator.nix
  ];
 }
--- 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
  ];
 }
--- a/base/config-generator.nix
+++ b/base/config-generator.nix
@@ -10,18 +10,6 @@ let
 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 = {