From 62b153735359c92ad8b2515248c2b0e775ed5880 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 10 Jul 2016 17:00:15 +0200
Subject: [PATCH] fix: erreur de syntaxe sur les fichiers manuels

---
 activation-manuelle/app-docker.nix     | 14 ++++++--------
 activation-manuelle/app-jeux.nix       | 10 ++++------
 activation-manuelle/app-virtualbox.nix | 12 +++++-------
 activation-manuelle/laptop.nix         | 26 ++++++++++----------------
 4 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/activation-manuelle/app-docker.nix b/activation-manuelle/app-docker.nix
index 5ac653f..fc2116f 100644
--- a/activation-manuelle/app-docker.nix
+++ b/activation-manuelle/app-docker.nix
@@ -4,13 +4,11 @@
   imports = [
   ];
 
-  config = mkIf config.r6d.config-generator.docker {
-    environment.systemPackages = with pkgs; [
-      # Ecosystème Docker
-      docker
-      python27Packages.docker_compose
-    ];
+  environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.docker [
+    # Ecosystème Docker
+    docker
+    python27Packages.docker_compose
+  ];
 
-    virtualisation.docker.enable = true;
-  }
+  virtualisation.docker.enable = config.r6d.config-generator.docker;
 }
diff --git a/activation-manuelle/app-jeux.nix b/activation-manuelle/app-jeux.nix
index 4b07e11..a8b75ad 100644
--- a/activation-manuelle/app-jeux.nix
+++ b/activation-manuelle/app-jeux.nix
@@ -4,10 +4,8 @@
   imports = [
   ];
 
-  config = mkIf config.r6d.config-generator.jeux {
-    environment.systemPackages = with pkgs; [
-      # Jeux
-      urbanterror
-    ];
-  }
+  environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.jeux [
+    # Jeux
+    urbanterror
+  ];
 }
diff --git a/activation-manuelle/app-virtualbox.nix b/activation-manuelle/app-virtualbox.nix
index 9f55f56..eae85b8 100644
--- a/activation-manuelle/app-virtualbox.nix
+++ b/activation-manuelle/app-virtualbox.nix
@@ -4,13 +4,11 @@
   imports = [
   ];
 
-  config = mkIf config.r6d.config-generator.virtualbox {
-    environment.systemPackages = with pkgs; [
-      linuxPackages.virtualbox
-      linuxPackages.virtualboxGuestAdditions
-    ];
+  environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.virtualbox [
+    linuxPackages.virtualbox
+    linuxPackages.virtualboxGuestAdditions
+  ];
 
-    virtualisation.virtualbox.host.enable = true;
-  }
+  virtualisation.virtualbox.host.enable = config.r6d.config-generator.virtualbox;
 }
 
diff --git a/activation-manuelle/laptop.nix b/activation-manuelle/laptop.nix
index 5c153d4..3bb26f6 100644
--- a/activation-manuelle/laptop.nix
+++ b/activation-manuelle/laptop.nix
@@ -1,24 +1,18 @@
-{ config, libs, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   # Paquets spécifiques pour un ordinateur portable
 
-  config = mkIf config.r6d.config-generator.laptop {
+  networking.networkmanager.enable = config.r6d.config-generator.laptop; # Activation d'un gestionnaire de réseau
 
-    networking = {
-      #wireless.enable = true;       # Enables wireless support via wpa_supplicant
-      networkmanager.enable = true; # Activation d'un gestionnaire de réseau
-    };
+  hardware.bluetooth.enable = config.r6d.config-generator.laptop;
 
-    hardware.bluetooth.enable = true;
+  environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.laptop [
+    networkmanagerapplet
+  ];
 
-    environment.systemPackages = with pkgs;[
-      networkmanagerapplet
-    ];
-
-    services.xserver.synaptics = {
-      enable = true;
-      twoFingerScroll = true;
-   };
- }
+  services.xserver.synaptics = pkgs.lib.mkIf config.r6d.config-generator.laptop {
+    enable = true;
+    twoFingerScroll = true;
+  };
 }