on peut se passer de passer lib en paramètre

Makefile

@@ -23,6 +23,9 @@ full-auto: submodules-update upgrade clean optimise
 optimise:
 	$(TIME) nix-store --optimise
 
+rebuild-build:
+	$(TIME) time nixos-rebuild build --fallback  --show-trace
+
 rebuild-switch:
 	$(TIME) time nixos-rebuild switch --fallback  --show-trace
 

README.md

@@ -10,6 +10,20 @@ Une recette dite "config-generator" adapte la configuration selon le nom de la m
 Actuellement, les scripts contiennent un peu de configuration spécifique pour les machines des mainteneurs.
 
 # Notes de mise-à-jour
+
+## pour l'utilisation de l'annuaire (2017-04-28)
+
+* faire les mises à jour de l'OS
+* commiter & pusher l'état des dépôts (au cas où). Pour les différents dépôts `git a`, `git commit` puis `make tag push`
+* mettre à jour les dépôts avec les dernières versions, `make submodules-update`
+* tester la configuration : `nixos-rebuild build`
+* corriger et ajouter les éléments manquant (notamment dans `private/annuaire.nix` )
+* vérifier que `configuration.nix` contient `services.xserver.enable = true;` pour les machines avec interface graphique
+* lorsque tout semble bon, vérifier :
+  * qu'il y a toujours des utilisateurs dans la configuration
+  * que le moyen d'accéder à la machine n'a pas été supprimé (surtout les machines distantes)
+* lancer la commande de build de l'os : `make` :)
+
 ## pour le passage de 16.09 à unstable
 
 * mettre à jour tous les dépôts
@@ -100,7 +114,7 @@ sudo su -
 * formater les partitions
 
 ~~~
-mkfs.ext4 -L nixos /dev/sda1 
+mkfs.ext4 -L nixos /dev/sda1
 swapoff -a
 mkswap /dev/sda2
 swapon -a
@@ -115,7 +129,7 @@ mkdir /etc/nixos
 mkdir /mnt/nix
 mount --bind /mnt/nix/ /nix
 ~~~
-    
+
 
 * installer les paquets nécessaires
 
@@ -149,7 +163,7 @@ exit
 * créer un profil nix pour root & un channel
 
 ~~~
-. ~nix/.nix-profile/etc/profile.d/nix.sh 
+. ~nix/.nix-profile/etc/profile.d/nix.sh
 nix-channel --remove nixpkgs
 nix-channel --add http://nixos.org/channels/nixos-unstable nixos
 nix-channel --update
@@ -167,7 +181,7 @@ nix-env -i vim_configurable
 cat <<EOF > /root/configuration.nix
 { fileSystems."/" = {};
   boot.loader.grub.enable = false;
-} 
+}
 EOF
 export NIX_PATH=nixpkgs=/root/.nix-defexpr/channels/nixos:nixos=/root/.nix-defexpr/channels/nixos/nixos
 export NIXOS_CONFIG=/root/configuration.nix
@@ -214,4 +228,3 @@ notamment le périphérique utilisé par grub
 unset NIXOS_CONFIG
 nixos-install
 ~~~
-

applications/graphical/adminsys.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.graphical {
+mkIf flags.graphical {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/bureau.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf profiles.isDesktopEnvironment {
+mkIf currentMachine.profiles.isDesktopEnvironment {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/bureautique.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.officeSuite && cfg.graphical) {
+mkIf (flags.officeSuite && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/cao.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.conception-assistee && cfg.graphical) {
+mkIf (flags.conception-assistee && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/cartographie.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.cartographie && cfg.graphical) {
+mkIf (flags.cartographie && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/client-internet.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 # TODO: ménage
-mkIf (cfg.internetSuite && cfg.graphical) {
+mkIf (flags.internetSuite && flags.graphical) {
 
 # Paquets
 environment.systemPackages = with pkgs; [
@@ -32,6 +32,7 @@ environment.systemPackages = with pkgs; [
     transmission_remote_gtk
   ];
 
+  /* TODO: voir pour appliquer la personnalisation
   nixpkgs.config.packageOverrides = pkgs: {
     clawsMail = pkgs.clawsMail.override {
       enablePluginFancy = false; # nécessite wekitgtk qui est troué
@@ -43,6 +44,7 @@ environment.systemPackages = with pkgs; [
     };
     mumble = pkgs.mumble.override { pulseSupport = true; };
   };
+  */
 
   #nixpkgs.config.permittedInsecurePackages = [
   #  "webkitgtk-2.4.11"       # pour que le plugin fancy de claws-mail fonctionne

applications/graphical/default-applications.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (true && cfg.graphical) {
+mkIf (true && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/default.nix

@@ -2,9 +2,9 @@
 
 let
   #inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 {

applications/graphical/developpement-elm.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.developpement-elm && cfg.graphical) {
+mkIf (flags.developpement-elm && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/developpement-haskell.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.developpement-haskell && cfg.graphical) {
+mkIf (flags.developpement-haskell && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/developpement-java.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.developpement-java && cfg.graphical) {
+mkIf (flags.developpement-java && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/developpement-jetbrains.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.jetbrains-licensed && cfg.graphical) {
+mkIf (flags.jetbrains-licensed && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/developpement-rust.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.developpement-rust && cfg.graphical) {
+mkIf (flags.developpement-rust && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/developpement.nix

@@ -2,18 +2,18 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.developpement && cfg.graphical) {
+mkIf (flags.developpement && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [
     # Base de données
     pgadmin             # interface d'administration de postgres
-    sqlitebrowser       # interface d'administration de sqlite
+    #sqlitebrowser       # interface d'administration de sqlite
 
     # Documentation
     #zeal                # consulter la documentation hors ligne

applications/graphical/edition-musique.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.edition-musique && cfg.graphical) {
+mkIf (flags.edition-musique && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/edition-photo.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.edition-photo && cfg.graphical) {
+mkIf (flags.edition-photo && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/edition-video.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.edition-video && cfg.graphical) {
+mkIf (flags.edition-video && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/jeux.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.jeux && cfg.graphical) {
+mkIf (flags.jeux && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/multimedia.nix

@@ -2,13 +2,13 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 # TODO ranger le spécifique pulseaudio
-mkIf (cfg.multimediaSuite && cfg.graphical) {
+mkIf (flags.multimediaSuite && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/network.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (true && cfg.graphical) {
+mkIf (true && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/graphical/securite.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf (cfg.securitySuite && cfg.graphical) {
+mkIf (flags.securitySuite && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/adminsys.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {

applications/terminal/bureau.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {

applications/terminal/bureautique.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.officeSuite {
+mkIf flags.officeSuite {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/cao.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.conception-assistee {
+mkIf flags.conception-assistee {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/cartographie.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.cartographie {
+mkIf flags.cartographie {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/client-internet.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 # TODO: ménage
-mkIf cfg.internetSuite {
+mkIf flags.internetSuite {
 
 # Paquets
 environment.systemPackages = with pkgs; [

applications/terminal/default-applications.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {
@@ -32,6 +32,7 @@ mkIf true {
       #python34Packages.glances # monitoring
       pwgen         # générateur de mot de passe
       rtorrent      # TODO outil de téléchargement de torrent & magnet
+      shared_mime_info  # MIME info
       tmux          # nécessaire pour byobu
       tree          # affiche une arborescence de fichiers et dossiers
       usbutils

applications/terminal/default.nix

@@ -2,9 +2,9 @@
 
 let
   #inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 {

applications/terminal/developpement-elm.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.developpement-elm {
+mkIf flags.developpement-elm {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/developpement-haskell.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.developpement-haskell {
+mkIf flags.developpement-haskell {
 
   # Paquets
   environment.systemPackages = with pkgs; [
@@ -23,6 +23,7 @@ mkIf cfg.developpement-haskell {
     ghc-mod
     hindent         # indentation code
     hlint           # qualite de code, analyse statique de code + astuces & bonnes pratiques
+    pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc
     #postgrest       # mapper HTTP <-> PostgreSQL
     stylish-haskell # qualité de code
     turtle	# genre shell-scripting

applications/terminal/developpement-java.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.developpement-java {
+mkIf flags.developpement-java {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/developpement-jetbrains.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.jetbrains-licensed {
+mkIf flags.jetbrains-licensed {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/developpement-rust.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.developpement-rust {
+mkIf flags.developpement-rust {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/developpement.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.developpement {
+mkIf flags.developpement {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/edition-musique.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.edition-musique {
+mkIf flags.edition-musique {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/edition-photo.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.edition-photo {
+mkIf flags.edition-photo {
 
   # Paquets
 environment.systemPackages = with pkgs; [

applications/terminal/edition-video.nix

@@ -2,22 +2,24 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.edition-video {
+mkIf flags.edition-video {
 
   # Paquets
   environment.systemPackages = with pkgs; [
     ffmpeg-full   # assemblage de flux audio & video en ligne de commande
   ];
 
+  /* TODO: voir pour appliquer la personnalisation
   nixpkgs.config.packageOverrides = pkgs: {
     ffmpeg-full = pkgs.ffmpeg-full.override {
       nonfreeLicensing = true;
       nvenc  = true;
     };
   };
+  */
 }

applications/terminal/jeux.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.jeux {
+mkIf flags.jeux {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/multimedia.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.multimediaSuite {
+mkIf flags.multimediaSuite {
 
   # Paquets
   environment.systemPackages = with pkgs; [

applications/terminal/network.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {

applications/terminal/securite.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.securitySuite {
+mkIf flags.securitySuite {
 
   # Paquets
   environment.systemPackages = with pkgs; [

base.nix

@@ -1,16 +1,10 @@
 { config, lib, pkgs, ... }:
 
-let
-  #inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
-in
-
 {
   imports = [
     # moulinette de configuration
-    ./config-generator.nix
+    /*./config-generator.nix*/
+    ./options.nix
 
     # subfolders
     ./applications/graphical/default.nix

config-generator.nix

@@ -6,6 +6,9 @@ let
   pfl = config.r6d.profiles;
   comp = config.r6d.computers;
   host = config.networking.hostName;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 {
@@ -16,95 +19,14 @@ in
   ###### interface
 
   options = {
-
-    #* Utilisé pour afecter des capacités aux machines
-    r6d.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.";
-    };
-
-    #* Utilisé dans les fichiers .nix
-    r6d.config-generator = {
-      #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.";
-      cartographie          = mkEnableOption "Profil pour activer les outils de gestion de données géographiques.";
-      conception-assistee   = mkEnableOption "Profil pour activer les outils de conception électronique & modélisation 3D";
-      database_postgres     = mkEnableOption "Profil pour activer le SGBD PostgreSQL.";
-      developpement         = mkEnableOption "Profil pour activer les outils de développement";
-      developpement-elm     = mkEnableOption "Profil pour activer les outils de développement Elm";
-      developpement-haskell = mkEnableOption "Profil pour activer les outils de développement Haskell";
-      developpement-java    = mkEnableOption "Profil pour activer les outils de développement Java";
-      developpement-rust    = mkEnableOption "Profil pour activer les outils de développement Rust";
-      docker                = mkEnableOption "Profil pour l'utilisation de Docker.";
-      dovecot               = mkEnableOption "Profil pour activer le serveur Dovecot.";
-      dns_autorite          = mkEnableOption "Profil pour servir les fichiers de zone DNS.";
-      dns_resolveur         = mkEnableOption "Profil pour activer un résolveur DNS local.";
-      edition-musique       = mkEnableOption "Profil pour la création/édition de musique.";
-      edition-photo         = mkEnableOption "Profil pour la création/édition de photos.";
-      edition-video         = mkEnableOption "Profil pour la création/édition de video.";
-      elasticsearch         = mkEnableOption "Profil pour activer le service elasticsearch.";
-      fail2ban              = mkEnableOption "Profil pour activer Fail2ban.";
-      graphical             = mkEnableOption "Profil pour activer les applications graphgiques.";
-      hydra-builder         = mkEnableOption "Profil pour une machine qui compile pour hydra.";
-      hydra-core            = mkEnableOption "Profil pour un serveur hydra.";
-      kibana                = mkEnableOption "Profil pour activer le service kibana.";
-      internetSuite         = mkEnableOption "Profil pour la suite de logiciels pour Internet.";
-      jetbrains-licensed    = mkEnableOption "Profil pour la suite de développement Jetbrains payante (sous-ensemble).";
-      jeux                  = mkEnableOption "Profil pour les jeux vidéos.";
-      laptop                = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables.";
-      locate                = mkEnableOption "Profil pour activer la fonction locate.";
-      mailboxes             = mkEnableOption "Profil pour stocker les mails dans des boîtes aux lettres.";
-      multimediaSuite       = mkEnableOption "Profil pour la suite multimédia.";
-      murmur                = mkEnableOption "Profil pour activer un serveur Mumble (murmur)";
-      nix-serve-client      = mkEnableOption "Profil pour que la machine soit un client de cache nix.";
-      nix-serve-server      = mkEnableOption "Profil pour que la machine soit un serveur de cache nix.";
-      nixStoreProxyCache    = mkEnableOption "Profil pour activer le proxy cahce nginx pour le nix store";
-      officeSuite           = mkEnableOption "Profil pour la suite bureautique";
-      print                 = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
-      pulseaudio            = mkEnableOption "Profil pour activer pulseaudio.";
-      rabbitmq              = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
-      radicale              = mkEnableOption "Profil pour activer le service d'hébergement de calendrier + tâches & contacts.";
-      scanner               = mkEnableOption "Profil pour que les scanners soient utilisable.";
-      securitySuite         = mkEnableOption "Profil pour la suite de logiciels de sécurité.";
-      smokeping             = mkEnableOption "Profil pour activer le monitoring réseau par smokeping.";
-      swap                  = mkEnableOption "Profil pour que le swap soit activé.";
-      virtualbox            = mkEnableOption "Profil pour l'utilisation de VirtualBox.";
-      xmonad                = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad.";
-      znc                   = mkEnableOption "Profil pour activer le relais IRC ZNC.";
-
-      tincAddress     = mkOption {
-        default = "";
-        example = "192.168.1.1";
-        description = "Adresse du noeud tinc local";
-        type = lib.types.string;
-      };
-      tincExtraConfig = mkOption {
-        default = "";
-        example = ''
-            Mode = router
-            ConnecTo = bar
-        '';
-        description = "Configuration supplémentaire pour tinc";
-        type = lib.types.string;
-      };
-    };
     #* Utilisé pour avoir des raccourcis de machine
     r6d.computers = {
-      isHydra     = mkEnableOption "Identification du nom de machine.";
       isLatitude  = mkEnableOption "Identification du nom de machine.";
       isMonstre   = mkEnableOption "Identification du nom de machine.";
       isNeoNomade = mkEnableOption "Identification du nom de machine.";
       isNomade    = mkEnableOption "Identification du nom de machine.";
-      isOcean     = mkEnableOption "Identification du nom de machine.";
       isPedro     = mkEnableOption "Identification du nom de machine.";
       isPhenom    = mkEnableOption "Identification du nom de machine.";
-      isRadx      = mkEnableOption "Identification du nom de machine.";
       isRollo     = mkEnableOption "Identification du nom de machine.";
     };
   };
@@ -115,16 +37,6 @@ in
   config = mkMerge
   [
     ## Définition des profils génériques
-    (mkIf pfl.isDesktopEnvironment {
-      r6d.config-generator = {
-        awesome = true;
-        internetSuite = true;
-        multimediaSuite = true;
-        officeSuite = true;
-        pulseaudio = true;
-        securitySuite = true;
-      };
-    })
     (mkIf (pfl.isServer && !comp.isMonstre) {
       r6d.config-generator = {
         #database_postgres = true;
@@ -143,23 +55,8 @@ in
         dns_resolveur = true;
       };
     })
-    (mkIf pfl.isWorkstation {
-      r6d.profiles.isDesktopEnvironment = true;
-
-      r6d.config-generator = {
-        docker = true;
-        graphical = true;
-      };
-    })
 
     ## Profils liés à Dubronetwork
-    (mkIf pfl.isDubronetwork {
-      r6d.config-generator = {
-        auto-upgrade = true;
-        locate = true;
-        print = true;
-      };
-    })
     (mkIf (pfl.isDubronetwork && pfl.isWorkstation) {
       r6d.config-generator = {
         cartographie = true;
@@ -179,104 +76,7 @@ in
       };
     })
 
-    ## Profils liés à Prunetwork
-    (mkIf pfl.isPrunetwork {
-      r6d.config-generator = {
-        auto-upgrade = true;
-        docker = true;
-        locate = true;
-        fail2ban = true;
-        smokeping = true;
-        swap = true;
-      };
-    })
-    (mkIf (pfl.isPrunetwork && 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;
-        hydra-core = false; # DO NOT ENABLE ON WORKSTATION, YOU CAN CRASH YOUR SYSTEM
-        print = true;
-        scanner = true;
-        #virtualbox = true;
-        #xmonad = true;
-      };
-    })
-
-
     ## Affectation des profils aux machines
-    (mkIf comp.isHydra {
-      networking.hostName = "hydra.prunetwork.fr"; # Define your hostname.
-      r6d.profiles = {
-        isPrunetwork = true;
-        isServer = true;
-      };
-
-      r6d.config-generator = {
-        docker = true;
-        hydra-builder = true;
-        hydra-core = true;
-        nix-serve-server = true;
-        tincAddress = "192.168.12.9/24";
-        tincExtraConfig = ''
-          ConnectTo = rollo_dubronetwork_fr
-          ConnectTo = ocean_prunetwork_fr
-        '';
-      };
-    })
-    (mkIf comp.isOcean {
-      networking.hostName = "ocean.prunetwork.fr"; # Define your hostname.
-      r6d.profiles = {
-        isPrunetwork = true;
-        isServer = true;
-      };
-
-      r6d.config-generator = {
-        docker = true;
-        hydra-builder = true;
-        radicale = true;
-        nix-serve-client = true;
-        nix-serve-server = true;
-        tincAddress = "192.168.12.6/24";
-        tincExtraConfig = ''
-          ConnectTo = hydra_prunetwork_fr
-          ConnectTo = rollo_dubronetwork_fr
-        '';
-      };
-    })
-    (mkIf comp.isRadx {
-      networking.hostName = "radx.prunetwork.fr"; # Define your hostname.
-      r6d.profiles = {
-        isPrunetwork = true;
-        isWorkstation = true;
-      };
-
-      r6d.config-generator = {
-        database_postgres = true;
-        elasticsearch = true;
-        #hydra-core = false; # DO NOT ENABLE ON WORKSTATION
-        kibana = true;
-        nix-serve-client = true;
-        nix-serve-server = true;
-        #rabbitmq = true;
-        tincAddress = "192.168.12.3/24";
-        tincExtraConfig = ''
-          ConnectTo = monstre_dubronetwork_fr
-          ConnectTo = rollo_dubronetwork_fr
-          ConnectTo = hydra_prunetwork_fr
-          ConnectTo = ocean_prunetwork_fr
-        '';
-        virtualbox = true;
-      };
-    })
 
     (mkIf comp.isLatitude {
       networking.hostName = "latitude.dubronetwork.fr"; # Define your hostname.
@@ -299,27 +99,7 @@ in
         '';
       };
     })
-    (mkIf comp.isMonstre {
-      networking.hostName = "monstre.dubronetwork.fr"; # Define your hostname.
-      r6d.profiles = {
-        isDubronetwork = true;
-        isServer = true;
-      };
 
-      r6d.config-generator = {
-        fail2ban = true;
-        murmur = true;
-        nix-serve-client = true;
-        nix-serve-server = true;
-        nixStoreProxyCache = true;
-        tincAddress = "192.168.12.4/24";
-        tincExtraConfig = ''
-          ConnectTo = rollo_dubronetwork_fr
-          ConnectTo = hydra_prunetwork_fr
-          ConnectTo = ocean_prunetwork_fr
-        '';
-      };
-    })
     (mkIf comp.isNeoNomade{
       networking.hostName = "neo-nomade.dubronetwork.fr"; # Define your hostname.
       r6d.profiles = {

configuration/auto-upgrade.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.auto-upgrade {
+mkIf flags.auto-upgrade {
 
   # Automatic update & automatic clean
 

configuration/awesome.nix

@@ -2,13 +2,13 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 # TODO: rc.lua par défaut (système)
-mkIf cfg.awesome {
+mkIf flags.awesome {
 
   environment.variables = {
     # Export the current path for the awesome derivation, useful for users rc.lua

configuration/default.nix

@@ -2,9 +2,9 @@
 
 let
   #inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 {

configuration/environment.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 # TODO: ménage

configuration/laptop.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.laptop {
+mkIf flags.laptop {
 
   # Gestion spécifique pour PC portable
 

configuration/localisation.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {

configuration/network-ipv6.nix

@@ -2,15 +2,15 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {
 
   # Utilisation d'adresse IPv6 temporaire
-  
+
   ## https://blog.linitx.com/control-privacy-addressing-ipv6-linux/
   ## http://www.tldp.org/HOWTO/Linux+IPv6-HOWTO/x1092.html
 

configuration/network.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {
@@ -12,8 +12,8 @@ mkIf true {
   # fix: Hostname -s renvoie "Unknown host" alors que hostname renvoie la bonne valeur
   #      Il s'avère que hostname vérifie la validité du FQDN et du reverse.
   #      Fixer ces paramètres dans les hosts permet de faire tomber en marche
-  networking.extraHosts = ''                                                                                                                                                                                                                                                 
-    127.0.0.1   ${config.networking.hostName}                                                                                                                                                                                                                             
+  networking.extraHosts = ''
+    127.0.0.1   ${config.networking.hostName}
   '';
 
   boot.kernel.sysctl = {

configuration/swap.nix

@@ -2,15 +2,15 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.swap {
+mkIf flags.swap {
 
   # Gestion du swap
-  
+
   # https://en.wikipedia.org/wiki/Swappiness
   boot.kernel.sysctl = {
     # le swap est activé (!= 0)

configuration/udev.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf false {

lib.nix

@@ -0,0 +1,30 @@
+let
+  lib = with import <nixpkgs> {}; pkgs.lib;
+
+  profiles = {
+    isDesktopEnvironment = {
+      awesome = true;
+      internetSuite = true;
+      multimediaSuite = true;
+      officeSuite = true;
+      pulseaudio = true;
+      securitySuite = true;
+    };
+    isWorkstation = {
+      graphical = true;
+      docker = true;
+    };
+    isServer = {
+    };
+  };
+
+in
+
+rec {
+  applyProfilesToDirectory = customProfiles: directory:
+    lib.mapAttrs (applyProfilesToMachine customProfiles) directory;
+
+  applyProfilesToMachine = customProfiles: machineName: machineOptions:
+    machineOptions;
+    #lib.recursiveUpdate {} machineOptions;
+}

module-template.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {

onchange

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+EXCLUSION="~$|swp$|swo$"
+
+while inotifywait --exclude $EXCLUSION -r -e modify .
+do
+	$@
+done

options.nix

@@ -0,0 +1,181 @@
+{ config, lib, pkgs, r6d, ... }:
+let
+  inherit (lib) mkEnableOption mkTextOption mkIf mkMerge mkOption singleton types;
+
+  # TODO: Anglish :)
+  machineOptions = types.submodule {
+    options = {
+
+      configuration-flags = {
+        #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.";
+        cartographie          = mkEnableOption "Profil pour activer les outils de gestion de données géographiques.";
+        conception-assistee   = mkEnableOption "Profil pour activer les outils de conception électronique & modélisation 3D";
+        database_postgres     = mkEnableOption "Profil pour activer le SGBD PostgreSQL.";
+        developpement         = mkEnableOption "Profil pour activer les outils de développement";
+        developpement-elm     = mkEnableOption "Profil pour activer les outils de développement Elm";
+        developpement-haskell = mkEnableOption "Profil pour activer les outils de développement Haskell";
+        developpement-java    = mkEnableOption "Profil pour activer les outils de développement Java";
+        developpement-rust    = mkEnableOption "Profil pour activer les outils de développement Rust";
+        docker                = mkEnableOption "Profil pour l'utilisation de Docker.";
+        dovecot               = mkEnableOption "Profil pour activer le serveur Dovecot.";
+        dns_autorite          = mkEnableOption "Profil pour servir les fichiers de zone DNS.";
+        dns_resolveur         = mkEnableOption "Profil pour activer un résolveur DNS local.";
+        edition-musique       = mkEnableOption "Profil pour la création/édition de musique.";
+        edition-photo         = mkEnableOption "Profil pour la création/édition de photos.";
+        edition-video         = mkEnableOption "Profil pour la création/édition de video.";
+        elasticsearch         = mkEnableOption "Profil pour activer le service elasticsearch.";
+        fail2ban              = mkEnableOption "Profil pour activer Fail2ban.";
+        graphical             = mkEnableOption "Profil pour activer les applications graphgiques.";
+        hydra-builder         = mkEnableOption "Profil pour une machine qui compile pour hydra.";
+        hydra-core            = mkEnableOption "Profil pour un serveur hydra.";
+        kibana                = mkEnableOption "Profil pour activer le service kibana.";
+        internetSuite         = mkEnableOption "Profil pour la suite de logiciels pour Internet.";
+        jetbrains-licensed    = mkEnableOption "Profil pour la suite de développement Jetbrains payante (sous-ensemble).";
+        jeux                  = mkEnableOption "Profil pour les jeux vidéos.";
+        laptop                = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables.";
+        locate                = mkEnableOption "Profil pour activer la fonction locate.";
+        mailboxes             = mkEnableOption "Profil pour stocker les mails dans des boîtes aux lettres.";
+        multimediaSuite       = mkEnableOption "Profil pour la suite multimédia.";
+        munin                 = mkEnableOption "Profil pour activer la supervision par Munin";
+        murmur                = mkEnableOption "Profil pour activer un serveur Mumble (murmur)";
+        nix-serve-server      = mkEnableOption "Profil pour que la machine soit un serveur de cache nix.";
+        nixStoreProxyCache    = mkEnableOption "Profil pour activer le proxy cahce nginx pour le nix store";
+        officeSuite           = mkEnableOption "Profil pour la suite bureautique";
+        print                 = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
+        pulseaudio            = mkEnableOption "Profil pour activer pulseaudio.";
+        rabbitmq              = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
+        radicale              = mkEnableOption "Profil pour activer le service d'hébergement de calendrier + tâches & contacts.";
+        rmilter               = mkEnableOption "Profil pour activer le filtrage de mails par postfix.";
+        scanner               = mkEnableOption "Profil pour que les scanners soient utilisable.";
+        securitySuite         = mkEnableOption "Profil pour la suite de logiciels de sécurité.";
+        smokeping             = mkEnableOption "Profil pour activer le monitoring réseau par smokeping.";
+        swap                  = mkEnableOption "Profil pour que le swap soit activé.";
+        virtualbox            = mkEnableOption "Profil pour l'utilisation de VirtualBox.";
+        xmonad                = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad.";
+        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.";
+      };
+
+      ipAddress = mkOption {
+        description = "Adresse IP";
+        type = lib.types.string;
+      };
+      nix-serve-server = mkEnableOption "nix-serve server";
+      nix-serve-client = {
+        enable =  mkEnableOption "nix-serve client";
+        servers = mkOption {
+          default = [ https://cache.nixos.org/ ];
+          description = "List of nix-serve servers providing binary caches.";
+          type = types.listOf types.str;
+        };
+      };
+
+      tinc = {
+        enable = mkEnableOption "Enable tinc service";
+        connectToAddress = mkOption {
+          default = "";
+          example = "192.168.1.1";
+          description = "External address to connect from another node.";
+          type = lib.types.string;
+        };
+        vpnAddress = mkOption {
+          example = "192.168.69.69/24";
+          description = "VPN local node IP address.";
+          type = lib.types.string;
+        };
+        vpnCidrLength = mkOption {
+          default = 24;
+          example = 24;
+          description = "VPN netmask length.";
+          type = lib.types.int;
+        };
+        extraConfig = mkOption {
+          default = "";
+          example = ''
+              Mode = router
+              ConnecTo = bar
+          '';
+          description = "Configuration supplémentaire pour tinc";
+          type = lib.types.string;
+        };
+      };
+
+      windowsBoot = {
+        enable = mkEnableOption "Activation du démarrage de Windows par Grub";
+        drive = mkOption {
+          description = "Lecteur sur lequel est présent le système Windows (au format GRUB)";
+          type = lib.types.string;
+          default = "hd0,1";
+        };
+      };
+      windowsMount ={
+        enable = mkEnableOption "Montage de la partition data Windows";
+        device = mkOption {
+          description = "Lecteur sur lequel est présent le disque de data Windows";
+          type = lib.types.string;
+          default = "/dev/sda2";
+        };
+      };
+    };
+  };
+
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
+in
+
+{
+  options = {
+    r6d.machines = mkOption {
+      type = types.attrsOf machineOptions;
+      description = ''
+          Machines directory.
+      '';
+    };
+  };
+
+  config = {
+    /**
+     prototype : (expression A ) && tests || !(expression A) ->   réalise le test si A est satisfait, et continue sinon = pas de politique
+    */
+    assertions = [
+     {
+       assertion = (currentMachine.profiles.isWorkstation && (currentMachine.profiles.isDesktopEnvironment == true))
+                 || (!currentMachine.profiles.isWorkstation);
+       message = "A workstation requires a graphical environement.";
+     }
+     {
+       assertion = (currentMachine.profiles.isDesktopEnvironment && (config.services.xserver.enable == true))
+                 || (!currentMachine.profiles.isDesktopEnvironment);
+       message = "You need to enable xserver manually.";
+     }
+     {
+       assertion = (currentMachine.profiles.isServer  && (currentMachine.profiles.isDesktopEnvironment == false))
+                 || (!currentMachine.profiles.isServer);
+       message = "A graphical environment is not required for a server.";
+     }
+     {
+       /*  At least one (authorité or resolveur) */
+       assertion = flags.dns_autorite || flags.dns_resolveur;
+       message = "DNS service is disabled. You must enable a dns recursor or autoritative.";
+     }
+     {
+       /*  authorité xor resolveur */
+       assertion = (flags.dns_autorite && ! flags.dns_resolveur)
+                 || (!flags.dns_autorite && flags.dns_resolveur);
+       message = "Both authoritative and recursor DNS services can't be live simultaneously. Choose only one!";
+     }
+    ];
+  };
+}

services/default.nix

@@ -2,9 +2,9 @@
 
 let
   #inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 {
@@ -13,23 +13,25 @@ in
     ./haveged.nix
     ./monitoring-munin.nix
     ./ssh.nix
+    ./yubikey.nix
 
     # commandées par config-generator
     ## option de configuration spécifique
-    ./print.nix                     # configuration de base de cups
-    ./docker.nix                # activer docker
+    ./print.nix             # configuration de base de cups
+    ./docker.nix            # activer docker
     ./elasticsearch.nix     # service de stockage et recher de données
     ./hoogle.nix            # service hoogle pour haskell
     ./hydra-build.nix       # service de construction de paquet. -> la machine compile des paquets
     ./hydra-core.nix        # service pour l'instance d'hydra
     ./kibana.nix            # service de visualisation de données stockées dans elasticsearch
-    ./locate.nix            # service locate
-    ./virtualbox.nix            # activer virtualbox
-    ./xmonad/xmonad.nix             # pour le gestionaire de fenêtre xmonad
+    # TODO: réactiver locate
+    #./locate.nix            # service locate
+    ./virtualbox.nix        # activer virtualbox
+    ./xmonad/xmonad.nix     # pour le gestionaire de fenêtre xmonad
 
     ## if isDesktop
     ./pulseaudio.nix        # activation du serveur audio
-    ./scanner.nix          # utilisation d'un scanner
+    ./scanner.nix           # utilisation d'un scanner
     ./x11.nix               # activation du serveur graphique X
   ];
 }

services/docker.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.docker {
+mkIf flags.docker {
 
   # Paquets
   environment.systemPackages = with pkgs; [

services/elasticsearch.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.elasticsearch {
+mkIf flags.elasticsearch {
 
   # Paquets
   environment.systemPackages = with pkgs; [

services/haveged.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {

services/hoogle.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.developpement-haskell {
+mkIf flags.developpement-haskell {
 
   services.hoogle = {
     enable = true;

services/hydra-build.nix

@@ -2,31 +2,41 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 # TODO: ménage
-mkIf cfg.hydra-builder {
+mkIf flags.hydra-builder {
 
   # Paquets
   environment.systemPackages = with pkgs; [
-    qemu
     kvm
+    qemu
+    virtualbox
   ];
 
   # Services
 
   ## Services de virtualisation utilisé pour les tests hydra
-  virtualisation.docker.enable = true;
-  virtualisation.libvirtd.enable = true;
-  virtualisation.libvirtd.enableKVM = true;
-  #virtualisation.virtualbox.guest.enable = true;
-  virtualisation.virtualbox.host.enable = true;
-  virtualisation.virtualbox.host.headless = true;
+  virtualisation = {
+    docker.enable = true;
+    libvirtd = {
+      enable = true;
+      enableKVM = true;
+    };
+    virtualbox = {
+      #guest.enable = true;
+      host.enable = true;
+      host.headless = true;
+    };
+  };
 
-  ## Ménage automatique tous les jours
-  nix.gc.automatic = true;
+  ## Ménage automatique tous les jours - Frequent garbage collection is a good idea for build machines.
+  nix.gc = {
+    automatic = true;
+    dates = "*:0/30";
+  };
 
   # users.users."hydrabld" = {
   #   description = "Execution des jobs hydra";

services/hydra-core.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 
 
   #### https://github.com/NixOS/hydra/issues/413
@@ -23,7 +23,7 @@ let
   # hydra-queue-runner --status | json_pp
 in
 # TODO: passe de ménage
-mkIf cfg.hydra-core {
+mkIf flags.hydra-core {
 
   # Paquets
   environment.systemPackages = with pkgs; [

services/kibana.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.kibana {
+mkIf flags.kibana {
 
   # Paquets
   environment.systemPackages = with pkgs; [

services/locate.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.locate {
+mkIf flags.locate {
 
   # Services
   services.locate = {

services/monitoring-munin.nix

@@ -2,14 +2,13 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-# TODO: ajouter option
 # TODO: changer adresse mail
-mkIf true {
+mkIf flags.munin {
 
   # Paquets
   environment.systemPackages = with pkgs; [

services/print.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.print {
+mkIf flags.print {
 
   # Services
   ## Enable CUPS to print documents.

services/pulseaudio.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.pulseaudio {
+mkIf flags.pulseaudio {
 
   # Pulse Audio
   hardware.pulseaudio = {

services/scanner.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.scanner {
+mkIf flags.scanner {
 
   # Paquets
   environment.systemPackages = with pkgs; [

services/ssh.nix

@@ -2,9 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {

services/virtualbox.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.virtualbox {
+mkIf flags.virtualbox {
 
   # Paquets
   environment.systemPackages = with pkgs; [

services/x11.nix

@@ -2,17 +2,20 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf profiles.isDesktopEnvironment {
+/**
+ * Il faut activer `services.xserver.enable = true;` dans configuration.nix
+ */
+mkIf currentMachine.profiles.isDesktopEnvironment {
 
   # Services
   # Enable the X11 windowing system.
   services.xserver = {
-    enable = true;
+    # enable = true;
     layout = "fr";
     xkbOptions = "eurosign:e";
     displayManager.lightdm.enable = true;

services/xmonad/xmonad.nix

@@ -2,12 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.xmonad {
+mkIf flags.xmonad {
 
   # Paquets
   environment.systemPackages = with pkgs; [

services/yubikey.nix

@@ -0,0 +1,42 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
+in
+
+mkIf true {
+
+  # Services
+  # https://github.com/NixOS/nixpkgs/issues/15960
+
+  services = {
+    pcscd.enable = true;
+
+    udev.packages = with pkgs; [
+      libu2f-host
+      yubikey-personalization
+    ];
+
+    xserver.displayManager.sessionCommands = ''
+      # https://github.com/NixOS/nixpkgs/commit/5391882ebd781149e213e8817fba6ac3c503740c
+      gpg-connect-agent /bye
+      GPG_TTY=$(tty)
+      export GPG_TTY
+    '';
+  };
+  users.extraGroups.yubikey = {};
+
+  environment.systemPackages = with pkgs; [
+    gnupg opensc pcsctools libu2f-host yubikey-personalization
+  ];
+
+  security.pam.enableU2F = true;
+
+  /*users.extraUsers.joko = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "input" "audio" "video" ];
+  };*/
+}