From 2fa21f7f4da514f53b6d568dc3fdd37395265c01 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 9 Jul 2016 21:42:44 +0200
Subject: [PATCH] activation du client sur les machines + ajout monstre

---
 activation-manuelle/nix-serve-client.nix |  8 ++++----
 config-generator.nix                     | 12 ++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/activation-manuelle/nix-serve-client.nix b/activation-manuelle/nix-serve-client.nix
index 16d525f..51de09e 100644
--- a/activation-manuelle/nix-serve-client.nix
+++ b/activation-manuelle/nix-serve-client.nix
@@ -1,9 +1,9 @@
 { config, pkgs, ... }:
 
 {
-  config = mkIf config.r6d.config-generator.nix-serve-client {
+  nix = pkgs.lib.mkIf config.r6d.config-generator.nix-serve-client {
     # Cache http pour le store
-    nix.requireSignedBinaryCaches = false;
-    nix.binaryCaches = [ "http://192.168.10.169:5000" ];
-  }
+    requireSignedBinaryCaches = false;
+    binaryCaches = [ "http://192.168.10.169:5000" ];
+  };
 }
diff --git a/config-generator.nix b/config-generator.nix
index 47a5ba5..02cb5ee 100644
--- a/config-generator.nix
+++ b/config-generator.nix
@@ -123,17 +123,25 @@ in
         docker = true;
         jeux = true;
         laptop = true;
+        nix-serve-client = true;
       };
     })
-    (mkIf (config.networking.hostName == "nro-nomade.dubronetwork.fr") {
+   (mkIf (config.networking.hostName == "monstre.dubronetwork.fr") {
+      r6d.config-generator = {
+        nix-serve-server = true;
+      };
+    })
+    (mkIf (config.networking.hostName == "neo-nomade.dubronetwork.fr") {
       r6d.config-generator = {
         laptop = true;
+        nix-serve-client = true;
       };
     })
-    (mkIf (config.networking.hostName == "phenom.dubronetwork.fr") {
+     (mkIf (config.networking.hostName == "phenom.dubronetwork.fr") {
       r6d.config-generator = {
         docker = true;
         jeux = true;
+        nix-serve-client = true;
         nix-serve-server = true;
         virtualbox = true;
       };