diff --git a/activation-manuelle/app-awesome.nix b/activation-manuelle/app-awesome.nix
index e0ccfd0..abc751a 100644
--- a/activation-manuelle/app-awesome.nix
+++ b/activation-manuelle/app-awesome.nix
@@ -1,13 +1,13 @@
 { config, lib, pkgs, ... }:
+
 let
   inherit (lib) mkIf;
   cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
   profiles = config.r6d.profiles;
-in {
-  imports = [
-  ];
+in mkIf cfg.awesome {
 
-  environment.variables = mkIf cfg.awesome {
+  environment.variables = {
     # Export the current path for the awesome derivation, useful for users rc.lua
     # Example usage in rc.lua :
     #
diff --git a/activation-manuelle/app-docker.nix b/activation-manuelle/app-docker.nix
index a1c4aaf..69bc060 100644
--- a/activation-manuelle/app-docker.nix
+++ b/activation-manuelle/app-docker.nix
@@ -1,16 +1,18 @@
 { config, lib, pkgs, ... }:
+
 let
   inherit (lib) mkIf;
   cfg = config.r6d.config-generator;
-in {
-  imports = [
-  ];
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+
+in mkIf cfg.docker {
 
-  environment.systemPackages = with pkgs; mkIf cfg.docker [
+  environment.systemPackages = with pkgs; [
     # Ecosystème Docker
     docker
     python27Packages.docker_compose
   ];
 
-  virtualisation.docker.enable = cfg.docker;
+  virtualisation.docker.enable = true;
 }
diff --git a/activation-manuelle/app-jeux.nix b/activation-manuelle/app-jeux.nix
index edcfdb9..7371907 100644
--- a/activation-manuelle/app-jeux.nix
+++ b/activation-manuelle/app-jeux.nix
@@ -1,12 +1,14 @@
 { config, lib, pkgs, ... }:
+
 let
   inherit (lib) mkIf;
   cfg = config.r6d.config-generator;
-in {
-  imports = [
-  ];
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+
+in mkIf cfg.jeux {
 
-  environment.systemPackages = with pkgs; mkIf cfg.jeux [
+  environment.systemPackages = with pkgs; [
     # Jeux
     urbanterror
   ];
diff --git a/activation-manuelle/app-virtualbox.nix b/activation-manuelle/app-virtualbox.nix
index 8d9bfe5..47d461c 100644
--- a/activation-manuelle/app-virtualbox.nix
+++ b/activation-manuelle/app-virtualbox.nix
@@ -1,16 +1,18 @@
 { config, lib, pkgs, ... }:
+
 let
   inherit (lib) mkIf;
   cfg = config.r6d.config-generator;
-in {
-  imports = [
-  ];
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+
+in mkIf cfg.virtualbox {
 
-  environment.systemPackages = with pkgs; mkIf cfg.virtualbox [
+  environment.systemPackages = with pkgs; [
     linuxPackages.virtualbox
     linuxPackages.virtualboxGuestAdditions
   ];
 
-  virtualisation.virtualbox.host.enable = cfg.virtualbox;
+  virtualisation.virtualbox.host.enable = true;
 }
 
diff --git a/activation-manuelle/laptop.nix b/activation-manuelle/laptop.nix
index 332d6f5..f31a388 100644
--- a/activation-manuelle/laptop.nix
+++ b/activation-manuelle/laptop.nix
@@ -1,19 +1,24 @@
 { config, lib, pkgs, ... }:
+
 let
   inherit (lib) mkIf;
   cfg = config.r6d.config-generator;
-in {
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+
+in mkIf cfg.laptop {
   # Paquets spécifiques pour un ordinateur portable
 
-  networking.networkmanager.enable = cfg.laptop; # Activation d'un gestionnaire de réseau
+  ## Activation d'un gestionnaire de réseau
+  networking.networkmanager.enable = true;
 
-  hardware.bluetooth.enable = cfg.laptop;
+  hardware.bluetooth.enable = true;
 
-  environment.systemPackages = with pkgs; mkIf cfg.laptop [
+  environment.systemPackages = with pkgs; [
     networkmanagerapplet
   ];
 
-  services.xserver.synaptics = mkIf cfg.laptop {
+  services.xserver.synaptics = {
     enable = true;
     twoFingerScroll = true;
   };
diff --git a/activation-manuelle/xmonad.nix b/activation-manuelle/xmonad.nix
index 9ada317..bb46a15 100644
--- a/activation-manuelle/xmonad.nix
+++ b/activation-manuelle/xmonad.nix
@@ -1,18 +1,24 @@
 { config, lib, pkgs, ... }:
+
 let
   inherit (lib) mkIf;
   cfg = config.r6d.config-generator;
-in mkIf cfg.xmonad {
-  # Paquets spécifiques pour un ordinateur portable
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+
+in  mkIf cfg.xmonad {
+  # Paquets spécifiques pour xmonad
 
   environment.systemPackages = with pkgs;[
     dmenu
     haskellPackages.xmobar
   ];
 
-  services.xserver.windowManager.xmonad.enable = true;
-  services.xserver.windowManager.xmonad.enableContribAndExtras = true;
-  services.xserver.windowManager.xmonad.extraPackages = haskellPackages: [
-    haskellPackages.xmobar
-  ];
+  services.xserver.windowManager.xmonad = {
+    enable = true;
+    enableContribAndExtras = true;
+    extraPackages = haskellPackages: [
+      haskellPackages.xmobar
+    ];
+  };
 }