From 36c0eba3b542974529caa4d5ae189cb4d566f438 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Mon, 8 Aug 2016 22:00:02 +0200
Subject: [PATCH] =?UTF-8?q?d=C3=A9placement=20de=20.nix=20de=20base/base?=
 =?UTF-8?q?=20vers=20base/public?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base.nix                                             |  1 +
 base/base.nix                                        |  5 -----
 .../activation-manuelle => public}/auto-upgrade.nix  |  0
 {base/activation-manuelle => public}/laptop.nix      |  0
 {base/activation-manuelle => public}/locate.nix      |  0
 {base/activation-manuelle => public}/print.nix       |  0
 public/public.nix                                    | 12 ++++++++++++
 {base/activation-manuelle => public}/swap.nix        |  0
 8 files changed, 13 insertions(+), 5 deletions(-)
 rename {base/activation-manuelle => public}/auto-upgrade.nix (100%)
 rename {base/activation-manuelle => public}/laptop.nix (100%)
 rename {base/activation-manuelle => public}/locate.nix (100%)
 rename {base/activation-manuelle => public}/print.nix (100%)
 create mode 100644 public/public.nix
 rename {base/activation-manuelle => public}/swap.nix (100%)

diff --git a/base.nix b/base.nix
index a0743ab..f7cb649 100644
--- a/base.nix
+++ b/base.nix
@@ -5,6 +5,7 @@
     # recettes
     ./base/base.nix
     ./desktop/desktop.nix
+    ./public/public.nix
 
     # moulinette de configuration
     ./config-generator.nix
diff --git a/base/base.nix b/base/base.nix
index 803aa0e..e8fcb39 100644
--- a/base/base.nix
+++ b/base/base.nix
@@ -9,14 +9,9 @@
     ./services.nix
 
     # inclusion conditionnelle
-    ./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/activation-manuelle/auto-upgrade.nix b/public/auto-upgrade.nix
similarity index 100%
rename from base/activation-manuelle/auto-upgrade.nix
rename to public/auto-upgrade.nix
diff --git a/base/activation-manuelle/laptop.nix b/public/laptop.nix
similarity index 100%
rename from base/activation-manuelle/laptop.nix
rename to public/laptop.nix
diff --git a/base/activation-manuelle/locate.nix b/public/locate.nix
similarity index 100%
rename from base/activation-manuelle/locate.nix
rename to public/locate.nix
diff --git a/base/activation-manuelle/print.nix b/public/print.nix
similarity index 100%
rename from base/activation-manuelle/print.nix
rename to public/print.nix
diff --git a/public/public.nix b/public/public.nix
new file mode 100644
index 0000000..faf7fdd
--- /dev/null
+++ b/public/public.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    # inclusion conditionnelle
+    ./auto-upgrade.nix
+    ./laptop.nix
+    ./locate.nix
+    ./print.nix
+    ./swap.nix
+  ];
+}
diff --git a/base/activation-manuelle/swap.nix b/public/swap.nix
similarity index 100%
rename from base/activation-manuelle/swap.nix
rename to public/swap.nix