diff --git a/desktop/app-adminsys.nix b/desktop/app-adminsys.nix
index 359384d..12bfb30 100644
--- a/desktop/app-adminsys.nix
+++ b/desktop/app-adminsys.nix
@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
-  imports = [
-  ];
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Adminsys
diff --git a/desktop/app-bureautique.nix b/desktop/app-bureautique.nix
index 50caa8a..d5f1250 100644
--- a/desktop/app-bureautique.nix
+++ b/desktop/app-bureautique.nix
@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
-  imports = [
-  ];
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Bureautique
diff --git a/desktop/app-cao.nix b/desktop/app-cao.nix
index 8519a89..60b7e3a 100644
--- a/desktop/app-cao.nix
+++ b/desktop/app-cao.nix
@@ -1,10 +1,15 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
-  imports = [
-  ];
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
-  environment.systemPackages = with pkgs; [
+environment.systemPackages = with pkgs; [
     # CAO
     ## Modélisation 3D
     freecad   # modélisation de pièces en 3D
diff --git a/desktop/app-client-internet.nix b/desktop/app-client-internet.nix
index 3698f98..40baaaa 100644
--- a/desktop/app-client-internet.nix
+++ b/desktop/app-client-internet.nix
@@ -1,10 +1,15 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
-  imports = [
-  ];
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
-  environment.systemPackages = with pkgs; [
+environment.systemPackages = with pkgs; [
     # Clients Internet
 
     ## Navigateur & Réseaux sociaux
diff --git a/desktop/app-dev.nix b/desktop/app-dev.nix
index 4c4a2d0..9fb81df 100644
--- a/desktop/app-dev.nix
+++ b/desktop/app-dev.nix
@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
-  imports = [
-  ];
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Base de données
diff --git a/desktop/app-geo.nix b/desktop/app-geo.nix
index 89d600d..aa033c1 100644
--- a/desktop/app-geo.nix
+++ b/desktop/app-geo.nix
@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
-  imports = [
-  ];
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Gestion de données géographiques
diff --git a/desktop/app-multimedia.nix b/desktop/app-multimedia.nix
index 7090b75..f0e5d8d 100644
--- a/desktop/app-multimedia.nix
+++ b/desktop/app-multimedia.nix
@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
-  imports = [
-  ];
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Multimedia
diff --git a/desktop/app-network.nix b/desktop/app-network.nix
index 6c98a49..f0b8c14 100644
--- a/desktop/app-network.nix
+++ b/desktop/app-network.nix
@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
-  imports = [
-  ];
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Outils réseau
@@ -25,6 +30,8 @@
     tinc
   ];
 
-  networking.firewall.allowedTCPPorts = [5201]; # iperf
-  networking.firewall.allowedUDPPorts = [5201]; # iperf
+  networking.firewall = {
+    allowedTCPPorts = [5201]; # iperf
+    allowedUDPPorts = [5201]; # iperf
+  };
 }
diff --git a/desktop/app-securite.nix b/desktop/app-securite.nix
index 4fe7ebd..d4bf5aa 100644
--- a/desktop/app-securite.nix
+++ b/desktop/app-securite.nix
@@ -1,8 +1,13 @@
-{ config, libs, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
-  imports = [
-  ];
+let
+  inherit (lib) mkIf;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
 
   environment.systemPackages = with pkgs; [
     # Securité
diff --git a/desktop/desktop.nix b/desktop/desktop.nix
index 2cf04fe..6825268 100644
--- a/desktop/desktop.nix
+++ b/desktop/desktop.nix
@@ -1,5 +1,12 @@
 { config, pkgs, ... }:
 
+let
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+  mkIf = pkgs.lib.mkIf;
+in
+
 {
   imports = [                   # applications :
     # commandées par config-generator
@@ -21,7 +28,7 @@
     ./app-securite.nix          # relatives à la sécurité (chiffrement, gpg, mots de passe, ...)
   ];
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; mkIf profiles.isDesktop [
     # Environement de bureau
     wmname        # pour définir le nom du gestionnaire de fenêtre (utile pour java)
     kde4.ksnapshot# capture d'écran
@@ -55,7 +62,7 @@
   };
 
   # Enable the X11 windowing system.
-  services.xserver = {
+  services.xserver = mkIf profiles.isDesktop {
     enable = true;
     layout = "fr";
     xkbOptions = "eurosign:e";
@@ -88,8 +95,9 @@
     Option "Emulate3Buttons" "true"   # Factory default.
     ''];
   };
-
-  hardware.pulseaudio = {
+  
+  # Pulse Audio
+  hardware.pulseaudio = mkIf profiles.isDesktop {
     enable = true;
     support32Bit = true;
   };