diff --git a/activation-manuelle/app-docker.nix b/activation-manuelle/app-docker.nix
index fc2116f..a1c4aaf 100644
--- a/activation-manuelle/app-docker.nix
+++ b/activation-manuelle/app-docker.nix
@@ -1,14 +1,16 @@
-{ config, libs, pkgs, ... }:
-
-{
+{ config, lib, pkgs, ... }:
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+in {
   imports = [
   ];
 
-  environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.docker [
+  environment.systemPackages = with pkgs; mkIf cfg.docker [
     # Ecosystème Docker
     docker
     python27Packages.docker_compose
   ];
 
-  virtualisation.docker.enable = config.r6d.config-generator.docker;
+  virtualisation.docker.enable = cfg.docker;
 }
diff --git a/activation-manuelle/app-jeux.nix b/activation-manuelle/app-jeux.nix
index a8b75ad..edcfdb9 100644
--- a/activation-manuelle/app-jeux.nix
+++ b/activation-manuelle/app-jeux.nix
@@ -1,10 +1,12 @@
-{ config, libs, pkgs, ... }:
-
-{
+{ config, lib, pkgs, ... }:
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+in {
   imports = [
   ];
 
-  environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.jeux [
+  environment.systemPackages = with pkgs; mkIf cfg.jeux [
     # Jeux
     urbanterror
   ];
diff --git a/activation-manuelle/app-virtualbox.nix b/activation-manuelle/app-virtualbox.nix
index eae85b8..8d9bfe5 100644
--- a/activation-manuelle/app-virtualbox.nix
+++ b/activation-manuelle/app-virtualbox.nix
@@ -1,14 +1,16 @@
-{ config, libs, pkgs, ... }:
-
-{
+{ config, lib, pkgs, ... }:
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+in {
   imports = [
   ];
 
-  environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.virtualbox [
+  environment.systemPackages = with pkgs; mkIf cfg.virtualbox [
     linuxPackages.virtualbox
     linuxPackages.virtualboxGuestAdditions
   ];
 
-  virtualisation.virtualbox.host.enable = config.r6d.config-generator.virtualbox;
+  virtualisation.virtualbox.host.enable = cfg.virtualbox;
 }
 
diff --git a/activation-manuelle/laptop.nix b/activation-manuelle/laptop.nix
index 3bb26f6..332d6f5 100644
--- a/activation-manuelle/laptop.nix
+++ b/activation-manuelle/laptop.nix
@@ -1,17 +1,19 @@
-{ config, pkgs, ... }:
-
-{
+{ config, lib, pkgs, ... }:
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+in {
   # Paquets spécifiques pour un ordinateur portable
 
-  networking.networkmanager.enable = config.r6d.config-generator.laptop; # Activation d'un gestionnaire de réseau
+  networking.networkmanager.enable = cfg.laptop; # Activation d'un gestionnaire de réseau
 
-  hardware.bluetooth.enable = config.r6d.config-generator.laptop;
+  hardware.bluetooth.enable = cfg.laptop;
 
-  environment.systemPackages = with pkgs; pkgs.lib.mkIf config.r6d.config-generator.laptop [
+  environment.systemPackages = with pkgs; mkIf cfg.laptop [
     networkmanagerapplet
   ];
 
-  services.xserver.synaptics = pkgs.lib.mkIf config.r6d.config-generator.laptop {
+  services.xserver.synaptics = mkIf cfg.laptop {
     enable = true;
     twoFingerScroll = true;
   };