add server options

applications/graphical/adminsys.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.graphical {

applications/graphical/bureau.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf currentMachine.profiles.isDesktopEnvironment {

applications/graphical/bureautique.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.officeSuite && flags.graphical) {

applications/graphical/cao.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.conception-assistee && flags.graphical) {

applications/graphical/cartographie.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.cartographie && flags.graphical) {

applications/graphical/client-internet.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 # TODO: ménage
 mkIf (flags.internetSuite && flags.graphical) {

applications/graphical/default-applications.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (true && flags.graphical) {

applications/graphical/default.nix

@@ -4,7 +4,7 @@ let
   #inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 {

applications/graphical/developpement-elm.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.developpement-elm && flags.graphical) {

applications/graphical/developpement-haskell.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.developpement-haskell && flags.graphical) {

applications/graphical/developpement-java.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.developpement-java && flags.graphical) {

applications/graphical/developpement-jetbrains.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.jetbrains-licensed && flags.graphical) {

applications/graphical/developpement-rust.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.developpement-rust && flags.graphical) {

applications/graphical/developpement.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.developpement && flags.graphical) {

applications/graphical/edition-musique.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.edition-musique && flags.graphical) {

applications/graphical/edition-photo.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.edition-photo && flags.graphical) {

applications/graphical/edition-video.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.edition-video && flags.graphical) {

applications/graphical/jeux.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.jeux && flags.graphical) {

applications/graphical/multimedia.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 # TODO ranger le spécifique pulseaudio

applications/graphical/network.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (true && flags.graphical) {

applications/graphical/securite.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf (flags.securitySuite && flags.graphical) {

applications/terminal/adminsys.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf true {

applications/terminal/bureau.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf true {

applications/terminal/bureautique.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.officeSuite {

applications/terminal/cao.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.conception-assistee {

applications/terminal/cartographie.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.cartographie {

applications/terminal/client-internet.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 # TODO: ménage
 mkIf flags.internetSuite {

applications/terminal/default-applications.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf true {

applications/terminal/default.nix

@@ -4,7 +4,7 @@ let
   #inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 {

applications/terminal/developpement-elm.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.developpement-elm {

applications/terminal/developpement-haskell.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.developpement-haskell {

applications/terminal/developpement-java.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.developpement-java {

applications/terminal/developpement-jetbrains.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.jetbrains-licensed {

applications/terminal/developpement-rust.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.developpement-rust {

applications/terminal/developpement.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.developpement {

applications/terminal/edition-musique.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.edition-musique {

applications/terminal/edition-photo.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.edition-photo {

applications/terminal/edition-video.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.edition-video {

applications/terminal/jeux.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.jeux {

applications/terminal/multimedia.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.multimediaSuite {

applications/terminal/network.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf true {

applications/terminal/securite.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.securitySuite {

config-generator.nix

@@ -8,7 +8,7 @@ let
   host = config.networking.hostName;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 {
@@ -56,26 +56,6 @@ in
       };
     })
 
-    ## Profils liés à Dubronetwork
-    (mkIf (pfl.isDubronetwork && pfl.isWorkstation) {
-      r6d.config-generator = {
-        cartographie = true;
-        conception-assistee = true;
-        docker = true;
-        developpement = true;
-        developpement-elm = true;
-        developpement-haskell = true;
-        developpement-java = true;
-        developpement-rust = true;
-        edition-musique = true;
-        edition-photo = true;
-        edition-video = true;
-        scanner = true;
-        virtualbox = true;
-        xmonad = true;
-      };
-    })
-
     ## Affectation des profils aux machines
 
     (mkIf comp.isLatitude {

configuration/auto-upgrade.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.auto-upgrade {

configuration/awesome.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 # TODO: rc.lua par défaut (système)

configuration/default.nix

@@ -4,7 +4,7 @@ let
   #inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 {

configuration/environment.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 # TODO: ménage

configuration/laptop.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.laptop {

configuration/localisation.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf true {

configuration/network-ipv6.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf true {

configuration/network.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf true {

configuration/swap.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.swap {

configuration/udev.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf false {

lib.nix

@@ -5,26 +5,46 @@ let
     isDesktopEnvironment = {
       awesome = true;
       internetSuite = true;
+      graphical = true;
       multimediaSuite = true;
       officeSuite = true;
       pulseaudio = true;
       securitySuite = true;
     };
     isWorkstation = {
-      graphical = true;
       docker = true;
+      developpement = true;
+      developpement-elm = true;
+      developpement-haskell = true;
+      developpement-java = true;
+      developpement-rust = true;
     };
-    isServer = {
+    #isServer = {
-    };
+      #};
   };
 
 in
 
-rec {
+with lib; rec{
+  # Apply the profiles (pre-defined + custom) to the whole directory
   applyProfilesToDirectory = customProfiles: directory:
     lib.mapAttrs (applyProfilesToMachine customProfiles) directory;
 
+  # Apply the profiles (pre-defined + custom) to a machine
   applyProfilesToMachine = customProfiles: machineName: machineOptions:
-    machineOptions;
+  { configurationFlags = lib.recursiveUpdate (generateFlagsSet customProfiles machineOptions.profiles) machineOptions.configurationFlags;
-    #lib.recursiveUpdate {} machineOptions;
+    configurationOptions = machineOptions.configurationOptions;
+    profiles = machineOptions.profiles;
+  };
+
+  # Generate a set of configuration flags based on profiles
+  generateFlagsSet = customProfiles: machineProfiles:
+  let
+    allProfiles = recursiveUpdate profiles customProfiles;
+    conditionalFlags = name: value:
+      if machineProfiles.${name}
+      then value
+      else {};
+  in
+  foldr (a: b: a // b) {} (mapAttrsToList conditionalFlags allProfiles);
 }

module-template.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf true {

options.nix

@@ -6,7 +6,7 @@ let
   machineOptions = types.submodule {
     options = {
 
-      configuration-flags = {
+      configurationFlags = {
         #enable                = mkEnableOption "Génération de la configuration d'une machine.";
         awesome               = mkEnableOption "Profil pour activer le gestionnaire de fenêtre awesome.";
         auto-upgrade          = mkEnableOption "Profil pour activer les mises à jour automatiques.";
@@ -57,15 +57,7 @@ let
         znc                   = mkEnableOption "Profil pour activer le relais IRC ZNC.";
       };
 
-      profiles = {
+      configurationOptions = {
-        # Domaine
-        isDubronetwork        = mkEnableOption "Pour distinguer les machines dubronetwork.";
-        isPrunetwork          = mkEnableOption "Pour distinguer les machines prunetwork.";
-        # Utilisation machine
-        isDesktopEnvironment  = mkEnableOption "Pour indiquer une machine avec interface graphique.";
-        isServer              = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur.";
-        isWorkstation         = mkEnableOption "Pour indiquer que la machine sert à travailler.";
-      };
 
       ipAddress = mkOption {
         description = "Adresse IP";
@@ -128,11 +120,26 @@ let
         };
       };
     };
+
+      profiles = {
+        # Domaine
+        isDubronetwork        = mkEnableOption "Pour distinguer les machines dubronetwork.";
+        isDubronetworkServer  = mkEnableOption "Pour distinguer les machines dubronetwork avec Server.";
+        isDubronetworkWorkstation = mkEnableOption "Pour distinguer les machines dubronetwork avec Workstation.";
+        isPrunetwork          = mkEnableOption "Pour distinguer les machines prunetwork.";
+        isPrunetworkServer    = mkEnableOption "Pour distinguer les machines prunetwork avec Server.";
+        isPrunetworkWorkstation = mkEnableOption "Pour distinguer les machines prunetwork avec Workstation.";
+        # Utilisation machine
+        isDesktopEnvironment  = mkEnableOption "Pour indiquer une machine avec interface graphique.";
+        isServer              = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur.";
+        isWorkstation         = mkEnableOption "Pour indiquer que la machine sert à travailler.";
+      };
+    };
   };
 
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 {
@@ -151,10 +158,15 @@ in
     */
     assertions = [
      {
-       assertion = (currentMachine.profiles.isWorkstation && (currentMachine.profiles.isDesktopEnvironment == true))
+       assertion = (currentMachine.profiles.isWorkstation && (currentMachine.configurationFlags.graphical == true))
-                 || (!currentMachine.profiles.isWorkstation);
+       || (!currentMachine.profiles.isWorkstation);
        message = "A workstation requires a graphical environement.";
      }
+     {
+       assertion = (currentMachine.profiles.isDesktopEnvironment && (currentMachine.configurationFlags.graphical == true))
+       || (!currentMachine.profiles.isDesktopEnvironment);
+       message = "A desktop station requires a graphical environement.";
+     }
      {
        assertion = (currentMachine.profiles.isDesktopEnvironment && (config.services.xserver.enable == true))
                  || (!currentMachine.profiles.isDesktopEnvironment);

services/default.nix

@@ -4,7 +4,7 @@ let
   #inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 {

services/docker.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.docker {

services/elasticsearch.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.elasticsearch {

services/haveged.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf true {

services/hoogle.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.developpement-haskell {

services/hydra-build.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 # TODO: ménage
 mkIf flags.hydra-builder {

services/hydra-core.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 
 
   #### https://github.com/NixOS/hydra/issues/413

services/kibana.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.kibana {

services/locate.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.locate {

services/monitoring-munin.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 # TODO: changer adresse mail

services/print.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.print {

services/pulseaudio.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.pulseaudio {

services/scanner.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.scanner {

services/ssh.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf true {

services/virtualbox.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.virtualbox {

services/x11.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 /**

services/xmonad/xmonad.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.xmonad {

services/yubikey.nix

@@ -4,7 +4,7 @@ let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in
 
 mkIf true {