regroupement des options éparses en configurationOptions et renommage

8 years ago · ac91ce4492
parent c43adc80cb
commit ac91ce4492
74 changed files with 91 additions and 89 deletions
--- a/applications/graphical/adminsys.nix
+++ b/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 {
--- a/applications/graphical/bureau.nix
+++ b/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 {
--- a/applications/graphical/bureautique.nix
+++ b/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) {
--- a/applications/graphical/cao.nix
+++ b/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) {
--- a/applications/graphical/cartographie.nix
+++ b/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) {
--- a/applications/graphical/client-internet.nix
+++ b/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) {
--- a/applications/graphical/default-applications.nix
+++ b/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) {
--- a/applications/graphical/default.nix
+++ b/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

 {
--- a/applications/graphical/developpement-elm.nix
+++ b/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) {
--- a/applications/graphical/developpement-haskell.nix
+++ b/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) {
--- a/applications/graphical/developpement-java.nix
+++ b/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) {
--- a/applications/graphical/developpement-jetbrains.nix
+++ b/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) {
--- a/applications/graphical/developpement-rust.nix
+++ b/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) {
--- a/applications/graphical/developpement.nix
+++ b/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) {
--- a/applications/graphical/edition-musique.nix
+++ b/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) {
--- a/applications/graphical/edition-photo.nix
+++ b/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) {
--- a/applications/graphical/edition-video.nix
+++ b/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) {
--- a/applications/graphical/jeux.nix
+++ b/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) {
--- a/applications/graphical/multimedia.nix
+++ b/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
--- a/applications/graphical/network.nix
+++ b/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) {
--- a/applications/graphical/securite.nix
+++ b/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) {
--- a/applications/terminal/adminsys.nix
+++ b/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 {
--- a/applications/terminal/bureau.nix
+++ b/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 {
--- a/applications/terminal/bureautique.nix
+++ b/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 {
--- a/applications/terminal/cao.nix
+++ b/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 {
--- a/applications/terminal/cartographie.nix
+++ b/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 {
--- a/applications/terminal/client-internet.nix
+++ b/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 {
--- a/applications/terminal/default-applications.nix
+++ b/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 {
--- a/applications/terminal/default.nix
+++ b/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

 {
--- a/applications/terminal/developpement-elm.nix
+++ b/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 {
--- a/applications/terminal/developpement-haskell.nix
+++ b/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 {
--- a/applications/terminal/developpement-java.nix
+++ b/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 {
--- a/applications/terminal/developpement-jetbrains.nix
+++ b/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 {
--- a/applications/terminal/developpement-rust.nix
+++ b/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 {
--- a/applications/terminal/developpement.nix
+++ b/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 {
--- a/applications/terminal/edition-musique.nix
+++ b/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 {
--- a/applications/terminal/edition-photo.nix
+++ b/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 {
--- a/applications/terminal/edition-video.nix
+++ b/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 {
--- a/applications/terminal/jeux.nix
+++ b/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 {
--- a/applications/terminal/multimedia.nix
+++ b/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 {
--- a/applications/terminal/network.nix
+++ b/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 {
--- a/applications/terminal/securite.nix
+++ b/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 {
--- a/config-generator.nix
+++ b/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

 {
--- a/configuration/auto-upgrade.nix
+++ b/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 {
--- a/configuration/awesome.nix
+++ b/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)
--- a/configuration/default.nix
+++ b/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

 {
--- a/configuration/environment.nix
+++ b/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
--- a/configuration/laptop.nix
+++ b/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 {
--- a/configuration/localisation.nix
+++ b/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 {
--- a/configuration/network-ipv6.nix
+++ b/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 {
--- a/configuration/network.nix
+++ b/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 {
--- a/configuration/swap.nix
+++ b/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 {
--- a/configuration/udev.nix
+++ b/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 {
--- a/lib.nix
+++ b/lib.nix
@ -5,13 +5,13 @@ let
    isDesktopEnvironment = {
      awesome = true;
      internetSuite = true;
+      graphical = true;
      multimediaSuite = true;
      officeSuite = true;
      pulseaudio = true;
      securitySuite = true;
    };
    isWorkstation = {
-      graphical = true;
      docker = true;
    };
    #isServer = {
@ -27,9 +27,8 @@ with lib; rec{

  # Apply the profiles (pre-defined + custom) to a machine
  applyProfilesToMachine = customProfiles: machineName: machineOptions:
-  { configuration-flags = lib.recursiveUpdate (generateFlagsSet customProfiles machineOptions.profiles) machineOptions.configuration-flags;
-    ipAddress = machineOptions.ipAddress;
-    tinc = machineOptions.tinc;
+  { configurationFlags = lib.recursiveUpdate (generateFlagsSet customProfiles machineOptions.profiles) machineOptions.configurationFlags;
+    configurationOptions = machineOptions.configurationOptions;
    profiles = machineOptions.profiles;
  };

--- a/module-template.nix
+++ b/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 {
--- a/options.nix
+++ b/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 = {
-        # 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.";
-      };
+      configurationOptions = {

      ipAddress = mkOption {
        description = "Adresse IP";
@ -128,11 +120,22 @@ let
        };
      };
    };
+
+      profiles = {
+        # 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.";
+      };
+    };
  };

  annuaire = config.r6d.machines;
  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configuration-flags;
+  flags = currentMachine.configurationFlags;
 in

 {
@ -151,8 +154,8 @@ in
    */
    assertions = [
     {
-       assertion = (currentMachine.profiles.isWorkstation && (currentMachine.profiles.isDesktopEnvironment == true))
-                 || (!currentMachine.profiles.isWorkstation);
+       assertion = (currentMachine.profiles.isDesktopEnvironment && (currentMachine.configurationFlags.graphical == true))
+       || (!currentMachine.profiles.isDesktopEnvironment);
       message = "A workstation requires a graphical environement.";
     }
     {
--- a/services/default.nix
+++ b/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

 {
--- a/services/docker.nix
+++ b/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 {
--- a/services/elasticsearch.nix
+++ b/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 {
--- a/services/haveged.nix
+++ b/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 {
--- a/services/hoogle.nix
+++ b/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 {
--- a/services/hydra-build.nix
+++ b/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 {
--- a/services/hydra-core.nix
+++ b/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
--- a/services/kibana.nix
+++ b/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 {
--- a/services/locate.nix
+++ b/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 {
--- a/services/monitoring-munin.nix
+++ b/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
--- a/services/print.nix
+++ b/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 {
--- a/services/pulseaudio.nix
+++ b/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 {
--- a/services/scanner.nix
+++ b/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 {
--- a/services/ssh.nix
+++ b/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 {
--- a/services/virtualbox.nix
+++ b/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 {
--- a/services/x11.nix
+++ b/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

 /**
--- a/services/xmonad/xmonad.nix
+++ b/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 {
--- a/services/yubikey.nix
+++ b/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 {