migration config rollo sur annuaire

ghc-mod fonctionne à nouveau
voir les différences entre la configuration actuelle et /etc/nixos/configuration.nix
2017-07-15 12:44:26 +02:00 · 2017-07-14 17:03:47 +02:00 · 2017-07-05 22:51:29 +02:00 · 2017-07-05 22:50:26 +02:00 · 2017-07-05 22:50:02 +02:00 · 2017-07-05 22:02:33 +02:00
85 changed files with 796 additions and 707 deletions
--- a/9
+++ b/9
@@ -23,9 +23,15 @@ 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

+show-diff-with-current:
+	-diff /run/current-system/configuration.nix /etc/nixos/configuration.nix
+
 show-roots:
 	nix-store --gc --print-roots

@@ -41,6 +47,9 @@ download-sources:
 	# https://nixos.org/wiki/Download_all_sources
 	nix-store -r $$(grep -l outputHash $$(nix-store -qR $$(nix-instantiate '<nixpkgs>' -A geeqie) | grep '.drv$$'))

+build-iso:
+	nix-build '<nixpkgs/nixos>' -A config.system.build.isoImage -I nixos-config=/etc/nixos/base/iso-image/livecd-minimal.nix
+
 ##--------- Commandes spécifiques pour GIT

 push: submodules-push
--- a/README.md
+++ b/README.md
@@ -10,6 +10,21 @@ 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`
+* vérifier que `configuration.nix` contient `services.xserver.enable = true;` pour les machines avec interface graphique
+* vérifier que `configuration.nix` contient le nom de la machine `networking.hostName = "<X>";`
+* tester la configuration : `nixos-rebuild build`
+* corriger et ajouter les éléments manquant (notamment dans `private/annuaire.nix` )
+* 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 +115,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 +130,7 @@ mkdir /etc/nixos
 mkdir /mnt/nix
 mount --bind /mnt/nix/ /nix
 ~~~
-    
+

 * installer les paquets nécessaires

@@ -149,7 +164,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 +182,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 +229,3 @@ notamment le périphérique utilisé par grub
 unset NIXOS_CONFIG
 nixos-install
 ~~~
-
--- a/applications/graphical/adminsys.nix
+++ b/applications/graphical/adminsys.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.configurationFlags;
 in

-mkIf cfg.graphical {
+mkIf flags.graphical {

  # Paquets
  environment.systemPackages = with pkgs; [
     # Gestion de FS
-     parted       # Gestion graphique de partitions
+     gparted       # Gestion graphique de partitions
     unetbootin    # création de clefs USB bootables
+
+     # visualisation de log
+     #logstalgia
  ];
 }
--- a/applications/graphical/bureau.nix
+++ b/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.configurationFlags;
 in

-mkIf profiles.isDesktopEnvironment {
+mkIf currentMachine.profiles.isDesktopEnvironment {

  # Paquets
  environment.systemPackages = with pkgs; [
@@ -24,12 +24,14 @@ mkIf profiles.isDesktopEnvironment {
    gnome3.adwaita-icon-theme  # thème d'icone - semble fonctionner avec spaceFM

    ## Manipulation de fichier
-    pcmanfm         # gestionnaire de fichiers graphique
-    spaceFM         # gestionnaire de fichiers graphique
-    #vifm            # gestionnaire de fichiers basé sur VIM (console)
+    #kde5.dolphin          # gestionnaire de fichiers graphique
+    #kde5.dolphin-plugins  # gestionnaire de fichiers graphique
+    pcmanfm               # gestionnaire de fichiers graphique
+    spaceFM               # gestionnaire de fichiers graphique
+    #vifm                  # gestionnaire de fichiers basé sur VIM (console)

    ## Terminal
-    sakura          # terminal
+    sakura                # terminal
  ];

  # Polices supplémentaires
--- a/applications/graphical/bureautique.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.officeSuite && cfg.graphical) {
+mkIf (flags.officeSuite && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/cao.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.conception-assistee && cfg.graphical) {
+mkIf (flags.conception-assistee && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/cartographie.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.cartographie && cfg.graphical) {
+mkIf (flags.cartographie && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/client-internet.nix
+++ b/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.configurationFlags;
 in
-# TODO: ménage
-mkIf (cfg.internetSuite && cfg.graphical) {
+
+mkIf (flags.internetSuite && flags.graphical) {

 # Paquets
 environment.systemPackages = with pkgs; [
@@ -20,7 +20,6 @@ environment.systemPackages = with pkgs; [
    ## Mail & Discussion (texte, audio)
    clawsMail
    hexchat
-    quassel
    quasselClient
    mumble
    pidgin
@@ -32,6 +31,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 +43,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
--- a/applications/graphical/default-applications.nix
+++ b/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.configurationFlags;
 in

-mkIf (true && cfg.graphical) {
+mkIf (true && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/default.nix
+++ b/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.configurationFlags;
 in

 {
--- a/applications/graphical/developpement-elm.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.developpement-elm && cfg.graphical) {
+mkIf (flags.developpement-elm && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/developpement-haskell.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.developpement-haskell && cfg.graphical) {
+mkIf (flags.developpement-haskell && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/developpement-java.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.developpement-java && cfg.graphical) {
+mkIf (flags.developpement-java && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/developpement-jetbrains.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.jetbrains-licensed && cfg.graphical) {
+mkIf (flags.jetbrains-licensed && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/developpement-rust.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.developpement-rust && cfg.graphical) {
+mkIf (flags.developpement-rust && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/developpement.nix
+++ b/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.configurationFlags;
 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
--- a/applications/graphical/edition-musique.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.edition-musique && cfg.graphical) {
+mkIf (flags.edition-musique && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/edition-photo.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.edition-photo && cfg.graphical) {
+mkIf (flags.edition-photo && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/edition-video.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.edition-video && cfg.graphical) {
+mkIf (flags.edition-video && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/jeux.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.jeux && cfg.graphical) {
+mkIf (flags.jeux && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/multimedia.nix
+++ b/applications/graphical/multimedia.nix
@@ -2,20 +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.configurationFlags;
 in

-# TODO ranger le spécifique pulseaudio
-mkIf (cfg.multimediaSuite && cfg.graphical) {
+mkIf (flags.multimediaSuite && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
-    ## Audio
-    paprefs       # préferences pulseaudio
-    pavucontrol   # mixer pulseaudio
-
    ## Video
    smplayer      # lecteur vidéo
    vlc           # lecteur vidéo
--- a/applications/graphical/network.nix
+++ b/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.configurationFlags;
 in

-mkIf (true && cfg.graphical) {
+mkIf (true && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/graphical/securite.nix
+++ b/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.configurationFlags;
 in

-mkIf (cfg.securitySuite && cfg.graphical) {
+mkIf (flags.securitySuite && flags.graphical) {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/terminal/adminsys.nix
+++ b/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.configurationFlags;
 in

 mkIf true {
@@ -12,7 +12,9 @@ mkIf true {
  # Paquets
  environment.systemPackages = with pkgs; [
    # Adminsys
+    bind          # utilisé pour les utilitaires comme dig
    cowsay        # pour ansible & 4lulz
+    dhcp          # client dhcp
    iotop
    lm_sensors
    lshw
@@ -27,6 +29,7 @@ mkIf true {

    # Backup
    duplicity     # création de sauvegarde chiffrées (GPG)
+    par2cmdline   # outil de récupération de fichiers corrompus - .par2

    # Compression
    lz4
@@ -47,7 +50,7 @@ mkIf true {

    ## Exploitation FS
    inotify-tools # être notifié lorsque le contenu d'un répertoire change
-    detox			# The detox utility renames files to make them easier to work with.
+    detox			    # The detox utility renames files to make them easier to work with.
    duff          # outil de recherche de fichiers en doublons
    rdfind        # recherche de fichiers doublons pour remplacement par hard/soft link
  ];
--- a/applications/terminal/bureau.nix
+++ b/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.configurationFlags;
 in

 mkIf true {
--- a/applications/terminal/bureautique.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.officeSuite {
+mkIf flags.officeSuite {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/terminal/cao.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.conception-assistee {
+mkIf flags.conception-assistee {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/terminal/cartographie.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.cartographie {
+mkIf flags.cartographie {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/terminal/client-internet.nix
+++ b/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.configurationFlags;
 in
-# TODO: ménage
-mkIf cfg.internetSuite {
+
+mkIf flags.internetSuite {

 # Paquets
 environment.systemPackages = with pkgs; [
@@ -15,10 +15,16 @@ environment.systemPackages = with pkgs; [

    ## Réseaux sociaux
    #python27Packages.turses           # client twitter en ncurse
-    python27Packages.rainbowstream    # client twitter en console
-    rtv                               # client reddit en console
+    #python27Packages.rainbowstream    # client twitter en console
+    #rtv                               # client reddit en console

    ## Mail & Discussion (texte, audio)
    mutt
+
+    ## Sauvegarde nuagique (cloud storage)
+    #rclone
+
+    ## P2P
+    rtorrent      # outil de téléchargement de torrent & magnet
  ];
 }
--- a/applications/terminal/default-applications.nix
+++ b/applications/terminal/default-applications.nix
@@ -2,36 +2,30 @@

 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.configurationFlags;
 in

 mkIf true {

  # Paquets
  environment.systemPackages = with pkgs; [
-      bind          # utilisé pour les utilitaires comme dig
-      byobu         # permet de se déconnecter d'un terminal sans l'aréter
-      dhcp          # client dhcp
-      git gitAndTools.gitSVN gitAndTools.tig gti # outil de gestion de version
+      byobu         # permet de se déconnecter d'un terminal sans l'arréter
+      git gitAndTools.tig gti # outil de gestion de version
      gnumake       # pour décrire les recettes de compilation
      gnupg         # GPG
-      gpm           # prise en charge de la souris en console
      htop          # monitoring
-      lsb-release   # pour les scripts qui utilisent cet outil
+      lsb-release   # pour les scripts qui utilisent cet outil (dont byobu)
      #libressl      # librairie pour faire du TLS et les algorithmes de crypto par OpenBSD
      ncdu          # outil pour voir l'espace utilisé
-      par2cmdline   # outil de récupération de fichiers corrompus - .par2
      p7zip         # compression de fichier
      parted        # partitionnement de disque
      pciutils
      pinentry      # pour taper les mots de passe gpg
      psmisc        # fournis les utilitaires comme killall, fuser, pstree
-      python        # python -- python -m SimpleHTTPServer 8000
-      #python34Packages.glances # monitoring
-      pwgen         # générateur de mot de passe
-      rtorrent      # TODO outil de téléchargement de torrent & magnet
+      #python        # python -- python -m SimpleHTTPServer 8000
+      shared_mime_info  # MIME info
      tmux          # nécessaire pour byobu
      tree          # affiche une arborescence de fichiers et dossiers
      usbutils
--- a/applications/terminal/default.nix
+++ b/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.configurationFlags;
 in

 {
--- a/applications/terminal/developpement-elm.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.developpement-elm {
+mkIf flags.developpement-elm {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/terminal/developpement-haskell.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.developpement-haskell {
+mkIf flags.developpement-haskell {

  # Paquets
  environment.systemPackages = with pkgs; [
@@ -18,16 +18,17 @@ mkIf cfg.developpement-haskell {
    stack                 # pour les paquets en LTS de stackage
  ] ++ (with pkgs.haskellPackages; [
    # Haskell lib
-    autoproc	# ? procmail
-    darcs	# Gestionnaire de version éponyme
-    ghc-mod
-    hindent         # indentation code
-    hlint           # qualite de code, analyse statique de code + astuces & bonnes pratiques
-    #postgrest       # mapper HTTP <-> PostgreSQL
-    stylish-haskell # qualité de code
-    turtle	# genre shell-scripting
+    autoproc              # ? procmail
+    darcs                 # gestionnaire de version éponyme
+    ghc-mod               # outil d'analyse de code haskell utilisé par IDE
+    hindent               # indentation code
+    hlint                 # qualite de code, analyse statique de code + astuces & bonnes pratiques
+    postgrest             # mapper HTTP <-> PostgreSQL
+    stylish-haskell       # qualité de code
+    turtle                # genre shell-scripting

    # Application perso
    hahp
+    pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc
  ]);
 }
--- a/applications/terminal/developpement-java.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.developpement-java {
+mkIf flags.developpement-java {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/terminal/developpement-jetbrains.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.jetbrains-licensed {
+mkIf flags.jetbrains-licensed {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/terminal/developpement-rust.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.developpement-rust {
+mkIf flags.developpement-rust {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/terminal/developpement.nix
+++ b/applications/terminal/developpement.nix
@@ -2,28 +2,35 @@

 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.configurationFlags;
 in

-mkIf cfg.developpement {
+mkIf flags.developpement {

  # Paquets
  environment.systemPackages = with pkgs; [
+    # Base de données
+    pg_top                 # monitoring de PostgreSQL
+    sqlite                 # le moteur de base de données
+
    # C / C++
-    gcc                 # pour les appels depuis les scripts
+    gcc                    # pour les appels depuis les scripts

    # Gestion des sources
-    cloc                # outil pour compter les lignes de code source
-    git                 # déjà présent dans "base"
+    cloc                   # outil pour compter les lignes de code source
+    git gitAndTools.gitSVN # git et git-svn
    mercurial
    subversion

+    # spécification
+    plantuml               # diagrammes UML et plus si affinité
+
    # Mono
-    #mono46              # interpréteur .NET
+    #mono46                # interpréteur .NET

    ## Visualisation & outils de diff
-    #vbindiff           # diff de fichier hexadecimaux avec vim
+    #vbindiff              # diff de fichier hexadecimaux avec vim
  ];
 }
--- a/applications/terminal/edition-musique.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.edition-musique {
+mkIf flags.edition-musique {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/terminal/edition-photo.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.edition-photo {
+mkIf flags.edition-photo {

  # Paquets
 environment.systemPackages = with pkgs; [
--- a/applications/terminal/edition-video.nix
+++ b/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.configurationFlags;
 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;
    };
  };
+  */
 }
--- a/applications/terminal/jeux.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.jeux {
+mkIf flags.jeux {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/terminal/multimedia.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.multimediaSuite {
+mkIf flags.multimediaSuite {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/applications/terminal/network.nix
+++ b/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.configurationFlags;
 in

 mkIf true {
--- a/applications/terminal/securite.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.securitySuite {
+mkIf flags.securitySuite {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/base.nix
+++ b/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
--- a/config-generator.nix
+++ b/config-generator.nix
@@ -6,106 +6,21 @@ let
  pfl = config.r6d.profiles;
  comp = config.r6d.computers;
  host = config.networking.hostName;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
 in

 {
 # TODO camel case partout
 # TODO everything in english
 # TODO sortir ce qui est privé
-# TODO portage du système d'annuaire de machines de capgemini
  ###### 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,233 +30,18 @@ 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;
-        dns_autorite = true;
-        #dns_resolveur = true;
-        # inutile d'exposer la conf complète du serveur par le store tant qu'il n'y a pas de protection complémentaire - utilisation SSH ?
-        #nix-serve-server = true;
-        smokeping = true;
-
-        #rabbitmq =  true;
-      };
-    })
    # /!\ PAS un serveur
    (mkIf (!pfl.isServer || comp.isMonstre) {
      r6d.config-generator = {
        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;
-        conception-assistee = true;
-        docker = true;
-        developpement = true;
-        developpement-elm = true;
-        developpement-haskell = true;
-        developpement-java = true;
-        developpement-rust = true;
-        edition-musique = true;
-        edition-photo = true;
-        edition-video = true;
-        scanner = true;
-        virtualbox = true;
-        xmonad = true;
-      };
-    })
-
-    ## 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.
-      r6d.profiles = {
-        isDubronetwork = true;
-        isWorkstation = true;
-      };
-
-      r6d.config-generator = {
-        jetbrains-licensed = true;
-        laptop = true;
-        nix-serve-client = true;
-        nix-serve-server = true;
-        tincAddress = "192.168.12.2/24";
-        tincExtraConfig = ''
-          ConnectTo = monstre_dubronetwork_fr
-          ConnectTo = rollo_dubronetwork_fr
-          ConnectTo = hydra_prunetwork_fr
-          ConnectTo = ocean_prunetwork_fr
-        '';
-      };
-    })
-    (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 = {
-        isDubronetwork = true;
-        isDesktopEnvironment = true;
-      };
-
-      r6d.config-generator = {
-        laptop = true;
-        graphical = true;
-        scanner = true;
-        tincAddress = "192.168.12.7/24";
-        tincExtraConfig = ''
-          ConnectTo = monstre_dubronetwork_fr
-          ConnectTo = rollo_dubronetwork_fr
-          ConnectTo = hydra_prunetwork_fr
-          ConnectTo = ocean_prunetwork_fr
-        '';
-      };
-    })
    # Dubro Vivo - St Malo
    #tincAddress = "192.168.12.8/24";
+
    (mkIf comp.isNomade{
      networking.hostName = "nomade.dubronetwork.fr"; # Define your hostname.
      r6d.profiles.isDubronetwork = true;
@@ -350,60 +50,5 @@ in
        laptop = true;
      };
    })
-    (mkIf comp.isPedro {
-      r6d.profiles = {
-        isDubronetwork = true;
-        isServer = true;
-      };
-
-      r6d.config-generator = {
-        fail2ban = true;
-      };
-    })
-    (mkIf comp.isPhenom {
-      networking.hostName = "phenom.dubronetwork.fr"; # Define your hostname.
-      r6d.profiles = {
-        isDubronetwork = true;
-        isWorkstation = true;
-      };
-
-      r6d.config-generator = {
-        jetbrains-licensed = true;
-        #hydra-core = true;
-        nix-serve-client = true;
-        nix-serve-server = true;
-        edition-photo = true;
-        tincAddress = "192.168.12.1/24";
-        tincExtraConfig = ''
-          ConnectTo = monstre_dubronetwork_fr
-          ConnectTo = rollo_dubronetwork_fr
-          ConnectTo = hydra_prunetwork_fr
-          ConnectTo = ocean_prunetwork_fr
-        '';
-      };
-    })
-    (mkIf comp.isRollo {
-      networking.hostName = "rollo.dubronetwork.fr"; # Define your hostname.
-      r6d.profiles = {
-        isDubronetwork = true;
-        isServer = true;
-      };
-
-      r6d.config-generator = {
-        dovecot = true;
-        fail2ban = true;
-        mailboxes = true;
-        murmur = true;
-        nix-serve-client = true;
-        nix-serve-server = true;
-        tincAddress = "192.168.12.5/24";
-        tincExtraConfig = ''
-          ConnectTo = hydra_prunetwork_fr
-          ConnectTo = ocean_prunetwork_fr
-        '';
-        virtualbox = true;
-        znc = true;
-      };
-    })
  ];
 }
--- a/configuration/auto-upgrade.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.auto-upgrade {
+mkIf flags.auto-upgrade {

  # Automatic update & automatic clean

--- a/configuration/awesome.nix
+++ b/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.configurationFlags;
 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
@@ -19,5 +19,7 @@ mkIf cfg.awesome {
    #   beautiful.init(config.dir .. "/share/awesome//themes/zenburn/theme.lua")
    #
    AWESOME_CONFIG_DIR = "${pkgs.awesome}";
-   };
+  };
+
+  environment.etc."xdg/awesome/rc.lua".text = builtins.readFile ./../public/config-awesome-4-rc.lua;
 }
--- a/configuration/default.nix
+++ b/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.configurationFlags;
 in

 {
--- a/configuration/environment.nix
+++ b/configuration/environment.nix
@@ -2,12 +2,11 @@

 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.configurationFlags;
 in

-# TODO: ménage
 {
  # Nombre de process d'installation en parrallèle effectués par Nix
  nix.buildCores = 0;
@@ -21,9 +20,6 @@ in
  # On autorise les paquets non-libres
  nixpkgs.config.allowUnfree = true;

-  # Lancement de dbus pour les utilisateurs
-  services.dbus.socketActivated = true;
-
  # NixOS Hardening
  #security.grsecurity.enable = true;

--- a/configuration/gitconfig
+++ b/configuration/gitconfig
@@ -20,6 +20,7 @@
    # Logs
    lol = log --graph --decorate --pretty=oneline --abbrev-commit
    lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
+    not-pushed = log --branches --not --remotes
 [push]
    default = simple
 [core]
--- a/configuration/laptop.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.laptop {
+mkIf flags.laptop {

  # Gestion spécifique pour PC portable

--- a/configuration/localisation.nix
+++ b/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.configurationFlags;
 in

 mkIf true {
--- a/configuration/network-ipv6.nix
+++ b/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.configurationFlags;
 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

--- a/configuration/network.nix
+++ b/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.configurationFlags;
 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 = {
--- a/configuration/swap.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.swap {
+mkIf flags.swap {

  # Gestion du swap
-  
+
  # https://en.wikipedia.org/wiki/Swappiness
  boot.kernel.sysctl = {
    # le swap est activé (!= 0)
--- a/configuration/udev.nix
+++ b/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.configurationFlags;
 in

 mkIf false {
--- a/iso-image/Makefile.installation
+++ b/iso-image/Makefile.installation
@@ -0,0 +1,7 @@
+all:
+	nixos-generate-config --root /mnt
+	git config --global user.email "nixos-live@example.org"
+	git config --global user.name "NixOS Live"
+	cd /mnt/etc/nixos && git init . && git add . && git commit -m "initial commit"
+	cd /mnt/etc/nixos && git submodule add http://gogs.prunetwork.fr:80/nixos-config/nixos-template-base.git base
+	cd /mnt/etc/nixos && git submodule add https://gogs.prunetwork.fr/Capgemini-CDS-Arkea/template-nixos.git capgemini-cmb
--- a/iso-image/configuration.nix
+++ b/iso-image/configuration.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    capgemini-cmb/default.nix
+    /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+    nixos-template-base/base.nix
+  ];
+  # Custom name
+  isoImage.isoName = pkgs.lib.mkForce "${config.isoImage.isoBaseName}-capgemini-${config.system.nixosLabel}-${pkgs.stdenv.system}.iso";
+  # Avoid having the terminal flooded by kernel audit messages
+  boot.kernelParams = [ "audit=0" ];
+
+  # Files to copy to the liveCD
+  isoImage.contents = [
+    {
+      source = ./Makefile.installation;
+      target = "/custom/Makefile";
+    }
+  ];
+  environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";};
+  networking.hostName = "nixos-livecd.corp.capgemini.com";
+}
--- a/lib.nix
+++ b/lib.nix
@@ -0,0 +1,50 @@
+let
+  lib = with import <nixpkgs> {}; pkgs.lib;
+
+  profiles = {
+    isDesktopEnvironment = {
+      awesome = true;
+      internetSuite = true;
+      graphical = true;
+      multimediaSuite = true;
+      officeSuite = true;
+      pulseaudio = true;
+      securitySuite = true;
+    };
+    isWorkstation = {
+      docker = true;
+      developpement = true;
+      developpement-elm = true;
+      developpement-haskell = true;
+      developpement-java = true;
+      developpement-rust = true;
+    };
+    #isServer = {
+      #};
+  };
+
+in
+
+with lib; rec{
+  # Apply the profiles (pre-defined + custom) to the whole directory
+  applyProfilesToDirectory = customProfiles: directory:
+    lib.mapAttrs (applyProfilesToMachine customProfiles) directory;
+
+  # Apply the profiles (pre-defined + custom) to a machine
+  applyProfilesToMachine = customProfiles: machineName: machineOptions:
+  { configurationFlags = lib.recursiveUpdate (generateFlagsSet customProfiles machineOptions.profiles) machineOptions.configurationFlags;
+    configurationOptions = machineOptions.configurationOptions;
+    profiles = machineOptions.profiles;
+  };
+
+  # Generate a set of configuration flags based on profiles
+  generateFlagsSet = customProfiles: machineProfiles:
+  let
+    allProfiles = recursiveUpdate profiles customProfiles;
+    conditionalFlags = name: value:
+      if machineProfiles.${name}
+      then value
+      else {};
+  in
+  foldr (a: b: a // b) {} (mapAttrsToList conditionalFlags allProfiles);
+}
--- a/module-template.nix
+++ b/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.configurationFlags;
 in

 mkIf true {
--- a/8
+++ b/8
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+EXCLUSION="~$|swp$|swo$"
+
+while inotifywait --exclude $EXCLUSION -r -e modify .
+do
+	$@
+done
--- a/options.nix
+++ b/options.nix
@@ -0,0 +1,194 @@
+{ config, lib, pkgs, r6d, ... }:
+let
+  inherit (lib) mkEnableOption mkTextOption mkIf mkMerge mkOption singleton types;
+
+  # TODO: Anglish :)
+  machineOptions = types.submodule {
+    options = {
+
+      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.";
+        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)";
+        nixos-manual          = mkEnableOption "Profil pour activer la documentation nixos en local sur un TTY";
+        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.";
+      };
+
+      configurationOptions = {
+
+      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";
+        };
+      };
+    };
+
+      profiles = {
+        # Domaine
+        isDubronetwork        = mkEnableOption "Pour distinguer les machines dubronetwork.";
+        isDubronetworkServer  = mkEnableOption "Pour distinguer les machines dubronetwork avec Server.";
+        isDubronetworkWorkstation = mkEnableOption "Pour distinguer les machines dubronetwork avec Workstation.";
+        isPrunetwork          = mkEnableOption "Pour distinguer les machines prunetwork.";
+        isPrunetworkServer    = mkEnableOption "Pour distinguer les machines prunetwork avec Server.";
+        isPrunetworkWorkstation = mkEnableOption "Pour distinguer les machines prunetwork avec Workstation.";
+        # Utilisation machine
+        isDesktopEnvironment  = mkEnableOption "Pour indiquer une machine avec interface graphique.";
+        isServer              = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur.";
+        isWorkstation         = mkEnableOption "Pour indiquer que la machine sert à travailler.";
+      };
+    };
+  };
+
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+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.configurationFlags.graphical == true))
+       || (!currentMachine.profiles.isWorkstation);
+       message = "A workstation requires a graphical environement.";
+     }
+     {
+       assertion = (currentMachine.profiles.isDesktopEnvironment && (currentMachine.configurationFlags.graphical == true))
+       || (!currentMachine.profiles.isDesktopEnvironment);
+       message = "A desktop station requires a graphical environement.";
+     }
+     {
+       assertion = (currentMachine.profiles.isDesktopEnvironment && (config.services.xserver.enable == true))
+                 || (!currentMachine.profiles.isDesktopEnvironment);
+       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!";
+     }
+    ];
+  };
+}
--- a/public/config-awesome-4-rc.lua
+++ b/public/config-awesome-4-rc.lua
@@ -341,11 +341,12 @@ globalkeys = awful.util.table.join(
    awful.key({ modkey            }, "F5", function () awful.util.spawn("spacefm") end),
    awful.key({ modkey            }, "F6", function () awful.util.spawn("vlc") end),
    awful.key({ modkey            }, "F7", function () awful.util.spawn("claws-mail") end),
+    awful.key({ modkey            }, "F11", function () awful.util.spawn("xrandr-auto") end),
    awful.key({ modkey            }, "F12", function () awful.util.spawn("slock") end),
    awful.key({ modkey, "Shift"   }, "F1", function () awful.util.spawn("claws-mail") end),
    awful.key({ modkey, "Shift"   }, "F3", function () awful.util.spawn("pcmanfm") end),
-    awful.key({ modkey            }, "F10", function () awful.util.spawn("xrandr-auto-2") end),
-    awful.key({ modkey            }, "F11", function () awful.util.spawn("xrandr-auto") end)
+    awful.key({ modkey, "Shift"   }, "F6", function () awful.util.spawn("clementine") end),
+    awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("xrandr-auto-2") end)
 --  awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-left") end),
 --  awful.key({ modkey, "Control" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-right") end),

--- a/services/dbus.nix
+++ b/services/dbus.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf true {
+  # Lancement de dbus pour les utilisateurs
+  services.dbus.socketActivated = true;
+}
--- a/services/default.nix
+++ b/services/default.nix
@@ -2,34 +2,39 @@

 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.configurationFlags;
 in

 {
  imports = [
    # installées systématiquement
+    ./dbus.nix
+    ./gpm.nix
    ./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
+    ./nixos-manual.nix      # documentation nixos sur TTY
+    ./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
  ];
 }
--- a/services/docker.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.docker {
+mkIf flags.docker {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/elasticsearch.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.elasticsearch {
+mkIf flags.elasticsearch {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/gpm.nix
+++ b/services/gpm.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf true {
+
+  # prise en charge de la souris en console
+  services.gpm.enable = true;
+}
--- a/services/haveged.nix
+++ b/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.configurationFlags;
 in

 mkIf true {
--- a/services/hoogle.nix
+++ b/services/hoogle.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.configurationFlags;
 in

-mkIf cfg.developpement-haskell {
+mkIf flags.developpement-haskell {

  services.hoogle = {
    enable = true;
-    # port 8080
+    port = 10080;
  };
 }
--- a/services/hydra-build.nix
+++ b/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.configurationFlags;
 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";
--- a/services/hydra-core.nix
+++ b/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.configurationFlags;


  #### 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; [
--- a/services/kibana.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.kibana {
+mkIf flags.kibana {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/locate.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.locate {
+mkIf flags.locate {

  # Services
  services.locate = {
--- a/services/monitoring-munin.nix
+++ b/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.configurationFlags;
 in

-# TODO: ajouter option
 # TODO: changer adresse mail
-mkIf true {
+mkIf flags.munin {

  # Paquets
  environment.systemPackages = with pkgs; [
@@ -27,6 +26,12 @@ mkIf true {
    path = with pkgs; [ munin lm_sensors ];
    serviceConfig.TimeoutStartSec = "3min";
  };
+  users.extraUsers.munin = {
+    #extraGroups = [ "postfix" "root" ];
+    extraGroups = [ "postfix" ];
+  };
+
+  # chmod a+rX -Rv /var/lib/postfix/queue/

  ## Munin server -- generate /var/www/munin
  services.munin-cron = {
@@ -36,7 +41,7 @@ mkIf true {
        address 127.0.0.1
    '';
    extraGlobalConfig = ''
-      contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/public/services/munin-muttrc -s "Munin notification for ''${var:host}" jean-pierre@ocean.prunetwork.fr
+      contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/public/services/munin-muttrc -s "Munin notification for ''${var:host}" root@prunetwork.fr
    '';
  };

--- a/services/nixos-manual.nix
+++ b/services/nixos-manual.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf flags.nixos-manual {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    bc
+    mailutils
+  ];
+
+  # Services
+
+  ## documentation sur ctrl + alt + F8
+  services.nixosManual = {
+    enable = true;
+    showManual = true;
+  };
+
+  # Réseau
+  networking.firewall = {
+    allowedTCPPorts = [
+    ];
+    allowedUDPPorts = [
+    ];
+  };
+}
--- a/services/print.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.print {
+mkIf flags.print {

  # Services
  ## Enable CUPS to print documents.
--- a/services/pulseaudio.nix
+++ b/services/pulseaudio.nix
@@ -2,12 +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.configurationFlags;
 in

-mkIf cfg.pulseaudio {
+mkIf flags.pulseaudio {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    paprefs       # préferences pulseaudio
+    pavucontrol   # mixer pulseaudio
+  ];

  # Pulse Audio
  hardware.pulseaudio = {
--- a/services/scanner.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.scanner {
+mkIf flags.scanner {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/ssh.nix
+++ b/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.configurationFlags;
 in

 mkIf true {
--- a/services/virtualbox.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.virtualbox {
+mkIf flags.virtualbox {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/x11.nix
+++ b/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.configurationFlags;
 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;
--- a/services/xmonad/xmonad.nix
+++ b/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.configurationFlags;
 in

-mkIf cfg.xmonad {
+mkIf flags.xmonad {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/yubikey.nix
+++ b/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.configurationFlags;
+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" ];
+  };*/
+}
Author	SHA1	Message	Date
Jean-Pierre PRUNARET	19bd8fbfbc	migration config rollo sur annuaire	2017-07-15 12:44:26 +02:00
Yves Dubromelle	630217ce02	ghc-mod fonctionne à nouveau	2017-07-14 17:03:47 +02:00
Yves Dubromelle	dcdaf91f8b	voir les différences entre la configuration actuelle et /etc/nixos/configuration.nix	2017-07-05 22:51:29 +02:00
Yves Dubromelle	5803fdbbff	configuration awesome par défaut linkée dans /etc	2017-07-05 22:50:26 +02:00
Yves Dubromelle	dcae05d4c0	ménage (suite)	2017-07-05 22:50:02 +02:00
Yves Dubromelle	196cc008c8	+service gpm pour la souris en console	2017-07-05 22:02:33 +02:00
Yves Dubromelle	fcc1cba9fb	déplacement de dérivations dans les fichiers adéquats	2017-07-05 22:02:20 +02:00
Jean-Pierre PRUNARET	f8a687be52	migration de neo-nomade à l'annuaire	2017-07-01 14:50:46 +02:00
Jean-Pierre PRUNARET	28fc448e0c	Mettre à jour 'README.md'	2017-07-01 12:45:28 +00:00
Yves Dubromelle	195f5e35a1	+plantuml dans les paquets de développement&	2017-06-23 23:16:02 +02:00
Jean-Pierre PRUNARET	ad0799f08d	indentation	2017-06-22 19:46:55 +02:00
Yves Dubromelle	4dbcc8ddc0	git alias to show commits not pushed to remotes	2017-06-03 18:06:03 +02:00
Yves Dubromelle	3a5ae68f3a	migrated machines cleanup (latitude, monstre, pedro, phenom)	2017-06-03 17:44:49 +02:00
Jean-Pierre PRUNARET	772cab2253	nsp	2017-06-03 13:10:00 +02:00
Jean-Pierre PRUNARET	92bf72c7bf	indentation	2017-06-03 13:08:50 +02:00
Jean-Pierre PRUNARET	60f466a887	add sqlite to dev profile	2017-06-03 13:05:14 +02:00
Jean-Pierre PRUNARET	eca3d77610	add option to build nixos documentation	2017-06-03 12:58:10 +02:00
Jean-Pierre PRUNARET	78ece5641d	add server options	2017-05-31 17:18:17 +02:00
Jean-Pierre PRUNARET	cc851a7946	add assertion	2017-05-31 15:46:27 +02:00
Jean-Pierre PRUNARET	aa22c6337d	migrated into profile	2017-05-31 15:43:42 +02:00
Jean-Pierre PRUNARET	acacc94903	add development packages to workstation profile	2017-05-31 15:41:12 +02:00
Jean-Pierre PRUNARET	1f480bbbff	add option to identify Workstations	2017-05-31 14:45:39 +02:00
Yves Dubromelle	ac91ce4492	regroupement des options éparses en configurationOptions et renommage	2017-05-31 00:23:10 +02:00
Yves Dubromelle	c43adc80cb	utilisation des profils pour modifier les flags :)	2017-05-30 23:21:33 +02:00
Yves Dubromelle	745d2cd171	on peut se passer de passer lib en paramètre	2017-05-25 23:30:50 +02:00
Yves Dubromelle	259a1a0aa6	cible make pour juste builder NixOS sans appliquer	2017-05-25 02:18:07 +02:00
Yves Dubromelle	854eed9227	ébauche de fonction pour générer un profil	2017-05-25 02:17:42 +02:00
Jean-Pierre PRUNARET	8ee09217cb	une machine hydra-builder doit faire du garbage-collection régulièrement	2017-05-22 10:42:16 +02:00
Jean-Pierre PRUNARET	b15672c3ad	ménage config generator	2017-05-21 13:58:09 +02:00
Jean-Pierre PRUNARET	ab1d364327	ajout option munin	2017-05-20 22:43:52 +02:00
Jean-Pierre PRUNARET	67eadfab97	ces anciens profils ont été convertis en assertions	2017-05-19 17:18:20 +02:00
Jean-Pierre PRUNARET	ff733c5d08	migration monstre	2017-05-19 13:02:31 +02:00
Jean-Pierre PRUNARET	d3f1f2121e	ajustement readme	2017-05-19 13:02:31 +02:00
Yves Dubromelle	cdd75e063d	assertion DNS	2017-05-19 12:58:39 +02:00
Jean-Pierre PRUNARET	a816a81b9e	migration machines	2017-05-19 12:37:39 +02:00
Jean-Pierre PRUNARET	aa6ae3cc8d	ajout config yubike	2017-05-15 22:53:29 +02:00
Jean-Pierre PRUNARET	419a1cbf53	fix: spacefm crashes https://github.com/IgnorantGuru/spacefm/issues/671	2017-05-15 20:34:35 +02:00
Jean-Pierre PRUNARET	b03d4acfe2	add assertions on base	2017-05-13 17:13:23 +02:00
Jean-Pierre PRUNARET	274f4812f4	désactivation config-generator	2017-05-05 11:39:11 +02:00
Jean-Pierre PRUNARET	4749384834	x11 doit être activé à la main dans configuration.nix	2017-05-05 11:23:19 +02:00
Jean-Pierre PRUNARET	55650f01b5	désactivation locate (infinite recursion)	2017-05-05 11:16:55 +02:00
Jean-Pierre PRUNARET	197961745d	indentation	2017-05-05 01:39:19 +02:00
Jean-Pierre PRUNARET	f2f49c6206	ajout plugin pandoc	2017-05-05 01:38:40 +02:00
Jean-Pierre PRUNARET	6e29240664	désactivation sqlitebrowser	2017-05-05 01:38:24 +02:00
Jean-Pierre PRUNARET	01c3b6fc39	ajout option rmilter	2017-04-30 15:07:10 +02:00
Jean-Pierre PRUNARET	24fa43926b	ajout instructions readme	2017-04-28 17:43:50 +02:00
Jean-Pierre PRUNARET	2588e7052a	script qui relance une commande des changement du système de fichier	2017-04-28 17:43:45 +02:00
Jean-Pierre PRUNARET	21d6e21214	options: ensemble d'options pour nix-serve-client	2017-04-28 17:43:40 +02:00
Jean-Pierre PRUNARET	b08da50c3c	désactivation de personnalisation de paquets	2017-04-28 17:43:28 +02:00
Jean-Pierre PRUNARET	02f76b6a30	fix: typo	2017-04-28 17:43:23 +02:00
Jean-Pierre PRUNARET	e778ad19cb	fix: oubli d'une migration vers l'utilisation de l'annuaire	2017-04-28 17:43:13 +02:00
Jean-Pierre PRUNARET	a074cfcfa7	EXPERIMENTAL: cfg -> flags	2017-04-27 22:06:12 +02:00
Jean-Pierre PRUNARET	7f8563f32b	exparimental: utilisation de l'annuaire	2017-04-27 12:29:18 +02:00
Jean-Pierre PRUNARET	2a923e150e	options: ajout des variables pour les profils	2017-04-27 12:11:03 +02:00
Jean-Pierre PRUNARET	3869c2d520	options: ajouts configuration-flags	2017-04-27 12:03:16 +02:00
Jean-Pierre PRUNARET	ddac52530b	annuaire: ajout variables dans template & application	2017-04-24 23:37:18 +02:00
Yves Dubromelle	fe6f3136f7	essai de backport d'un annuaire de gestion de parc	2017-04-22 01:15:38 +02:00
Jean-Pierre PRUNARET	c6fc32fbe7	radx: desactivation rabbitmq	2017-04-13 19:52:12 +02:00
Yves Dubromelle	42db758638	munin: postfix commande ppour donner les droits de lecture à munin	2017-04-11 15:14:41 +02:00
System administrator	07d8924ecd	gparted: coquille, était "parted"	2017-04-11 13:46:29 +02:00
System administrator	2dc04d849b	encore une modification de port pour hoogle	2017-04-11 13:46:29 +02:00
Jean-Pierre PRUNARET	184de980a5	munin: EXPERIMENTAL est membre du groupe postfix pour grapher les mails	2017-04-11 01:08:30 +02:00
System administrator	f16e4d8934	changement du port de hoogle (conflit au boulot)	2017-04-06 08:55:26 +02:00
Jean-Pierre PRUNARET	e204ffb841	ajout d'un client pour la sauvegarde nuagique	2017-04-01 09:26:09 +02:00
Jean-Pierre PRUNARET	8c0a18a55b	awesome: ajout clementine sur maj + F6	2017-04-01 07:51:28 +02:00
Jean-Pierre PRUNARET	fd834eb186	munin: update mail address	2017-03-30 00:08:18 +02:00