ménage appli pour préparation migration NixOS 20.03

This reverts commit 0c47de1cb1.

Makefile

@@ -1,6 +1,10 @@
 GSF=git submodule foreach
 TIME=time
 
+CHRONY_STATUS=chronyc tracking
+CHRONY_STATS=chronyc sources -v
+CHRONY_STATS_SOURCES=chronyc sourcestats
+
 all: rebuild-switch
 	date
 ##--------- Commandes spécifiques pour NixOS
@@ -15,24 +19,46 @@ clean-total:
 	$(TIME) nix-collect-garbage -d
 
 clean-log:
+	journalctl --flush --rotate
 	journalctl --vacuum-size=1G
 
 full-auto: submodules-update upgrade clean optimise
 	@date
 
+list-installed-packages:
+	@# source : https://functor.tokyo/blog/2018-02-20-show-packages-installed-on-nixos
+	@# https://www.domenkozar.com/2014/01/02/getting-started-with-nix-package-manager/
+	@#nixos-option environment.systemPackages
+	nixos-option environment.systemPackages | head -2 | tail -1 | sed -e 's/ /\n/g' | cut -d- -f2- | sort | uniq| sed -e 's/"$$//'
+
 optimise:
-	$(TIME) nix-store --optimise
+	$(TIME) nix optimise-store
+
+rebuild-build:
+	nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
+	$(TIME) time nixos-rebuild build --fallback  --show-trace
 
 rebuild-switch:
 	$(TIME) time nixos-rebuild switch --fallback  --show-trace
 
+show-blackholed:
+	-@ip route |grep blackhole |wc -l| awk '{print "Il y a "$$1" route(s) en blackhole sur";system("hostname ")}' |cowsay
+
+show-diff-with-current:
+	-diff /run/current-system/configuration.nix /etc/nixos/configuration.nix
+
 show-roots:
 	nix-store --gc --print-roots
 
+show-time:
+	-@$(CHRONY_STATUS) && $(CHRONY_STATS)
+	-@watch -d -n 2 "$(CHRONY_STATUS) && echo "-- Statistiques générales :" && $(CHRONY_STATS) && echo "-- Statistiques sur les sources :" && $(CHRONY_STATS_SOURCES) && echo "-- Statistiques sur les clients :" && chronyc clients"
+
 store-repair:
 	$(TIME) nix-store --verify --check-contents --repair
 
 upgrade:
+	nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
 	$(TIME) nixos-rebuild switch --upgrade --fallback --show-trace
 
 ##--------- Commandes spécifiques pour NixOS -- Opérations non courantes
@@ -41,6 +67,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
@@ -84,3 +113,6 @@ tmpfs-umount:
 tmpfs-destroy: tmpfs-umount
 	rmdir /mnt/tmpfs
 
+##- Test awesome
+test-awesome:
+	Xephyr :5 & sleep 1; DISPLAY=:5 awesome

README.md

@@ -1,15 +1,34 @@
 # nixos-template-base
 
 Versions de NixOS supportées :
-* NixOS 16.09
 * NixOS unstable
 
 Ce dépôt stocke une configuration générique des machines.
-Une recette dite "config-generator" adapte la configuration selon le nom de la machine (FQDN).
 
-Actuellement, les scripts contiennent un peu de configuration spécifique pour les machines des mainteneurs.
+~~Une recette dite "config-generator" adapte la configuration selon le nom de la machine (FQDN).~~
+
+~~Actuellement, les scripts contiennent un peu de configuration spécifique pour les machines des mainteneurs.~~
+
+# Liens
+* http://howoldis.herokuapp.com/ pour savoir de quand datent les différentes releases de NixOS
+* https://repology.org/repository/nix_unstable/problems pour lister les paquets avec problèmes
 
 # Notes de mise-à-jour
+
+## pour l'utilisation de l'annuaire (à partir de 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
@@ -93,14 +112,14 @@ Pour résoudre les soucis d'upgrade, il est conseillé :
 * se connecter à la machine
 * passer en root
 
-~~~
+~~~bash
 sudo su -
 ~~~
 
 * formater les partitions
 
-~~~
-mkfs.ext4 -L nixos /dev/sda1 
+~~~bash
+mkfs.ext4 -L nixos /dev/sda1
 swapoff -a
 mkswap /dev/sda2
 swapon -a
@@ -108,24 +127,28 @@ swapon -a
 
 * monter les partitions dans /mnt
 
-~~~
+~~~bash
 mount /dev/sda1 /mnt/
 mkdir /mnt/etc/
+mkdir /mnt/etc/nixos
 mkdir /etc/nixos
 mkdir /mnt/nix
+mkdir /nix
 mount --bind /mnt/nix/ /nix
+mkdir /mnt/tmp
+mount --bind /mnt/tmp /tmp
 ~~~
-    
+
 
 * installer les paquets nécessaires
 
-~~~
+~~~bash
 apt-get install bzip2 git byobu htop glances
 ~~~
 
 * création d'utilisateur (n'importe quil mot de passe)
 
-~~~
+~~~bash
 adduser nix
 groupadd -r nixbld
 for n in $(seq 1 10); do useradd -c "Nix build user $n" -d /var/empty -g nixbld -G nixbld -M -N -r -s "$(which nologin)" nixbld$n; done
@@ -133,14 +156,14 @@ for n in $(seq 1 10); do useradd -c "Nix build user $n" -d /var/empty -g nixbld
 
 * mise-à-jour des certificats
 
-~~~
+~~~bash
 update-ca-certificates
 ~~~
 
 * installer nix
 
-~~~
-chown -R nix /nix
+~~~bash
+chown -R nix /nix /tmp
 su - nix
 bash <(curl https://nixos.org/nix/install)
 exit
@@ -148,26 +171,26 @@ exit
 
 * créer un profil nix pour root & un channel
 
-~~~
-. ~nix/.nix-profile/etc/profile.d/nix.sh 
+~~~bash
+. ~nix/.nix-profile/etc/profile.d/nix.sh
 nix-channel --remove nixpkgs
-nix-channel --add http://nixos.org/channels/nixos-unstable nixos
+nix-channel --add https://nixos.org/channels/nixos-unstable nixos
 nix-channel --update
 ~~~
 
 * installer un editeur de texte
 
-~~~
+~~~bash
 nix-env -i vim_configurable
 ~~~
 
 * installation de nixos-install
 
-~~~
+~~~bash
 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
@@ -182,7 +205,7 @@ nix-env -i -A config.system.build.nixos-install \
 si la machine existe déjà, cloner le dépôt dans /mnt/etc/nixos
 pour cela, créer clef ssh et l'ajouter sur la forge
 
-~~~
+~~~bash
 ssh-keygen -t ed25519
 cp ~/.ssh/id_ed25519* /mnt/etc/nixos/
 
@@ -193,13 +216,13 @@ git submodule update
 
 * monter /etc/nixos vers /mnt/etc/nixos pour que la config clonée fonctionne
 
-~~~
+~~~bash
 mount --bind /mnt/etc/nixos/ /etc/nixos/
 ~~~
 
 * mettre à jour la configuration matérielle
 
-~~~
+~~~bash
 export NIX_PATH=nixpkgs=/root/.nix-defexpr/channels/nixos:nixos=/root/.nix-defexpr/channels/nixos/nixos
 nixos-generate-config --root /mnt
 ~~~
@@ -210,8 +233,7 @@ notamment le périphérique utilisé par grub
 
 * installer le système sur le disque
 
-~~~
+~~~bash
 unset NIXOS_CONFIG
 nixos-install
 ~~~
-

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
   ];
 }

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
@@ -37,6 +39,7 @@ mkIf profiles.isDesktopEnvironment {
     fira            # police créée pour Firefox
     fira-code       # idem fira-mono + ligatures pour la programmation
     fira-mono       # dérivée de fira en monospace
+    font-awesome_5  # Jeux de police, utilisé avec Latex
     hack-font       # police monospace créée explicitement pour coder
     hasklig         # police dérivée de source-code-pro mais avec des ligatures
   ];

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; [
@@ -24,12 +24,12 @@ mkIf (cfg.officeSuite && cfg.graphical) {
     ## Editeur de texte
     #lyx          # surcouche WISIWIM à LaTeX
     #focuswriter  # outil pour l'écriture
-    textadept     # un éditeur de texte facile pour copier-coller graphique
+    #textadept     # un éditeur de texte facile pour copier-coller graphique
     #zim          # outil de prise de notes, wiki de bureau
 
     ## Visionneuse
     #kde5.okular   # pdf
-    mcomix        # livres (cbr, liste d'images), gestion d'une bibliothèque
+    #mcomix        # livres (cbr, liste d'images), gestion d'une bibliothèque # Supprimé dans NixOS 20.03
     pdfpc         # pdf
     qpdfview      # pdf
     gqview        # visionneuse image & gestion basique de collection

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; [

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; [

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
@@ -31,20 +30,4 @@ environment.systemPackages = with pkgs; [
     transmission_gtk
     transmission_remote_gtk
   ];
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    clawsMail = pkgs.clawsMail.override {
-      enablePluginFancy = false; # nécessite wekitgtk qui est troué
-      enablePluginPdf = true;
-      enablePluginRavatar = true;
-      enablePluginSmime = true;
-      enablePluginVcalendar = true;
-      enableSpellcheck = true;
-    };
-    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.configurationFlags;
 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.configurationFlags;
 in
 
 {
@@ -26,6 +26,7 @@ in
     ./edition-photo.nix         # modifier les photos & assimilé
     ./edition-video.nix         # modifier les vidéos
     ./jeux.nix                  # jouer, tout simplement ;)
+    ./radio.nix                 # outils pour faire de la radio SDR
 
     ## if isDesktop
     ./adminsys.nix              # pour gérer le système dans son ensemble et les services

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; [

applications/graphical/developpement-haskell.nix

@@ -2,17 +2,17 @@
 
 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; [
   ] ++ (with pkgs.haskellPackages; [
     # Haskell lib
-    threadscope     # visualisation des threads (<bidule>.eventlog)
+    #threadscope     # visualisation des threads (<bidule>.eventlog)
   ]);
 }

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; [

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; [

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; [

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
@@ -21,7 +21,6 @@ mkIf (cfg.developpement && cfg.graphical) {
     # Gestion des sources
     #gitg               # interface pour utiliser git (historique, commit)
     gitstats            # génère un site web statique avec des statistiques
-    gitAndTools.gitFull # pour gitk
     git-cola            # interface pour utiliser git (historique, commit)
 
     ## Visualisation & outils de diff

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; [

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; [

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; [

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; [

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

applications/graphical/network.nix

@@ -2,16 +2,20 @@
 
 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) {
+
+  # Diagnostic réseau Wireshark (droits fins par le groupe wireshark)
+  programs.wireshark = {
+    enable = true;
+    package = pkgs.wireshark;
+  };
 
   # Paquets
   environment.systemPackages = with pkgs; [
-    ## Diagnostic
-    wireshark
   ];
 }

applications/graphical/radio.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf (flags.radio && flags.graphical) {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    ## GUI
+    chirp                   # Configuration de radios portatives
+    gqrx                    # GUI
+    cubicsdr                # Another GUI
+    gnuradio-with-packages  # Software Defined Radio (SDR) software
+
+    ## A Trier
+    #inspectrum    # Tool for analysing captured signals from sdr receivers
+  ];
+}

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; [

applications/overrides.nix

@@ -0,0 +1,48 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf true {
+
+  nixpkgs.config.packageOverrides = pkgs: {
+    clawsMail = pkgs.clawsMail.override {
+      enablePgp = true;
+      enablePluginArchive = true;
+      #enablePluginFancy = false; # nécessite wekitgtk qui est troué # Option supprimée dans NixOS 20.03
+      enablePluginPdf = true;
+      enablePluginRavatar = true;
+      enablePluginSmime = true;
+      enablePluginVcalendar = true;
+      enableSpellcheck = true;
+    };
+
+    ffmpeg-full = pkgs.ffmpeg-full.override {
+      nonfreeLicensing = true;
+      nvenc  = true;
+    };
+
+    # bug connu : https://nixos.org/nix-dev/2014-December/015225.html
+    # find /nix/store/  -maxdepth 1 -type d -name "*gnuradio-*"
+    # Commande pour générer le path : find /nix/store/  -maxdepth 1 -type d -name "*gnuradio-*"|paste -d: -s -
+    gnuradio-with-packages = pkgs.gnuradio-with-packages.override {
+      extraPackages = with pkgs; [
+        gnuradio-ais
+        gnuradio-gsm
+        gnuradio-nacl
+        gnuradio-osmosdr    # support des dongle Realtek
+        gnuradio-rds        # support du décodage de RDS sur les radio FM
+      ];
+    };
+
+    mumble = pkgs.mumble.override { pulseSupport = true; };
+  };
+
+  #nixpkgs.config.permittedInsecurePackages = [
+  #  "webkitgtk-2.4.11"       # pour que le plugin fancy de claws-mail fonctionne
+  #];
+}

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
@@ -20,13 +22,15 @@ mkIf true {
     ntp
     powerline-fonts
     powertop
-    python27Packages.ansible2
-    python27Packages.glances
+    #ansible
+    python36Packages.glances
+    pv            # afficher le débit d'un flux     dd if=/dev/zero | pv | dd of=/dev/null
     sysstat       # pour la commande "iostat -x -1" de monitoring d'activité disque
     usbutils
 
     # Backup
     duplicity     # création de sauvegarde chiffrées (GPG)
+    par2cmdline   # outil de récupération de fichiers corrompus - .par2
 
     # Compression
     lz4
@@ -47,7 +51,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
   ];

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 {

applications/terminal/bureautique.nix

@@ -2,17 +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.officeSuite {
+mkIf flags.officeSuite {
 
   # Paquets
   environment.systemPackages = with pkgs; [
     # Bureautique
-    aspell aspellDicts.fr # correction d'ortographe
+    aspell aspellDicts.fr         # correction d'ortographe
+    python36Packages.grammalecte  # correction gramatical
 
     # Gestion de tâche
     taskwarrior     # gestionnaire de tâches en console

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; [

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; [

applications/terminal/client-internet.nix

@@ -2,26 +2,29 @@
 
 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; [
     # Clients Internet
 
     ## Réseaux sociaux
-    #python27Packages.turses           # client twitter en ncurse
-    python27Packages.rainbowstream    # client twitter en console
-    rtv                               # client reddit en console
+    #turses                            # client twitter en ncurse
+    #python36Packages.rainbowstream    # client twitter en console
+    #rtv                               # client reddit en console
 
     ## Mail & Discussion (texte, audio)
     mutt
 
     ## Sauvegarde nuagique (cloud storage)
-    rclone
+    #rclone
+
+    ## P2P
+    rtorrent      # outil de téléchargement de torrent & magnet
   ];
 }

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
+      gitAndTools.gitFull 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

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
 
 {
@@ -26,6 +26,7 @@ in
     ./edition-photo.nix         # modifier les photos & assimilé
     ./edition-video.nix         # modifier les vidéos
     ./jeux.nix                  # jouer, tout simplement ;)
+    ./radio.nix                 # outils pour faire de la radio SDR
 
     ## if isDesktop
     ./adminsys.nix              # pour gérer le système dans son ensemble et les services

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; [

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,19 @@ 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
+    #brittany              # formatteur de code
+    #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
+    servant               # génération d'API REST
+    stylish-haskell       # qualité de code
+    turtle                # genre shell-scripting
 
     # Application perso
-    hahp
+    #hahp
+    pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc
   ]);
 }

applications/terminal/developpement-java.nix

@@ -2,20 +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.developpement-java {
+mkIf flags.developpement-java {
+
+  # Installe le paquet + JAVA_HOME
+  programs.java = {
+    enable = true;
+    package = pkgs.jdk11;
+  };
 
   # Paquets
   environment.systemPackages = with pkgs; [
-    # Java
+    # Systèmes de build autour de java
+    ant
     maven
-    openjdk
+    gradle
   ];
-  environment.variables = {
-    JAVA_HOME = "${pkgs.openjdk}";
-  };
 }

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; [

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; [

applications/terminal/developpement.nix

@@ -2,28 +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
 
-mkIf cfg.developpement {
+mkIf flags.developpement {
 
   # Paquets
   environment.systemPackages = with pkgs; [
+    # Build / outil de construction
+    autobuild
+    autoconf
+    automake
+
+    # 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
     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
   ];
 }

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; [

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; [

applications/terminal/edition-video.nix

@@ -2,22 +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.edition-video {
+mkIf flags.edition-video {
 
   # Paquets
   environment.systemPackages = with pkgs; [
     ffmpeg-full   # assemblage de flux audio & video en ligne de commande
   ];
-
-  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.configurationFlags;
 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.configurationFlags;
 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.configurationFlags;
 in
 
 mkIf true {
@@ -19,15 +19,14 @@ mkIf true {
 
     ## Diagnostic
     arp-scan
+    #mtr  -> installé plus bas
     nmap          # outil de scan de port réseau
     whois
   ];
 
-  # Paquets avec setuid root
-  security.wrappers = {
-    # outil de diagnostic réseau
-    mtr.source = "${pkgs.mtr}/bin/mtr";
-  };
+  # https://github.com/NixOS/nixpkgs/issues/30335
+  # Some programs need SUID wrappers, can be configured further or are started in user sessions.
+  programs.mtr.enable = true;
 
   networking.firewall = {
     allowedTCPPorts = [

applications/terminal/radio.nix

@@ -0,0 +1,32 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf flags.radio {
+
+# pour que ça marche
+# sudo rmmod dvb_usb_rtl28xxu
+
+# lecture radio FM
+# rtl_fm -f 96.9e6 -M wbfm -s 440000 -r 44100 - | aplay -r 44100 -f S16_LE
+# rtl_fm -f 96.95e6 -M wbfm -s 441000 -r 44100 - | aplay -r 44100 -f S16_LE -t raw -c 1
+# rtl_fm -f 96.95e6 -M wbfm -s 441000 -r 44100 -E deemp - |pv| aplay -r 44100 -f S16_LE -t raw -c 1
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    gnss-sdr    # Global Navigation Satellite Systems software-defined receiver
+    liquid-dsp  # Digital signal processing library for software-defined radios
+    rtl-sdr     # Turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+    dump1090    # Listen to planes ADS-B and view them on a map
+  ];
+
+  # Configuration matérielle
+  boot.blacklistedKernelModules = [
+    "dvb_usb_rtl28xxu"
+  ];
+}

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; [

base.nix

@@ -1,16 +1,13 @@
 { 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
+
+    # Redéfinition d'applications et de modules
+    ./applications/overrides.nix
 
     # subfolders
     ./applications/graphical/default.nix

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;
-      };
-    })
   ];
 }

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
 

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;
 }

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
 
 {
@@ -15,6 +15,7 @@ in
     ./localisation.nix
     ./network.nix
     #./network-ipv6.nix
+    ./u2f.nix
     ./udev.nix
 
     # commandées par config-generator

configuration/environment.nix

@@ -2,31 +2,34 @@
 
 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;
 
   # The NixOS release to be compatible with for stateful data such as databases.
-  system.stateVersion = "17.03";
+  system.stateVersion = "19.09";
 
-  #  copies the NixOS configuration file (usually /etc/nixos/configuration.nix) and links it from the resulting system (getting to /run/current-system/configuration.nix)
+  # copies the NixOS configuration file (usually /etc/nixos/configuration.nix) and links it from the resulting system (getting to /run/current-system/configuration.nix)
   system.copySystemConfiguration = true;
 
   # 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;
 
+  # Ménage de /tmp au boot
+  boot.cleanTmpDir = true;
+
+  # Activation des pages de manuel
+  documentation.man.enable = true;
+
+
   # Paquets
   environment = {
     shellAliases = {
@@ -58,7 +61,7 @@ in
     # Host keys the client accepts - order here is honored by OpenSSH
     HostKeyAlgorithms ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa,ecdsa-sha2-nistp521-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256
 
-    KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp256,ecdh-sha2-nistp384,diffie-hellman-group-exchange-sha256
+    KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
     MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
     Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
   '';

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]

configuration/laptop.nix

@@ -2,32 +2,38 @@
 
 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
 
   ## Gestion de l'énergie
-  powerManagement.cpuFreqGovernor = "powersave";
+  services.tlp.enable = true;
 
   ## Activation d'un gestionnaire de réseau
   networking.networkmanager.enable = true;
 
-  hardware.bluetooth.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = false;
+  };
+
+  # Gestion graphique du réseau dans la barre système
+  programs.nm-applet.enable = true;
 
   # Paquets
   environment.systemPackages = with pkgs; [
-    networkmanagerapplet    # gestionnaire réseau graphique + console (nm-applet + nmtui)
     wirelesstools           # fournis iwconfig
+    blueman                 # outils bluetooth (manager, system tray)
+    cbatticon               # status de la batterie dans le system tray
   ];
 
   # Services
-  services.xserver.synaptics = {
+  services.xserver.libinput = {
     enable = true;
-    twoFingerScroll = true;
   };
 }

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 {

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
 
@@ -23,6 +23,7 @@ mkIf true {
     "net.ipv6.conf.default.temp_valid_lft" = 3600; # 1 heure
     "net.ipv6.conf.default.use_tempaddr" = 2; # activé
 
+    # Activation du routage
     "net.ipv6.conf.all.forwarding" = true;
     "net.ipv6.conf.default.forwarding" = true;
   };

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,10 +12,11 @@ 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}
   '';
 
+  # Activation du routage
   boot.kernel.sysctl = {
     "net.ipv4.conf.all.forwarding" = true;
     "net.ipv4.conf.default.forwarding" = true;

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)

configuration/u2f.nix

@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf true {
+  # Ajout du support des yobikey & hyperfido
+  ## source des valeurs udev : https://github.com/Yubico/libu2f-host/blob/master/70-u2f.rules
+
+  ## source car udev sur nixos semble ancien : https://raw.githubusercontent.com/Yubico/libu2f-host/master/70-old-u2f.rules
+  services.udev.extraRules = ''
+  # this udev file should be used with udev older than 188
+  ACTION!="add|change", GOTO="u2f_end"
+
+  # Yubico YubiKey
+  KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0113|0114|0115|0116|0120|0402|0403|0406|0407|0410", GROUP="plugdev", MODE="0660"
+
+  # Happlink (formerly Plug-Up) Security KEY
+  KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="f1d0", GROUP="plugdev", MODE="0660"
+
+  #  Neowave Keydo and Keydo AES
+  KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1e0d", ATTRS{idProduct}=="f1d0|f1ae", GROUP="plugdev", MODE="0660"
+
+  # HyperSecu HyperFIDO
+  KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0880", GROUP="plugdev", MODE="0660"
+
+  LABEL="u2f_end"
+
+  SUBSYSTEM=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2838", GROUP="audio", MODE="0666", SYMLINK+="rtl_sdr"
+  '';
+
+  security.pam.u2f.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    libu2f-host
+  ];
+}

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 {

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

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";
+}

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);
+}

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 {
@@ -22,4 +22,11 @@ mkIf true {
     allowedUDPPorts = [
     ];
   };
+} // {
+  assertions = [
+    {
+      assertion = true;
+      message = "Assetion toujours valide.";
+    }
+  ];
 }

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,215 @@
+{ 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.";
+        radio                 = mkEnableOption "Profil pour activer les outils pour faire de radio numérique - SDR.";
+        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.str;
+      };
+      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.";
+        dnsFQDN = mkOption {
+          example = "device.example.net.";
+          description = "DNS name of host pointing to tunnel IP.";
+          type = lib.types.str;
+        };
+        connectToAddress = mkOption {
+          default = "";
+          example = "192.168.1.1";
+          description = "External address to connect from another node.";
+          type = lib.types.str;
+        };
+        vpnAddress = mkOption {
+          example = "192.168.69.69/24";
+          description = "VPN local node IP address.";
+          type = lib.types.str;
+        };
+        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.str;
+        };
+      };
+
+      quagga = {
+        enable = mkEnableOption "Enable Quagga + BGP service";
+        bgpConfig = mkOption {
+          type = types.lines;
+          default = "";
+          example =''
+              router bgp 65001
+                neighbor 10.0.0.1 remote-as 65001
+            '';
+          description = ''
+            BGP configuration statements.
+          '';
+        };
+      };
+
+      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.str;
+          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.str;
+          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!";
+     }
+    ];
+  };
+}

public/config-awesome-4-rc.lua

@@ -18,9 +18,11 @@ local hotkeys_popup = require("awful.hotkeys_popup").widget
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)
 if awesome.startup_errors then
-    naughty.notify({ preset = naughty.config.presets.critical,
-                     title = "Oops, there were errors during startup!",
-                     text = awesome.startup_errors })
+    naughty.notify({
+      preset = naughty.config.presets.critical,
+      title = "Oops, there were errors during startup!",
+      text = awesome.startup_errors
+  })
 end
 
 -- Handle runtime errors after startup
@@ -31,9 +33,11 @@ do
         if in_error then return end
         in_error = true
 
-        naughty.notify({ preset = naughty.config.presets.critical,
-                         title = "Oops, an error happened!",
-                         text = tostring(err) })
+        naughty.notify({
+            preset = naughty.config.presets.critical,
+            title = "Oops, an error happened!",
+            text = tostring(err)
+          })
         in_error = false
     end)
 end
@@ -95,20 +99,24 @@ end
 -- {{{ Menu
 -- Create a launcher widget and a main menu
 myawesomemenu = {
-   { "hotkeys", function() return false, hotkeys_popup.show_help end},
-   { "manual", terminal .. " -e man awesome" },
-   { "edit config", editor_cmd .. " " .. awesome.conffile },
-   { "restart", awesome.restart },
-   { "quit", function() awesome.quit() end}
+    { "hotkeys", function() return false, hotkeys_popup.show_help end},
+    { "manual", terminal .. " -e man awesome" },
+    { "edit config", editor_cmd .. " " .. awesome.conffile },
+    { "restart", awesome.restart },
+    { "quit", function() awesome.quit() end}
 }
 
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "open terminal", terminal }
-                                  }
-                        })
+mymainmenu = awful.menu({
+    items = {
+        { "awesome", myawesomemenu, beautiful.awesome_icon },
+        { "open terminal", terminal }
+    }
+})
 
-mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
-                                     menu = mymainmenu })
+mylauncher = awful.widget.launcher({
+    image = beautiful.awesome_icon,
+    menu = mymainmenu
+})
 
 -- Menubar configuration
 menubar.utils.terminal = terminal -- Set the terminal for applications that require it
@@ -123,46 +131,87 @@ mytextclock = wibox.widget.textclock()
 
 -- Create a wibox for each screen and add it
 local taglist_buttons = awful.util.table.join(
-                    awful.button({ }, 1, function(t) t:view_only() end),
-                    awful.button({ modkey }, 1, function(t)
-                                              if client.focus then
-                                                  client.focus:move_to_tag(t)
-                                              end
-                                          end),
-                    awful.button({ }, 3, awful.tag.viewtoggle),
-                    awful.button({ modkey }, 3, function(t)
-                                              if client.focus then
-                                                  client.focus:toggle_tag(t)
-                                              end
-                                          end),
-                    awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end),
-                    awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
-                )
+    awful.button(
+        { },
+        1,
+        function(t) t:view_only() end
+    ),
+    awful.button(
+        { modkey },
+        1,
+        function(t)
+            if client.focus then
+                client.focus:move_to_tag(t)
+            end
+        end
+    ),
+    awful.button(
+        { },
+        3,
+        awful.tag.viewtoggle
+    ),
+    awful.button(
+        { modkey },
+        3,
+        function(t)
+            if client.focus then
+                client.focus:toggle_tag(t)
+            end
+        end
+    ),
+    awful.button(
+        { },
+        4,
+        function(t) awful.tag.viewnext(t.screen) end
+    ),
+    awful.button(
+        { },
+        5,
+        function(t) awful.tag.viewprev(t.screen) end
+    )
+)
 
 local tasklist_buttons = awful.util.table.join(
-                     awful.button({ }, 1, function (c)
-                                              if c == client.focus then
-                                                  c.minimized = true
-                                              else
-                                                  -- Without this, the following
-                                                  -- :isvisible() makes no sense
-                                                  c.minimized = false
-                                                  if not c:isvisible() and c.first_tag then
-                                                      c.first_tag:view_only()
-                                                  end
-                                                  -- This will also un-minimize
-                                                  -- the client, if needed
-                                                  client.focus = c
-                                                  c:raise()
-                                              end
-                                          end),
-                     awful.button({ }, 3, client_menu_toggle_fn()),
-                     awful.button({ }, 4, function ()
-                                              awful.client.focus.byidx(1)
-                                          end),
-                     awful.button({ }, 5, function ()
-                                              awful.client.focus.byidx(-1)
-                                          end))
+    awful.button(
+        { },
+        1,
+        function (c)
+            if c == client.focus then
+                c.minimized = true
+            else
+                -- Without this, the following
+                -- :isvisible() makes no sense
+                c.minimized = false
+                if not c:isvisible() and c.first_tag then
+                    c.first_tag:view_only()
+                end
+                -- This will also un-minimize
+                -- the client, if needed
+                client.focus = c
+                c:raise()
+            end
+        end
+    ),
+    awful.button(
+        { },
+        3,
+        client_menu_toggle_fn()
+    ),
+    awful.button(
+        { },
+        4,
+        function ()
+            awful.client.focus.byidx(1)
+        end
+    ),
+    awful.button(
+        { },
+        5,
+        function ()
+            awful.client.focus.byidx(-1)
+        end
+    )
+)
 
 local function set_wallpaper(s)
     -- Wallpaper
@@ -176,54 +225,119 @@ local function set_wallpaper(s)
     end
 end
 
+
+local iostat_tooltiptext = ""
+-- Widget de monitoring de l'activité des disques https://awesomewm.org/recipes/watch/
+-- disk I/O using iostat from sysstat utilities
+local iotable = {}
+local iostat = awful.widget.watch("iostat -dm -y 1 1", 2, -- in Kb, use -dm for Mb
+    function(widget, stdout)
+        for line in stdout:match("(sd.*)\n"):gmatch("(.-)\n") do
+            local device, tps, read_s, wrtn_s, read, wrtn =
+            line:match("(%w+)%s*(%d+,?%d*)%s*(%d+,?%d*)%s*(%d+,?%d*)%s*(%d+,?%d*)%s*(%d+,?%d*)")
+            --                  [1]  [2]     [3]     [4]   [5]
+            iotable[device] = { tps, read_s, wrtn_s, read, wrtn }
+        end
+
+        local label = ""
+        for device,values in spairs(iotable) do
+          label = label..(device..": "..iotable[device][2].." MB_read/s  |"..iotable[device][3].." MB_wrtn/s").."\n"
+        end
+        iostat_tooltiptext = label
+
+        -- customize here
+        --widget:set_text("sda: "..iotable["sda"][2].."/"..iotable["sda"][3]) -- read_s/wrtn_s
+        widget:set_text("iostat")
+    end
+)
+
+iostat_t = awful.tooltip({
+ --objects = {  },
+ timer_function = function()
+         return iostat_tooltiptext
+     end,
+ })
+
+iostat_t:add_to_object(iostat)
+
+-- tris d'un tableau par la clef https://stackoverflow.com/questions/15706270/sort-a-table-in-lua
+function spairs(t, order)
+    -- collect the keys
+    local keys = {}
+    for k in pairs(t) do keys[#keys+1] = k end
+
+    -- if order function given, sort by it by passing the table and keys a, b,
+    -- otherwise just sort the keys
+    if order then
+        table.sort(keys, function(a,b) return order(t, a, b) end)
+    else
+        table.sort(keys)
+    end
+
+    -- return the iterator function
+    local i = 0
+    return function()
+        i = i + 1
+        if keys[i] then
+            return keys[i], t[keys[i]]
+        end
+    end
+end
+
 -- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
 screen.connect_signal("property::geometry", set_wallpaper)
 
-awful.screen.connect_for_each_screen(function(s)
-    -- Wallpaper
-    set_wallpaper(s)
+awful.screen.connect_for_each_screen(
+    function(s)
+        -- Wallpaper
+        set_wallpaper(s)
 
-    -- Each screen has its own tag table.
-    awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
+        -- Each screen has its own tag table.
+        awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
 
-    -- Create a promptbox for each screen
-    s.mypromptbox = awful.widget.prompt()
-    -- Create an imagebox widget which will contains an icon indicating which layout we're using.
-    -- We need one layoutbox per screen.
-    s.mylayoutbox = awful.widget.layoutbox(s)
-    s.mylayoutbox:buttons(awful.util.table.join(
-                           awful.button({ }, 1, function () awful.layout.inc( 1) end),
-                           awful.button({ }, 3, function () awful.layout.inc(-1) end),
-                           awful.button({ }, 4, function () awful.layout.inc( 1) end),
-                           awful.button({ }, 5, function () awful.layout.inc(-1) end)))
-    -- Create a taglist widget
-    s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons)
+        -- Create a promptbox for each screen
+        s.mypromptbox = awful.widget.prompt()
+        -- Create an imagebox widget which will contains an icon indicating which layout we're using.
+        -- We need one layoutbox per screen.
+        s.mylayoutbox = awful.widget.layoutbox(s)
+        s.mylayoutbox:buttons(awful.util.table.join(
+            awful.button({ }, 1, function () awful.layout.inc( 1) end),
+            awful.button({ }, 3, function () awful.layout.inc(-1) end),
+            awful.button({ }, 4, function () awful.layout.inc( 1) end),
+            awful.button({ }, 5, function () awful.layout.inc(-1) end)
+        ))
+        -- Create a taglist widget
+        s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons)
 
-    -- Create a tasklist widget
-    s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons)
+        -- Create a tasklist widget
+        s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons)
 
-    -- Create the wibox
-    s.mywibox = awful.wibar({ position = "top", screen = s })
+        -- Create the wibox
+        s.mywibox = awful.wibar({ position = "top", screen = s })
 
-    -- Add widgets to the wibox
-    s.mywibox:setup {
-        layout = wibox.layout.align.horizontal,
-        { -- Left widgets
-            layout = wibox.layout.fixed.horizontal,
-            mylauncher,
-            s.mytaglist,
-            s.mypromptbox,
-        },
-        s.mytasklist, -- Middle widget
-        { -- Right widgets
-            layout = wibox.layout.fixed.horizontal,
-            mykeyboardlayout,
-            wibox.widget.systray(),
-            mytextclock,
-            s.mylayoutbox,
-        },
-    }
-end)
+        -- Add widgets to the wibox
+        s.mywibox:setup {
+            layout = wibox.layout.align.horizontal,
+            { -- Left widgets
+                layout = wibox.layout.fixed.horizontal,
+                mylauncher,
+                s.mytaglist,
+                s.mypromptbox
+            },
+            s.mytasklist, -- Middle widget
+            { -- Right widgets
+              layout = wibox.layout.fixed.horizontal,
+              wibox.widget.textbox(' | '),
+              iostat,
+              wibox.widget.textbox(' | '),
+              mykeyboardlayout,
+              wibox.widget.systray(),
+              mytextclock,
+              s.mylayoutbox
+            }
+        }
+    end
+)
 -- }}}
 
 -- {{{ Mouse bindings
@@ -236,208 +350,154 @@ root.buttons(awful.util.table.join(
 
 -- {{{ Key bindings
 globalkeys = awful.util.table.join(
-    awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
-              {description="show help", group="awesome"}),
-    awful.key({ modkey,           }, "Left",   awful.tag.viewprev,
-              {description = "view previous", group = "tag"}),
-    awful.key({ modkey,           }, "Right",  awful.tag.viewnext,
-              {description = "view next", group = "tag"}),
-    awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
-              {description = "go back", group = "tag"}),
+    awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,                               {description="show help", group="awesome"}),
+    awful.key({ modkey,           }, "Left",   awful.tag.viewprev,                                    {description = "view previous", group = "tag"}),
+    awful.key({ modkey,           }, "Right",  awful.tag.viewnext,                                    {description = "view next", group = "tag"}),
+    awful.key({ modkey,           }, "Escape", awful.tag.history.restore,                             {description = "go back", group = "tag"}),
 
-    awful.key({ modkey,           }, "j",
-        function ()
-            awful.client.focus.byidx( 1)
-        end,
-        {description = "focus next by index", group = "client"}
-    ),
-    awful.key({ modkey,           }, "k",
-        function ()
-            awful.client.focus.byidx(-1)
-        end,
-        {description = "focus previous by index", group = "client"}
-    ),
-    awful.key({ modkey,           }, "w", function () mymainmenu:show() end,
-              {description = "show main menu", group = "awesome"}),
+    awful.key({ modkey,           }, "j", function () awful.client.focus.byidx( 1) end,               {description = "focus next by index", group = "client"}),
+    awful.key({ modkey,           }, "k", function () awful.client.focus.byidx(-1) end,               {description = "focus previous by index", group = "client"}),
+    awful.key({ modkey,           }, "w", function () mymainmenu:show() end,                          {description = "show main menu", group = "awesome"}),
 
     -- Layout manipulation
-    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end,
-              {description = "swap with next client by index", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end,
-              {description = "swap with previous client by index", group = "client"}),
-    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end,
-              {description = "focus the next screen", group = "screen"}),
-    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,
-              {description = "focus the previous screen", group = "screen"}),
-    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto,
-              {description = "jump to urgent client", group = "client"}),
-    awful.key({ modkey,           }, "Tab",
-        function ()
-            awful.client.focus.history.previous()
-            if client.focus then
-                client.focus:raise()
-            end
-        end,
-        {description = "go back", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end,            {description = "swap with next client by index", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end,            {description = "swap with previous client by index", group = "client"}),
+    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end,            {description = "focus the next screen", group = "screen"}),
+    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,            {description = "focus the previous screen", group = "screen"}),
+    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto,                                 {description = "jump to urgent client", group = "client"}),
+    awful.key({ modkey,           }, "Tab", function () awful.client.focus.history.previous() if client.focus then client.focus:raise() end end,
+                                                                                                      {description = "go back", group = "client"}),
 
     -- Standard program
-    awful.key({ modkey,           }, "Return", function () awful.spawn(terminal) end,
-              {description = "open a terminal", group = "launcher"}),
-    awful.key({ modkey, "Control" }, "r", awesome.restart,
-              {description = "reload awesome", group = "awesome"}),
-    awful.key({ modkey, "Shift"   }, "q", awesome.quit,
-              {description = "quit awesome", group = "awesome"}),
+    awful.key({ modkey,           }, "Return", function () awful.spawn(terminal) end,                 {description = "open a terminal", group = "launcher"}),
+    awful.key({ modkey, "Control" }, "r", awesome.restart,                                            {description = "reload awesome", group = "awesome"}),
+    awful.key({ modkey, "Shift"   }, "q", awesome.quit,                                               {description = "quit awesome", group = "awesome"}),
+    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)          end,    {description = "increase master width factor", group = "layout"}),
+    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)          end,    {description = "decrease master width factor", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1, nil, true) end,    {description = "increase the number of master clients", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1, nil, true) end,    {description = "decrease the number of master clients", group = "layout"}),
+    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1, nil, true)    end,    {description = "increase the number of columns", group = "layout"}),
+    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1, nil, true)    end,    {description = "decrease the number of columns", group = "layout"}),
+    awful.key({ modkey,           }, "space", function () awful.layout.inc( 1)                end,    {description = "select next", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(-1)                end,    {description = "select previous", group = "layout"}),
 
-    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)          end,
-              {description = "increase master width factor", group = "layout"}),
-    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)          end,
-              {description = "decrease master width factor", group = "layout"}),
-    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1, nil, true) end,
-              {description = "increase the number of master clients", group = "layout"}),
-    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1, nil, true) end,
-              {description = "decrease the number of master clients", group = "layout"}),
-    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1, nil, true)    end,
-              {description = "increase the number of columns", group = "layout"}),
-    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1, nil, true)    end,
-              {description = "decrease the number of columns", group = "layout"}),
-    awful.key({ modkey,           }, "space", function () awful.layout.inc( 1)                end,
-              {description = "select next", group = "layout"}),
-    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(-1)                end,
-              {description = "select previous", group = "layout"}),
-
-    awful.key({ modkey, "Control" }, "n",
-              function ()
-                  local c = awful.client.restore()
-                  -- Focus restored client
-                  if c then
-                      client.focus = c
-                      c:raise()
-                  end
-              end,
-              {description = "restore minimized", group = "client"}),
+    awful.key({ modkey, "Control" }, "n", function () local c = awful.client.restore() --[[ Focus restored client ]] if c then client.focus = c c:raise() end end,
+                                                                                                      {description = "restore minimized", group = "client"}),
 
     -- Prompt
-    awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
-              {description = "run prompt", group = "launcher"}),
+    awful.key({ modkey },            "r", function () awful.screen.focused().mypromptbox:run() end,   {description = "run prompt", group = "launcher"}),
 
     awful.key({ modkey }, "x",
-              function ()
-                  awful.prompt.run {
-                    prompt       = "Run Lua code: ",
-                    textbox      = awful.screen.focused().mypromptbox.widget,
-                    exe_callback = awful.util.eval,
-                    history_path = awful.util.get_cache_dir() .. "/history_eval"
-                  }
-              end,
-              {description = "lua execute prompt", group = "awesome"}),
+    function ()
+        awful.prompt.run {
+            prompt       = "Run Lua code: ",
+            textbox      = awful.screen.focused().mypromptbox.widget,
+            exe_callback = awful.util.eval,
+            history_path = awful.util.get_cache_dir() .. "/history_eval"
+        }
+    end,
+                                                                                                      {description = "lua execute prompt", group = "awesome"}),
     -- Menubar
-    awful.key({ modkey }, "p", function() menubar.show() end,
-              {description = "show the menubar", group = "launcher"}),
-    -- Lanceurs perso
-    awful.key({ modkey            }, "F1", function () awful.util.spawn("firefox") end),
-    awful.key({ modkey            }, "F2", function () awful.util.spawn("firefox") end),
---  awful.key({ modkey            }, "F3", function () awful.util.spawn("") end),
-    awful.key({ modkey            }, "F4", function () awful.util.spawn("chromium") end),
-    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, "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),
+    awful.key({ modkey }, "p", function() menubar.show() end,                                         {description = "show the menubar", group = "launcher"}),
 
+    -- Lanceurs perso
+    awful.key({ modkey            }, "F1",  function () awful.util.spawn("firefox") end,              {description = "Lance Firefox", group = "Lanceurs personnels"}),
+    awful.key({ modkey            }, "F2",  function () awful.util.spawn("firefox") end,              {description = "Lance Firefox", group = "Lanceurs personnels"}),
+    awful.key({ modkey            }, "F3",  function () awful.util.spawn("gqrx") end,                 {description = "Lance gqrx", group = "Lanceurs personnels"}),
+    awful.key({ modkey            }, "F4",  function () awful.util.spawn("chromium") end,             {description = "Lance Chromium", group = "Lanceurs personnels"}),
+    awful.key({ modkey            }, "F5",  function () awful.util.spawn("spacefm") end,              {description = "Lance spacefm", group = "Lanceurs personnels"}),
+    awful.key({ modkey            }, "F6",  function () awful.util.spawn("vlc") end,                  {description = "Lance vlc", group = "Lanceurs personnels"}),
+    awful.key({ modkey            }, "F7",  function () awful.util.spawn("claws-mail") end,           {description = "Lance claws", group = "Lanceurs personnels"}),
+    awful.key({ modkey            }, "F11", function () awful.util.spawn("xrandr-auto") end,          {description = "Lance le script xrandr-auto", group = "Lanceurs personnels"}),
+    awful.key({ modkey            }, "F12", function () awful.util.spawn("slock") end,                {description = "Verouille la session avec slock", group = "Lanceurs personnels"}),
+    awful.key({ modkey, "Shift"   }, "F1",  function () awful.util.spawn("claws-mail") end,           {description = "Lance claws", group = "Lanceurs personnels"}),
+    awful.key({ modkey, "Shift"   }, "F3",  function () awful.util.spawn("pcmanfm") end,              {description = "Lance pcmanfm", group = "Lanceurs personnels"}),
+    awful.key({ modkey, "Shift"   }, "F6",  function () awful.util.spawn("clementine") end,           {description = "Lance clementine", group = "Lanceurs personnels"}),
+    awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("xrandr-auto-2") end,        {description = "Lance le script xrandr-auto-2", group = "Lanceurs personnels"}),
+    awful.key({ modkey  }, "l", function () awful.util.spawn("slock systemctl suspend -i") end, {description = "Verouille la session avec slock", group = "Lanceurs personnels"})
+    --  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),
 )
 
 clientkeys = awful.util.table.join(
-    awful.key({ modkey,           }, "f",
-        function (c)
-            c.fullscreen = not c.fullscreen
-            c:raise()
-        end,
-        {description = "toggle fullscreen", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end,
-              {description = "close", group = "client"}),
-    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ,
-              {description = "toggle floating", group = "client"}),
-    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
-              {description = "move to master", group = "client"}),
-    awful.key({ modkey,           }, "o",      function (c) c:move_to_screen()               end,
-              {description = "move to screen", group = "client"}),
-    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end,
-              {description = "toggle keep on top", group = "client"}),
-    awful.key({ modkey,           }, "n",
-        function (c)
-            -- The client currently has the input focus, so it cannot be
-            -- minimized, since minimized clients can't have the focus.
-            c.minimized = true
-        end ,
-        {description = "minimize", group = "client"}),
-    awful.key({ modkey,           }, "m",
-        function (c)
-            c.maximized = not c.maximized
-            c:raise()
-        end ,
-        {description = "maximize", group = "client"})
+    awful.key({ modkey,           }, "f", function (c) c.fullscreen = not c.fullscreen c:raise() end, {description = "toggle fullscreen", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end,     {description = "close", group = "client"}),
+    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ,     {description = "toggle floating", group = "client"}),
+    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,     {description = "move to master", group = "client"}),
+    awful.key({ modkey,           }, "o",      function (c) c:move_to_screen()               end,     {description = "move to screen", group = "client"}),
+    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end,     {description = "toggle keep on top", group = "client"}),
+    awful.key({ modkey,           }, "n",      function (c) --[[ The client currently has the input focus, so it cannot be minimized, since minimized clients can't have the focus. ]]  c.minimized = true end ,
+                                                                                                      {description = "minimize", group = "client"}),
+    awful.key({ modkey,           }, "m", function (c) c.maximized = not c.maximized c:raise() end ,  {description = "maximize", group = "client"})
 )
 
 -- Bind all key numbers to tags.
 -- Be careful: we use keycodes to make it works on any keyboard layout.
 -- This should map on the top row of your keyboard, usually 1 to 9.
 for i = 1, 9 do
-    globalkeys = awful.util.table.join(globalkeys,
+    globalkeys = awful.util.table.join(
+        globalkeys,
         -- View tag only.
-        awful.key({ modkey }, "#" .. i + 9,
-                  function ()
-                        local screen = awful.screen.focused()
-                        local tag = screen.tags[i]
-                        if tag then
-                           tag:view_only()
-                        end
-                  end,
-                  {description = "view tag #"..i, group = "tag"}),
+        awful.key(
+            { modkey },
+            "#" .. i + 9,
+            function ()
+                local screen = awful.screen.focused()
+                local tag = screen.tags[i]
+                if tag then
+                    tag:view_only()
+                end
+            end,
+            {description = "view tag #"..i, group = "tag"}
+        ),
         -- Toggle tag display.
-        awful.key({ modkey, "Control" }, "#" .. i + 9,
-                  function ()
-                      local screen = awful.screen.focused()
-                      local tag = screen.tags[i]
-                      if tag then
-                         awful.tag.viewtoggle(tag)
-                      end
-                  end,
-                  {description = "toggle tag #" .. i, group = "tag"}),
+        awful.key(
+            { modkey, "Control" },
+            "#" .. i + 9,
+            function ()
+                local screen = awful.screen.focused()
+                local tag = screen.tags[i]
+                if tag then
+                    awful.tag.viewtoggle(tag)
+                end
+            end,
+            {description = "toggle tag #" .. i, group = "tag"}
+        ),
         -- Move client to tag.
-        awful.key({ modkey, "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus then
-                          local tag = client.focus.screen.tags[i]
-                          if tag then
-                              client.focus:move_to_tag(tag)
-                          end
-                     end
-                  end,
-                  {description = "move focused client to tag #"..i, group = "tag"}),
+        awful.key(
+            { modkey, "Shift" },
+            "#" .. i + 9,
+            function ()
+                if client.focus then
+                    local tag = client.focus.screen.tags[i]
+                    if tag then
+                        client.focus:move_to_tag(tag)
+                    end
+                end
+            end,
+            {description = "move focused client to tag #"..i, group = "tag"}
+        ),
         -- Toggle tag on focused client.
-        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus then
-                          local tag = client.focus.screen.tags[i]
-                          if tag then
-                              client.focus:toggle_tag(tag)
-                          end
-                      end
-                  end,
-                  {description = "toggle focused client on tag #" .. i, group = "tag"})
+        awful.key(
+            { modkey, "Control", "Shift" },
+            "#" .. i + 9,
+            function ()
+                if client.focus then
+                    local tag = client.focus.screen.tags[i]
+                    if tag then
+                        client.focus:toggle_tag(tag)
+                    end
+                end
+            end,
+            {description = "toggle focused client on tag #" .. i, group = "tag"}
+        )
     )
 end
 
 clientbuttons = awful.util.table.join(
-    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
-    awful.button({ modkey }, 1, awful.mouse.client.move),
-    awful.button({ modkey }, 3, awful.mouse.client.resize))
+awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
+awful.button({ modkey }, 1, awful.mouse.client.move),
+awful.button({ modkey }, 3, awful.mouse.client.resize))
 
 -- Set keys
 root.keys(globalkeys)
@@ -447,119 +507,142 @@ root.keys(globalkeys)
 -- Rules to apply to new clients (through the "manage" signal).
 awful.rules.rules = {
     -- All clients will match this rule.
-    { rule = { },
-      properties = { border_width = beautiful.border_width,
-                     border_color = beautiful.border_normal,
-                     focus = awful.client.focus.filter,
-                     raise = true,
-                     keys = clientkeys,
-                     buttons = clientbuttons,
-                     screen = awful.screen.preferred,
-                     placement = awful.placement.no_overlap+awful.placement.no_offscreen
-     }
-    },
+    {
+        rule = { },
+        properties = {
+            border_width = beautiful.border_width,
+            border_color = beautiful.border_normal,
+            focus = awful.client.focus.filter,
+            raise = true,
+            keys = clientkeys,
+            buttons = clientbuttons,
+            screen = awful.screen.preferred,
+            placement = awful.placement.no_overlap+awful.placement.no_offscreen
+          }
+      },
+      -- Floating clients.
+      {
+          rule_any = {
+              instance = {
+                  "DTA",  -- Firefox addon DownThemAll.
+                  "copyq",  -- Includes session name in class.
+              },
+              class = {
+                  "Arandr",
+                  "Gpick",
+                  "Kruler",
+                  "MessageWin",  -- kalarm.
+                  "Sxiv",
+                  "Wpa_gui",
+                  "pinentry",
+                  "veromix",
+                  "xtightvncviewer"
+              },
+              name = {
+                  "Event Tester",  -- xev.
+              },
+              role = {
+                  "AlarmWindow",  -- Thunderbird's calendar.
+                  "pop-up",       -- e.g. Google Chrome's (detached) Developer Tools.
+              }
+          },
+          properties = { floating = true }
+      },
 
-    -- Floating clients.
-    { rule_any = {
-        instance = {
-          "DTA",  -- Firefox addon DownThemAll.
-          "copyq",  -- Includes session name in class.
-        },
-        class = {
-          "Arandr",
-          "Gpick",
-          "Kruler",
-          "MessageWin",  -- kalarm.
-          "Sxiv",
-          "Wpa_gui",
-          "pinentry",
-          "veromix",
-          "xtightvncviewer"},
+      -- Add titlebars to normal clients and dialogs
+      {
+          rule_any = {
+              type = { "normal", "dialog" }
+          },
+          properties = { titlebars_enabled = false }
+      },
 
-        name = {
-          "Event Tester",  -- xev.
-        },
-        role = {
-          "AlarmWindow",  -- Thunderbird's calendar.
-          "pop-up",       -- e.g. Google Chrome's (detached) Developer Tools.
-        }
-      }, properties = { floating = true }},
-
-    -- Add titlebars to normal clients and dialogs
-    { rule_any = {type = { "normal", "dialog" }
-      }, properties = { titlebars_enabled = false }
-    },
-
-    -- Set Firefox to always map on the tag named "2" on screen 1.
-    -- { rule = { class = "Firefox" },
-    --   properties = { screen = 1, tag = "2" } },
+      -- Set Firefox to always map on the tag named "2" on screen 1.
+      -- { rule = { class = "Firefox" },
+      --   properties = { screen = 1, tag = "2" } },
 }
 -- }}}
 
 -- {{{ Signals
 -- Signal function to execute when a new client appears.
-client.connect_signal("manage", function (c)
-    -- Set the windows at the slave,
-    -- i.e. put it at the end of others instead of setting it master.
-    -- if not awesome.startup then awful.client.setslave(c) end
+client.connect_signal(
+    "manage",
+    function (c)
+        --[[ Set the windows at the slave, i.e. put it at the end of others instead of setting it master.]]
+        -- if not awesome.startup then awful.client.setslave(c) end
 
-    if awesome.startup and
-      not c.size_hints.user_position
-      and not c.size_hints.program_position then
-        -- Prevent clients from being unreachable after screen count changes.
-        awful.placement.no_offscreen(c)
+        if awesome.startup and
+            not c.size_hints.user_position
+            and not c.size_hints.program_position then
+            --[[ Prevent clients from being unreachable after screen count changes.]]
+            awful.placement.no_offscreen(c)
+        end
     end
-end)
+)
 
 -- Add a titlebar if titlebars_enabled is set to true in the rules.
-client.connect_signal("request::titlebars", function(c)
-    -- buttons for the titlebar
-    local buttons = awful.util.table.join(
-        awful.button({ }, 1, function()
-            client.focus = c
-            c:raise()
-            awful.mouse.client.move(c)
-        end),
-        awful.button({ }, 3, function()
-            client.focus = c
-            c:raise()
-            awful.mouse.client.resize(c)
-        end)
-    )
+client.connect_signal(
+    "request::titlebars",
+    function(c)
+        -- buttons for the titlebar
+        local buttons = awful.util.table.join(
+            awful.button(
+                { },
+                1,
+                function()
+                    client.focus = c
+                    c:raise()
+                    awful.mouse.client.move(c)
+                end
+            ),
+            awful.button(
+                { },
+                3,
+                function()
+                    client.focus = c
+                    c:raise()
+                    awful.mouse.client.resize(c)
+                end
+            )
+        )
 
-    awful.titlebar(c) : setup {
-        { -- Left
-            awful.titlebar.widget.iconwidget(c),
-            buttons = buttons,
-            layout  = wibox.layout.fixed.horizontal
-        },
-        { -- Middle
-            { -- Title
-                align  = "center",
-                widget = awful.titlebar.widget.titlewidget(c)
+        awful.titlebar(c) : setup {
+            { -- Left
+                awful.titlebar.widget.iconwidget(c),
+                buttons = buttons,
+                layout  = wibox.layout.fixed.horizontal
             },
-            buttons = buttons,
-            layout  = wibox.layout.flex.horizontal
-        },
-        { -- Right
-            awful.titlebar.widget.floatingbutton (c),
-            awful.titlebar.widget.maximizedbutton(c),
-            awful.titlebar.widget.stickybutton   (c),
-            awful.titlebar.widget.ontopbutton    (c),
-            awful.titlebar.widget.closebutton    (c),
-            layout = wibox.layout.fixed.horizontal()
-        },
-        layout = wibox.layout.align.horizontal
-    }
-end)
+            { -- Middle
+                { -- Title
+                    align  = "center",
+                    widget = awful.titlebar.widget.titlewidget(c)
+                },
+                buttons = buttons,
+                layout  = wibox.layout.flex.horizontal
+            },
+            { -- Right
+                awful.titlebar.widget.floatingbutton (c),
+                awful.titlebar.widget.maximizedbutton(c),
+                awful.titlebar.widget.stickybutton   (c),
+                awful.titlebar.widget.ontopbutton    (c),
+                awful.titlebar.widget.closebutton    (c),
+                layout = wibox.layout.fixed.horizontal()
+            },
+            layout = wibox.layout.align.horizontal
+        }
+    end
+)
 
 -- Enable sloppy focus, so that focus follows mouse.
-client.connect_signal("mouse::enter", function(c)
-    if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
+client.connect_signal(
+    "mouse::enter",
+    function(c)
+        if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
         and awful.client.focus.filter(c) then
-        client.focus = c
+            client.focus = c
+        end
     end
-end)
+)
 
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)

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;
+}

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
   ];
 }

services/docker.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.docker {
+mkIf flags.docker {
 
   # Paquets
   environment.systemPackages = with pkgs; [
     # Ecosystème Docker
     docker
-    python27Packages.docker_compose
+    docker-compose
   ];
 
   virtualisation.docker.enable = true;

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; [

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;
+}

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 {

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 = 8888;
+    port = 10080;
   };
 }

services/hydra-build.nix

@@ -2,31 +2,40 @@
 
 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;
+    };
+    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.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; [
@@ -76,7 +76,7 @@ mkIf cfg.hydra-core {
   ### Machines connues
 
   programs.ssh.knownHosts = {
-    "hydra.prunetwork.fr".publicKey     = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHqja/yYsQeS5amZKPUG+EKSIkjEN6fYW54Fzvj1pFaP";
+    "hydra.prunetwork.fr".publicKey     = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDYrZu31+/ybhel7LNPNgsALEoMHwTc1OiTcmJnXZ3He";
     "monstre.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBTTrLhq1Cwm0rpnwEIxSLqVrJWZnt+/9dt+SKd8NiIc";
     "pedro.dubronetwork.fr".publicKey   = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD";
     "ocean.prunetwork.fr".publicKey     = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINCaRuTl8iCTUE4XInOpkSlwQj5Re4w4Iq+gNIlJe8pA";

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; [

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 = {

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; [
@@ -22,11 +21,34 @@ mkIf true {
   ## Noeud de supervision munin = pas de stockage des données locales
   services.munin-node = {
     enable = true;
+    extraConfig = ''
+      # Ignore the apc_nis plugin, as it throws errors as I don't have an UPS.
+      # It's there because munin-node-configure is called with the contrib group,
+      # and the plugin has no method to check whether there's a compatible UPS available.
+      ignore_file ^apc_nis$
+
+      ignore_file ^sensors_-wrapped$
+      ignore_file ^.sensors_-wrapped$
+    '';
+    extraPlugins = {
+      chrony = /etc/nixos/base/services/munin-chrony;
+      chrony_tracking_stratum = /etc/nixos/base/services/munin-chrony-tracking-stratum;
+      chrony_tracking_ppm = /etc/nixos/base/services/munin-chrony-tracking-ppm;
+      chrony_tracking_time_ = /etc/nixos/base/services/munin-chrony-tracking-time;
+      chrony_tracking_time_root = /etc/nixos/base/services/munin-chrony-tracking-time-root;
+      chrony_tracking_update_time = /etc/nixos/base/services/munin-chrony-tracking-update-time;
+    };
   };
   systemd.services.munin-node = {
     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 = {
@@ -34,9 +56,22 @@ mkIf true {
     hosts = ''
       [${config.networking.hostName}]
         address 127.0.0.1
+        df._dev_sda2.warning 35
+        use_node_name yes
+        #contacts syslog
+        contacts email
     '';
+    # http://sametmax.com/monitorez-vos-serveurs-avec-munin-et-notifications-par-email/
+    # http://guide.munin-monitoring.org/en/latest/tutorial/alert.html#syntax-of-warning-and-critical
     extraGlobalConfig = ''
-      contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/public/services/munin-muttrc -s "Munin notification for ''${var:host}" root@prunetwork.fr
+      #---
+      #contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/services/munin-muttrc  -s "Munin notification for ${config.networking.hostName}" root@ocean.prunetwork.fr
+      contact.email.command  /run/current-system/sw/bin/mutt -F /etc/nixos/base/services/munin-muttrc  -s "Munin notification for ${config.networking.hostName}" root@ocean.prunetwork.fr
+      contact.syslog.command /run/current-system/sw/bin/logger -p user.crit                 -t "Munin notification for ${config.networking.hostName}"
+
+      #---
+      contact.email.always_send ok,warning,critical,unknown
+      contact.syslog.always_send ok,warning,critical,unknown
     '';
   };
 

services/munin-chrony

@@ -0,0 +1,123 @@
+#!/bin/sh
+
+: <<=cut
+
+=head1 NAME
+
+parse Chrony Tracking output for timeserver status information
+
+=head1 APPLICABLE SYSTEMS
+
+Any system with a local chronyd service.
+
+=head1 CONFIGURATION
+
+No configuration.
+
+=head1 MAGIC MARKERS
+
+  #%# family=auto
+  #%# capabilities=autoconf
+
+=head1 VERSION
+
+Revision 0.1 2008/08/23 13:06:00 joti
+
+  First version only chronyc tracking, autodetection included.
+
+Revision 0.2 2008/10/11 16:09:00 joti
+
+  Added scaling of other values to match with frequency, added more description to fields
+
+Revision 0.3 2014/02/16 zjttoefs
+
+  reduce forking by using awk
+  do not limit output precision
+  add stratum monitoring
+  detect slow/fast time or freqency and adjust sign of value accordingly
+  remove commented out code
+
+Revision 0.4 2016/11/10 Lars Kruse
+
+  rewrite field handling
+  use "which" for "chronyc" location
+  switch from "bash" to "sh"
+  fix exit code of failing "autoconf"
+
+=head1 AUTHOR
+
+  joti
+  zjttoefs
+  Lars Kruse <devel@sumpfralle.de>
+
+=cut
+
+CHRONYC="$(which chronyc | head -1)"
+
+# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
+# field definitions:
+#   - munin fieldname
+#   - factor for graph visualization (all values are supposed to reach a similar dimension)
+#   - regular expression of the chrony output line (may not contain whitespace, case insensitive)
+#   - label (may include "%d" for including the factor; may contain whitespace)
+fields="stratum		1	^Stratum		Stratum
+	systime		1000000	^System.time		System Time (us)
+	offsetlast	1000000	^Last.offset		Last Offset (us)
+	offsetrms	1000000	^RMS.offset		RMS Offset (us)
+	frequency	1	^Frequency		Frequency (ppm)
+	residualfreq	1	^Residual.freq		Residual Freq (ppm)
+	skew		1	^Skew			Skew (ppm)
+	rootdelay	1000000	^Root.delay		Root Delay (us)
+	rootdispersion	1000000	^Root.dispersion	Root Dispersion (us)
+	updateinterval	1	^Update.interval	Update Interval (s)"
+
+# chrony example output (v2.4.1):
+#   Reference ID    : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
+#   Stratum         : 2
+#   Ref time (UTC)  : Thu Nov 10 22:39:50 2016
+#   System time     : 0.000503798 seconds slow of NTP time
+#   Last offset     : +0.000254355 seconds
+#   RMS offset      : 0.002186779 seconds
+#   Frequency       : 17.716 ppm slow
+#   Residual freq   : +0.066 ppm
+#   Skew            : 4.035 ppm
+#   Root delay      : 0.042980 seconds
+#   Root dispersion : 0.005391 seconds
+#   Update interval : 258.4 seconds
+#   Leap status     : Normal
+
+
+if [ "$1" = "autoconf" ]; then
+	if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
+		echo yes
+	else
+		echo "no (missing 'chronyc' executable)"
+	fi
+	exit 0
+fi
+
+if [ "$1" = "config" ]; then
+	echo 'graph_title Chrony Tracking Stats'
+	echo 'graph_args --base 1000 -l 0'
+	echo 'graph_vlabel (time,ppm)'
+	echo 'graph_category time'
+	echo 'graph_scale no'
+	echo "$fields" | while read fieldname factor regex label; do
+		# insert the factor, if "%d" is part of the label
+		printf "${fieldname}.label $label\n" "$factor"
+		echo "${fieldname}.type GAUGE"
+	done
+	exit 0
+fi
+
+chrony_status="$("$CHRONYC" tracking)"
+echo "$fields" | while read fieldname factor regex label; do
+	status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
+	if [ -z "$status_line" ]; then
+		value="U"
+	else
+		# the keyword "slow" indicates negative values
+		value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
+	fi
+	echo "${fieldname}.value $value"
+done

services/munin-chrony-tracking-ppm

@@ -0,0 +1,116 @@
+#!/bin/sh
+
+: <<=cut
+
+=head1 NAME
+
+parse Chrony Tracking output for timeserver status information
+
+=head1 APPLICABLE SYSTEMS
+
+Any system with a local chronyd service.
+
+=head1 CONFIGURATION
+
+No configuration.
+
+=head1 MAGIC MARKERS
+
+  #%# family=auto
+  #%# capabilities=autoconf
+
+=head1 VERSION
+
+Revision 0.1 2008/08/23 13:06:00 joti
+
+  First version only chronyc tracking, autodetection included.
+
+Revision 0.2 2008/10/11 16:09:00 joti
+
+  Added scaling of other values to match with frequency, added more description to fields
+
+Revision 0.3 2014/02/16 zjttoefs
+
+  reduce forking by using awk
+  do not limit output precision
+  add stratum monitoring
+  detect slow/fast time or freqency and adjust sign of value accordingly
+  remove commented out code
+
+Revision 0.4 2016/11/10 Lars Kruse
+
+  rewrite field handling
+  use "which" for "chronyc" location
+  switch from "bash" to "sh"
+  fix exit code of failing "autoconf"
+
+=head1 AUTHOR
+
+  joti
+  zjttoefs
+  Lars Kruse <devel@sumpfralle.de>
+
+=cut
+
+CHRONYC="$(which chronyc | head -1)"
+
+# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
+# field definitions:
+#   - munin fieldname
+#   - factor for graph visualization (all values are supposed to reach a similar dimension)
+#   - regular expression of the chrony output line (may not contain whitespace, case insensitive)
+#   - label (may include "%d" for including the factor; may contain whitespace)
+fields="frequency	1	^Frequency		Local Clock Frequency Drift (ppm)
+	residualfreq	1	^Residual.freq		Residual Freq (ppm)
+	skew		1	^Skew			Skew (ppm)"
+
+# chrony example output (v2.4.1):
+#   Reference ID    : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
+#   Stratum         : 2
+#   Ref time (UTC)  : Thu Nov 10 22:39:50 2016
+#   System time     : 0.000503798 seconds slow of NTP time
+#   Last offset     : +0.000254355 seconds
+#   RMS offset      : 0.002186779 seconds
+#   Frequency       : 17.716 ppm slow
+#   Residual freq   : +0.066 ppm
+#   Skew            : 4.035 ppm
+#   Root delay      : 0.042980 seconds
+#   Root dispersion : 0.005391 seconds
+#   Update interval : 258.4 seconds
+#   Leap status     : Normal
+
+
+if [ "$1" = "autoconf" ]; then
+	if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
+		echo yes
+	else
+		echo "no (missing 'chronyc' executable)"
+	fi
+	exit 0
+fi
+
+if [ "$1" = "config" ]; then
+	echo 'graph_title Chrony Tracking Stats - Frequencies stability'
+	echo 'graph_args --base 1000 -l 0'
+	echo 'graph_vlabel (ppm)'
+	echo 'graph_category time'
+	echo 'graph_scale no'
+	echo "$fields" | while read fieldname factor regex label; do
+		# insert the factor, if "%d" is part of the label
+		printf "${fieldname}.label $label\n" "$factor"
+		echo "${fieldname}.type GAUGE"
+	done
+	exit 0
+fi
+
+chrony_status="$("$CHRONYC" tracking)"
+echo "$fields" | while read fieldname factor regex label; do
+	status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
+	if [ -z "$status_line" ]; then
+		value="U"
+	else
+		# the keyword "slow" indicates negative values
+		value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
+	fi
+	echo "${fieldname}.value $value"
+done

services/munin-chrony-tracking-stratum

@@ -0,0 +1,116 @@
+#!/bin/sh
+
+: <<=cut
+
+=head1 NAME
+
+parse Chrony Tracking output for timeserver status information
+
+=head1 APPLICABLE SYSTEMS
+
+Any system with a local chronyd service.
+
+=head1 CONFIGURATION
+
+No configuration.
+
+=head1 MAGIC MARKERS
+
+  #%# family=auto
+  #%# capabilities=autoconf
+
+=head1 VERSION
+
+Revision 0.1 2008/08/23 13:06:00 joti
+
+  First version only chronyc tracking, autodetection included.
+
+Revision 0.2 2008/10/11 16:09:00 joti
+
+  Added scaling of other values to match with frequency, added more description to fields
+
+Revision 0.3 2014/02/16 zjttoefs
+
+  reduce forking by using awk
+  do not limit output precision
+  add stratum monitoring
+  detect slow/fast time or freqency and adjust sign of value accordingly
+  remove commented out code
+
+Revision 0.4 2016/11/10 Lars Kruse
+
+  rewrite field handling
+  use "which" for "chronyc" location
+  switch from "bash" to "sh"
+  fix exit code of failing "autoconf"
+
+=head1 AUTHOR
+
+  joti
+  zjttoefs
+  Lars Kruse <devel@sumpfralle.de>
+
+=cut
+
+CHRONYC="$(which chronyc | head -1)"
+
+# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
+# field definitions:
+#   - munin fieldname
+#   - factor for graph visualization (all values are supposed to reach a similar dimension)
+#   - regular expression of the chrony output line (may not contain whitespace, case insensitive)
+#   - label (may include "%d" for including the factor; may contain whitespace)
+fields="stratum		1	^Stratum		Stratum"
+
+# chrony example output (v2.4.1):
+#   Reference ID    : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
+#   Stratum         : 2
+#   Ref time (UTC)  : Thu Nov 10 22:39:50 2016
+#   System time     : 0.000503798 seconds slow of NTP time
+#   Last offset     : +0.000254355 seconds
+#   RMS offset      : 0.002186779 seconds
+#   Frequency       : 17.716 ppm slow
+#   Residual freq   : +0.066 ppm
+#   Skew            : 4.035 ppm
+#   Root delay      : 0.042980 seconds
+#   Root dispersion : 0.005391 seconds
+#   Update interval : 258.4 seconds
+#   Leap status     : Normal
+
+
+if [ "$1" = "autoconf" ]; then
+	if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
+		echo yes
+	else
+		echo "no (missing 'chronyc' executable)"
+	fi
+	exit 0
+fi
+
+if [ "$1" = "config" ]; then
+	echo 'graph_title Chrony Tracking Stats - Stratum'
+	echo 'graph_args --base 1000 -l 0'
+	echo 'graph_vlabel (stratum)'
+	echo 'graph_category time'
+	echo 'graph_scale no'
+	echo 'stratum.warning 8'
+	echo 'stratum.critical 11'
+	echo "$fields" | while read fieldname factor regex label; do
+		# insert the factor, if "%d" is part of the label
+		printf "${fieldname}.label $label\n" "$factor"
+		echo "${fieldname}.type GAUGE"
+	done
+	exit 0
+fi
+
+chrony_status="$("$CHRONYC" tracking)"
+echo "$fields" | while read fieldname factor regex label; do
+	status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
+	if [ -z "$status_line" ]; then
+		value="U"
+	else
+		# the keyword "slow" indicates negative values
+		value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
+	fi
+	echo "${fieldname}.value $value"
+done

services/munin-chrony-tracking-time

@@ -0,0 +1,118 @@
+#!/bin/sh
+
+: <<=cut
+
+=head1 NAME
+
+parse Chrony Tracking output for timeserver status information
+
+=head1 APPLICABLE SYSTEMS
+
+Any system with a local chronyd service.
+
+=head1 CONFIGURATION
+
+No configuration.
+
+=head1 MAGIC MARKERS
+
+  #%# family=auto
+  #%# capabilities=autoconf
+
+=head1 VERSION
+
+Revision 0.1 2008/08/23 13:06:00 joti
+
+  First version only chronyc tracking, autodetection included.
+
+Revision 0.2 2008/10/11 16:09:00 joti
+
+  Added scaling of other values to match with frequency, added more description to fields
+
+Revision 0.3 2014/02/16 zjttoefs
+
+  reduce forking by using awk
+  do not limit output precision
+  add stratum monitoring
+  detect slow/fast time or freqency and adjust sign of value accordingly
+  remove commented out code
+
+Revision 0.4 2016/11/10 Lars Kruse
+
+  rewrite field handling
+  use "which" for "chronyc" location
+  switch from "bash" to "sh"
+  fix exit code of failing "autoconf"
+
+=head1 AUTHOR
+
+  joti
+  zjttoefs
+  Lars Kruse <devel@sumpfralle.de>
+
+=cut
+
+CHRONYC="$(which chronyc | head -1)"
+
+# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
+# field definitions:
+#   - munin fieldname
+#   - factor for graph visualization (all values are supposed to reach a similar dimension)
+#   - regular expression of the chrony output line (may not contain whitespace, case insensitive)
+#   - label (may include "%d" for including the factor; may contain whitespace)
+fields="systime		1000000	^System.time		System Time (us)
+	offsetlast	1000000	^Last.offset		Last Offset (us)
+	offsetrms	1000000	^RMS.offset		RMS Offset (us)
+	rootdelay	1000000	^Root.delay		Root Delay (us)
+	rootdispersion	1000000	^Root.dispersion	Root Dispersion (us)"
+
+# chrony example output (v2.4.1):
+#   Reference ID    : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
+#   Stratum         : 2
+#   Ref time (UTC)  : Thu Nov 10 22:39:50 2016
+#   System time     : 0.000503798 seconds slow of NTP time
+#   Last offset     : +0.000254355 seconds
+#   RMS offset      : 0.002186779 seconds
+#   Frequency       : 17.716 ppm slow
+#   Residual freq   : +0.066 ppm
+#   Skew            : 4.035 ppm
+#   Root delay      : 0.042980 seconds
+#   Root dispersion : 0.005391 seconds
+#   Update interval : 258.4 seconds
+#   Leap status     : Normal
+
+
+if [ "$1" = "autoconf" ]; then
+	if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
+		echo yes
+	else
+		echo "no (missing 'chronyc' executable)"
+	fi
+	exit 0
+fi
+
+if [ "$1" = "config" ]; then
+	echo 'graph_title Chrony Tracking Stats - Time'
+	echo 'graph_args --base 1000 -l 0'
+	echo 'graph_vlabel (time)'
+	echo 'graph_category time'
+	echo 'graph_scale no'
+	echo "$fields" | while read fieldname factor regex label; do
+		# insert the factor, if "%d" is part of the label
+		printf "${fieldname}.label $label\n" "$factor"
+		echo "${fieldname}.type GAUGE"
+	done
+	exit 0
+fi
+
+chrony_status="$("$CHRONYC" tracking)"
+echo "$fields" | while read fieldname factor regex label; do
+	status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
+	if [ -z "$status_line" ]; then
+		value="U"
+	else
+		# the keyword "slow" indicates negative values
+		value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
+	fi
+	echo "${fieldname}.value $value"
+done

services/munin-chrony-tracking-time-root

@@ -0,0 +1,115 @@
+#!/bin/sh
+
+: <<=cut
+
+=head1 NAME
+
+parse Chrony Tracking output for timeserver status information
+
+=head1 APPLICABLE SYSTEMS
+
+Any system with a local chronyd service.
+
+=head1 CONFIGURATION
+
+No configuration.
+
+=head1 MAGIC MARKERS
+
+  #%# family=auto
+  #%# capabilities=autoconf
+
+=head1 VERSION
+
+Revision 0.1 2008/08/23 13:06:00 joti
+
+  First version only chronyc tracking, autodetection included.
+
+Revision 0.2 2008/10/11 16:09:00 joti
+
+  Added scaling of other values to match with frequency, added more description to fields
+
+Revision 0.3 2014/02/16 zjttoefs
+
+  reduce forking by using awk
+  do not limit output precision
+  add stratum monitoring
+  detect slow/fast time or freqency and adjust sign of value accordingly
+  remove commented out code
+
+Revision 0.4 2016/11/10 Lars Kruse
+
+  rewrite field handling
+  use "which" for "chronyc" location
+  switch from "bash" to "sh"
+  fix exit code of failing "autoconf"
+
+=head1 AUTHOR
+
+  joti
+  zjttoefs
+  Lars Kruse <devel@sumpfralle.de>
+
+=cut
+
+CHRONYC="$(which chronyc | head -1)"
+
+# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
+# field definitions:
+#   - munin fieldname
+#   - factor for graph visualization (all values are supposed to reach a similar dimension)
+#   - regular expression of the chrony output line (may not contain whitespace, case insensitive)
+#   - label (may include "%d" for including the factor; may contain whitespace)
+fields="rootdelay	1000000	^Root.delay		Root Delay (us)
+	rootdispersion	1000000	^Root.dispersion	Root Dispersion (us)"
+
+# chrony example output (v2.4.1):
+#   Reference ID    : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
+#   Stratum         : 2
+#   Ref time (UTC)  : Thu Nov 10 22:39:50 2016
+#   System time     : 0.000503798 seconds slow of NTP time
+#   Last offset     : +0.000254355 seconds
+#   RMS offset      : 0.002186779 seconds
+#   Frequency       : 17.716 ppm slow
+#   Residual freq   : +0.066 ppm
+#   Skew            : 4.035 ppm
+#   Root delay      : 0.042980 seconds
+#   Root dispersion : 0.005391 seconds
+#   Update interval : 258.4 seconds
+#   Leap status     : Normal
+
+
+if [ "$1" = "autoconf" ]; then
+	if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
+		echo yes
+	else
+		echo "no (missing 'chronyc' executable)"
+	fi
+	exit 0
+fi
+
+if [ "$1" = "config" ]; then
+	echo 'graph_title Chrony Tracking Stats - Root Time'
+	echo 'graph_args --base 1000 -l 0'
+	echo 'graph_vlabel (time)'
+	echo 'graph_category time'
+	echo 'graph_scale no'
+	echo "$fields" | while read fieldname factor regex label; do
+		# insert the factor, if "%d" is part of the label
+		printf "${fieldname}.label $label\n" "$factor"
+		echo "${fieldname}.type GAUGE"
+	done
+	exit 0
+fi
+
+chrony_status="$("$CHRONYC" tracking)"
+echo "$fields" | while read fieldname factor regex label; do
+	status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
+	if [ -z "$status_line" ]; then
+		value="U"
+	else
+		# the keyword "slow" indicates negative values
+		value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
+	fi
+	echo "${fieldname}.value $value"
+done

services/munin-chrony-tracking-update-time

@@ -0,0 +1,114 @@
+#!/bin/sh
+
+: <<=cut
+
+=head1 NAME
+
+parse Chrony Tracking output for timeserver status information
+
+=head1 APPLICABLE SYSTEMS
+
+Any system with a local chronyd service.
+
+=head1 CONFIGURATION
+
+No configuration.
+
+=head1 MAGIC MARKERS
+
+  #%# family=auto
+  #%# capabilities=autoconf
+
+=head1 VERSION
+
+Revision 0.1 2008/08/23 13:06:00 joti
+
+  First version only chronyc tracking, autodetection included.
+
+Revision 0.2 2008/10/11 16:09:00 joti
+
+  Added scaling of other values to match with frequency, added more description to fields
+
+Revision 0.3 2014/02/16 zjttoefs
+
+  reduce forking by using awk
+  do not limit output precision
+  add stratum monitoring
+  detect slow/fast time or freqency and adjust sign of value accordingly
+  remove commented out code
+
+Revision 0.4 2016/11/10 Lars Kruse
+
+  rewrite field handling
+  use "which" for "chronyc" location
+  switch from "bash" to "sh"
+  fix exit code of failing "autoconf"
+
+=head1 AUTHOR
+
+  joti
+  zjttoefs
+  Lars Kruse <devel@sumpfralle.de>
+
+=cut
+
+CHRONYC="$(which chronyc | head -1)"
+
+# Frequency has extremely higher values than other. Therefore they are fitted by scaling via suitable factors.
+# field definitions:
+#   - munin fieldname
+#   - factor for graph visualization (all values are supposed to reach a similar dimension)
+#   - regular expression of the chrony output line (may not contain whitespace, case insensitive)
+#   - label (may include "%d" for including the factor; may contain whitespace)
+fields="updateinterval	1	^Update.interval	Update Interval (s)"
+
+# chrony example output (v2.4.1):
+#   Reference ID    : 131.188.3.221 (ntp1.rrze.uni-erlangen.de)
+#   Stratum         : 2
+#   Ref time (UTC)  : Thu Nov 10 22:39:50 2016
+#   System time     : 0.000503798 seconds slow of NTP time
+#   Last offset     : +0.000254355 seconds
+#   RMS offset      : 0.002186779 seconds
+#   Frequency       : 17.716 ppm slow
+#   Residual freq   : +0.066 ppm
+#   Skew            : 4.035 ppm
+#   Root delay      : 0.042980 seconds
+#   Root dispersion : 0.005391 seconds
+#   Update interval : 258.4 seconds
+#   Leap status     : Normal
+
+
+if [ "$1" = "autoconf" ]; then
+	if [ -n "$CHRONYC" ] && [ -x "$CHRONYC" ]; then
+		echo yes
+	else
+		echo "no (missing 'chronyc' executable)"
+	fi
+	exit 0
+fi
+
+if [ "$1" = "config" ]; then
+	echo 'graph_title Chrony Tracking Stats - Update interval'
+	echo 'graph_args --base 1000 -l 0'
+	echo 'graph_vlabel (time)'
+	echo 'graph_category time'
+	echo 'graph_scale no'
+	echo "$fields" | while read fieldname factor regex label; do
+		# insert the factor, if "%d" is part of the label
+		printf "${fieldname}.label $label\n" "$factor"
+		echo "${fieldname}.type GAUGE"
+	done
+	exit 0
+fi
+
+chrony_status="$("$CHRONYC" tracking)"
+echo "$fields" | while read fieldname factor regex label; do
+	status_line="$(echo "$chrony_status" | grep -i -- "$regex " | cut -d ":" -f 2-)"
+	if [ -z "$status_line" ]; then
+		value="U"
+	else
+		# the keyword "slow" indicates negative values
+		value="$(echo "$status_line" | awk '{ /slow/ ? SIGN=-1 : SIGN=1; print $1 * SIGN * '"$factor"' }')"
+	fi
+	echo "${fieldname}.value $value"
+done

services/nixos-manual.nix

@@ -0,0 +1,32 @@
+{ 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
+  documentation.nixos = {
+    enable = true;
+  };
+
+  # Réseau
+  networking.firewall = {
+    allowedTCPPorts = [
+    ];
+    allowedUDPPorts = [
+    ];
+  };
+}

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.

services/pulseaudio.nix

@@ -2,12 +2,22 @@
 
 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 {
+
+  # Notes
+  # commande pour lister les cartes son : pacmd list-cards
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    paprefs       # préferences pulseaudio
+    pavucontrol   # mixer pulseaudio
+    pa_applet     # status et contrôle dans le system tray
+  ];
 
   # Pulse Audio
   hardware.pulseaudio = {

services/scanner.nix

@@ -2,20 +2,29 @@
 
 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; [
+    # Driver
+    hplip                     # Scanner HP
+    python27Packages.pyqt4    # dépendance hplip
+
+    # Outils pour exploiter les scanners
     simple-scan
   ];
 
   # Services
   hardware.sane.enable = true;
+  services.saned = {
+    enable = true;
+    extraConfig = "192.168.0.0/24";
+  };
 
   # Réseau
   networking.firewall = {

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 {
@@ -26,6 +26,9 @@ mkIf true {
       # Use kernel sandbox mechanisms where possible in unprivilegied processes
       # Systrace on OpenBSD, Seccomp on Linux, seatbelt on MacOSX/Darwin, rlimit elsewhere.
       UsePrivilegeSeparation sandbox
+
+      # Permet de gérer le nombre de connexions multiplexées en simultané
+      MaxSessions 200
     '';
   };
 }

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; [

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;

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; [

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.u2f.enable = true;
+
+  /*users.extraUsers.joko = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "input" "audio" "video" ];
+  };*/
+}