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