Merge nixos-21.05-preparation fixes #9

Les nouvelles règles dans NixOS obligent à avoir dans networking.hostName
un label DNS strict, il faut donc préciser le domaine à part dans
networking.domain.
networking.fqdn est une facilité pour concaténer les deux, en lecture
seule.

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
@@ -21,25 +25,40 @@ clean-log:
 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 store optimise
 
 rebuild-build:
+	nix-channel --add https://nixos.org/channels/nixos-unstable 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-unstable nixos
 	$(TIME) nixos-rebuild switch --upgrade --fallback --show-trace
 
 ##--------- Commandes spécifiques pour NixOS -- Opérations non courantes
@@ -94,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

@@ -10,7 +10,7 @@ Ce dépôt stocke une configuration générique des machines.
 ~~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://status.nixos.org/ 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
@@ -22,6 +22,7 @@ Ce dépôt stocke une configuration générique des machines.
 * 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>";`
+* vérifier que `configuration.nix` contient le nom de domaine `networking.domain = "<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 :
@@ -112,13 +113,13 @@ Pour résoudre les soucis d'upgrade, il est conseillé :
 * se connecter à la machine
 * passer en root
 
-~~~
+~~~bash
 sudo su -
 ~~~
 
 * formater les partitions
 
-~~~
+~~~bash
 mkfs.ext4 -L nixos /dev/sda1
 swapoff -a
 mkswap /dev/sda2
@@ -127,24 +128,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
@@ -152,14 +157,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
@@ -167,22 +172,22 @@ exit
 
 * créer un profil nix pour root & un channel
 
-~~~
+~~~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;
@@ -201,7 +206,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/
 
@@ -212,13 +217,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
 ~~~
@@ -229,7 +234,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

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

applications/graphical/bureau.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -27,10 +27,10 @@ mkIf currentMachine.profiles.isDesktopEnvironment {
     #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
+    kitty                  # terminal avec rendu par GPU
     sakura                # terminal
   ];
 
@@ -39,16 +39,18 @@ mkIf currentMachine.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
+    jetbrains-mono  # police spécial développeurs par Jetbrains
   ];
+  fonts.fontconfig.defaultFonts = {
+    monospace = [ "JetBrains Mono" ];
+  };
 
-  # Paquets avec setuid root
-  security.wrappers = {
-    # pour le montage des media amovibles
-    devmon.source = "${pkgs.udevil}/bin/devmon";
-    udevil.source = "${pkgs.udevil}/bin/udevil"; # utilisé par spacefm
-    # vérouiller l''écran. "cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock)" --> en root
-    slock.source = "${pkgs.slock}/bin/slock";
+  programs = {
+    slock.enable = true;
+    spacefm.enable = true;
+    udevil.enable = true;
   };
 }

applications/graphical/bureautique.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -24,12 +24,12 @@ mkIf (flags.officeSuite && flags.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

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

applications/graphical/cartographie.nix

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

applications/graphical/client-internet.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -18,7 +18,7 @@ environment.systemPackages = with pkgs; [
     firefox
 
     ## Mail & Discussion (texte, audio)
-    clawsMail
+    claws-mail
     hexchat
     quasselClient
     mumble
@@ -27,25 +27,7 @@ environment.systemPackages = with pkgs; [
 
     # Transfert de fichier
     filezilla
-    transmission_gtk
-    transmission_remote_gtk
+    transmission-gtk
+    transmission-remote-gtk
   ];
-
-  /* TODO: voir pour appliquer la personnalisation
-  nixpkgs.config.packageOverrides = pkgs: {
-    clawsMail = pkgs.clawsMail.override {
-      enablePluginFancy = false; # nécessite wekitgtk qui est troué
-      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

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

applications/graphical/default.nix

@@ -3,7 +3,7 @@
 let
   #inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   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

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

applications/graphical/developpement-haskell.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -13,6 +13,6 @@ mkIf (flags.developpement-haskell && flags.graphical) {
   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

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -12,6 +12,6 @@ mkIf (flags.developpement-java && flags.graphical) {
   # Paquets
   environment.systemPackages = with pkgs; [
     # IDE
-    idea.idea-community # IntelliJ IDEA
+    jetbrains.idea-community # IntelliJ IDEA
   ];
 }

applications/graphical/developpement-jetbrains.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -11,9 +11,9 @@ mkIf (flags.jetbrains-licensed && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [
-    idea.idea-ultimate
-    idea.clion
-    idea.datagrip
-    idea.pycharm-professional
+    jetbrains.idea-ultimate
+    jetbrains.clion
+    jetbrains.datagrip
+    jetbrains.pycharm-professional
   ];
 }

applications/graphical/developpement-rust.nix

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

applications/graphical/developpement.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -12,7 +12,7 @@ mkIf (flags.developpement && flags.graphical) {
   # Paquets
   environment.systemPackages = with pkgs; [
     # Base de données
-    pgadmin             # interface d'administration de postgres
+    #pgadmin             # interface d'administration de postgres ***plus à jour, version openssl dépréciée***
     #sqlitebrowser       # interface d'administration de sqlite
 
     # Documentation
@@ -21,7 +21,6 @@ mkIf (flags.developpement && flags.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

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

applications/graphical/edition-photo.nix

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

applications/graphical/edition-video.nix

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

applications/graphical/jeux.nix

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

applications/graphical/multimedia.nix

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

applications/graphical/network.nix

@@ -3,15 +3,19 @@
 let
   inherit (lib) mkIf;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
 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,27 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.fqdn}";
+  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
+  ];
+
+  nixpkgs.config.permittedInsecurePackages = [
+    "python2.7-Pillow-6.2.2"
+  ];
+}

applications/graphical/securite.nix

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

applications/overrides.nix

@@ -0,0 +1,48 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.fqdn}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf true {
+
+  nixpkgs.config.packageOverrides = pkgs: {
+    claws-mail = pkgs.claws-mail.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

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -22,8 +22,9 @@ mkIf true {
     ntp
     powerline-fonts
     powertop
-    python27Packages.ansible2
-    python27Packages.glances
+    #ansible
+    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
 
@@ -43,7 +44,7 @@ mkIf true {
     ntfs3g        # ntfs
     samba         # partages windows
     squashfsTools # squashfs
-    sshfsFuse     # ssh
+    sshfs-fuse    # ssh
 
     ## Gestion de FS
     nfs-utils
@@ -52,6 +53,6 @@ mkIf true {
     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.
     duff          # outil de recherche de fichiers en doublons
-    rdfind        # recherche de fichiers doublons pour remplacement par hard/soft link
+    #rdfind        # recherche de fichiers doublons pour remplacement par hard/soft link
   ];
 }

applications/terminal/bureau.nix

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

applications/terminal/bureautique.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -13,6 +13,7 @@ mkIf flags.officeSuite {
   environment.systemPackages = with pkgs; [
     # Bureautique
     aspell aspellDicts.fr         # correction d'ortographe
+    python39Packages.grammalecte  # correction gramatical
 
     # Gestion de tâche
     taskwarrior     # gestionnaire de tâches en console
@@ -23,7 +24,7 @@ mkIf flags.officeSuite {
     #jekyll       # générateur statique de site web
     #odpdown      # conversion md -> presentation ODP : https://github.com/thorstenb/odpdown
     pandoc
-    haskellPackages.pandoc-citeproc
+    #haskellPackages.pandoc-citeproc # ***BROKEN***
     texlive.combined.scheme-full # distribution LaTeX
     #texLive       # distribution LaTeX de base
     #texLiveBeamer # paquets et extensions pour Beamer

applications/terminal/cao.nix

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

applications/terminal/cartographie.nix

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

applications/terminal/client-internet.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -14,8 +14,8 @@ environment.systemPackages = with pkgs; [
     # Clients Internet
 
     ## Réseaux sociaux
-    #python27Packages.turses           # client twitter en ncurse
-    #python27Packages.rainbowstream    # client twitter en console
+    #turses                            # client twitter en ncurse
+    #python39Packages.rainbowstream    # client twitter en console
     #rtv                               # client reddit en console
 
     ## Mail & Discussion (texte, audio)

applications/terminal/default-applications.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -12,7 +12,7 @@ mkIf true {
   # Paquets
   environment.systemPackages = with pkgs; [
       byobu         # permet de se déconnecter d'un terminal sans l'arréter
-      git gitAndTools.tig gti # outil de gestion de version
+      tig gti lazygit # outil de gestion de version
       gnumake       # pour décrire les recettes de compilation
       gnupg         # GPG
       htop          # monitoring
@@ -25,12 +25,49 @@ mkIf true {
       pinentry      # pour taper les mots de passe gpg
       psmisc        # fournis les utilitaires comme killall, fuser, pstree
       #python        # python -- python -m SimpleHTTPServer 8000
-      shared_mime_info  # MIME info
+      shared-mime-info  # MIME info
       tmux          # nécessaire pour byobu
       tree          # affiche une arborescence de fichiers et dossiers
       usbutils
-      (import ./vim.nix)
       wget          # client HTTP console
       which         # pour connaitre le chemin d'un exécutable
   ];
+  programs = {
+    fish.enable = true;
+    gnupg.agent.enable = true;
+    git = {
+      enable = true;
+      package = pkgs.gitFull;
+      config = {
+        # http://www.git-attitude.fr/2014/09/15/30-options-git-qui-gagnent-a-etre-connues/
+        color = {
+          diff = "auto";
+          branch = "auto";
+          interactive = "auto";
+          pager = true;
+          showbranch = "auto";
+          status = "auto";
+        };
+        alias = {
+          a  = "add -p";
+          br = "for-each-ref --sort=committerdate refs/heads/ --format='%(committerdate:short)\t%(authorname)\t%(refname:short)'";
+          ci = "commit";
+          co = "checkout";
+          ff = "pull --ff-only";
+          oops = "commit --amend --no-edit";
+          # Show files ignored by git
+          ignored = "ls-files -o -i --exclude-standard";
+          ls = "ls-files";
+          st = "status";
+          # 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";
+        code.editor = "${pkgs.vim_configurable}/bin/vim";
+      };
+      lfs.enable = true;
+    };
+  };
 }

applications/terminal/default.nix

@@ -3,7 +3,7 @@
 let
   #inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -26,6 +26,8 @@ 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
+    ./vim.nix                   # vim avec plugins
 
     ## if isDesktop
     ./adminsys.nix              # pour gérer le système dans son ensemble et les services

applications/terminal/developpement-elm.nix

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

applications/terminal/developpement-haskell.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -19,16 +19,18 @@ mkIf flags.developpement-haskell {
   ] ++ (with pkgs.haskellPackages; [
     # Haskell lib
     autoproc              # ? procmail
-    darcs                 # gestionnaire de version éponyme
-    ghc-mod               # outil d'analyse de code haskell utilisé par IDE
-    hindent               # indentation code
+    #brittany              # formatteur de code
+    #darcs                 # gestionnaire de version éponyme
+    #ghc-mod               # outil d'analyse de code haskell utilisé par IDE
+    #hindent               # indentation code ***BROKEN***
     hlint                 # qualite de code, analyse statique de code + astuces & bonnes pratiques
-    postgrest             # mapper HTTP <-> PostgreSQL
+    #postgrest            # mapper HTTP <-> PostgreSQL
+    servant               # génération d'API REST
     stylish-haskell       # qualité de code
     turtle                # genre shell-scripting
 
     # Application perso
-    hahp
-    pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc
+    #hahp
+    #pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc ***BROKEN***
   ]);
 }

applications/terminal/developpement-java.nix

@@ -3,19 +3,22 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.developpement-java {
 
+  # Installe le paquet + JAVA_HOME
+  programs.java = {
+    enable = true;
+  };
+
   # 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

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

applications/terminal/developpement-rust.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -14,5 +14,7 @@ mkIf flags.developpement-rust {
     # Rust
     cargo               # récupération des dépendances + compilation projet rust
     rustc               # pour les appels depuis les scripts
+    rustup              # outil de configuration de toolchain rust
+    crate2nix           # génère les fichiers de build Nix dans un projet Rust
   ];
 }

applications/terminal/developpement.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -11,6 +11,11 @@ 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
@@ -20,7 +25,6 @@ mkIf flags.developpement {
 
     # Gestion des sources
     cloc                   # outil pour compter les lignes de code source
-    git gitAndTools.gitSVN # git et git-svn
     mercurial
     subversion
 

applications/terminal/edition-musique.nix

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

applications/terminal/edition-photo.nix

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

applications/terminal/edition-video.nix

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

applications/terminal/jeux.nix

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

applications/terminal/multimedia.nix

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

applications/terminal/network.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -15,19 +15,18 @@ mkIf true {
     iperf         # outil de mesure de la qualité du réseau
     iptraf-ng     # outil de mesure de la qualité du réseau
     nload         # affichage de statisques d'utilisation instantannées du réseau
-    telnet
+    inetutils
 
     ## 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,29 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.fqdn}";
+  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
+  ];
+
+  hardware.rtl-sdr.enable = true;
+}

applications/terminal/securite.nix

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

applications/terminal/vim.nix

@@ -1,20 +1,28 @@
-with import <nixpkgs> {};
+{pkgs, ... }:
 
-vim_configurable.customize {
+let
+  myVim = pkgs.vim_configurable.customize {
     # Specifies the vim binary name.
     # E.g. set this to "my-vim" and you need to type "my-vim" to open this vim
     # This allows to have multiple vim packages installed (e.g. with a different set of plugins)
     name = "vim";
     vimrcConfig.customRC = builtins.readFile ./vimrc;
-  vimrcConfig.vam.knownPlugins = pkgs.vimPlugins;
-  vimrcConfig.vam.pluginDictionaries = [
-    { names = [
-      # Here you can place all your vim plugins
-      # They are installed managed by `vam` (a vim plugin manager)
-      #"vim-addon-nix"
-      "elm-vim"
-      "vim-nix"
-      "wombat256-vim"
-    ]; }
+    vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
+      start = [
+        wombat256-vim
       ];
+      opt = [
+        elm-vim
+        vim-fish
+        vim-nix
+        vimwiki
+      ];
+    };
+  };
+
+in {
+  programs.vim = {
+    defaultEditor = true;
+    package = myVim;
+  };
 }

applications/terminal/vimrc

@@ -2,6 +2,9 @@
 " This must be first, because it changes other options as a side effect.
 set nocompatible
 
+filetype plugin on
+syntax on
+
 " allow backspacing over everything in insert mode
 set backspace=indent,eol,start
 
@@ -32,3 +35,10 @@ if &t_Co > 8
     let &colorcolumn="80,".join(range(120,999),",")
     highlight ColorColumn ctermbg=235 guibg=#2c2d27
 endif
+
+" vim hardcodes background color erase even if the terminfo file does
+" not contain bce (not to mention that libvte based terminals
+" incorrectly contain bce in their terminfo files). This causes
+" incorrect background rendering when using a color theme with a
+" background color.
+let &t_ut=''

base.nix

@@ -6,6 +6,9 @@
     /*./config-generator.nix*/
     ./options.nix
 
+    # Redéfinition d'applications et de modules
+    ./applications/overrides.nix
+
     # subfolders
     ./applications/graphical/default.nix
     ./applications/terminal/default.nix

config-generator.nix

@@ -5,9 +5,9 @@ let
   cfg = config.r6d.config-generator;
   pfl = config.r6d.profiles;
   comp = config.r6d.computers;
-  host = config.networking.hostName;
+  host = config.networking.fqdn;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -43,7 +43,8 @@ in
     #tincAddress = "192.168.12.8/24";
 
     (mkIf comp.isNomade{
-      networking.hostName = "nomade.dubronetwork.fr"; # Define your hostname.
+      networking.hostName = "nomade"; # Define your hostname.
+      networking.domain = "dubronetwork.fr";
       r6d.profiles.isDubronetwork = true;
 
       r6d.config-generator = {

configuration/auto-upgrade.nix

@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf mkMerge mkThenElse;
-  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configurationFlags;
-in
-
-mkIf flags.auto-upgrade {
-
-  # Automatic update & automatic clean
-
-  system.autoUpgrade.enable = true;
-  nix.gc.automatic = true;
-}

configuration/awesome.nix

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

configuration/bash-prompt.sh

@@ -1,4 +1,7 @@
-# Définition des couleurs du prompt
+# Git information in prompt
+. /run/current-system/sw/share/bash-completion/completions/git-prompt.sh
+
+# Prompt colors
 if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
     PS1_USER='\[$(tput setaf 27)\]'
     PS1_HOST='\[$(tput setaf 37)\]'
@@ -18,10 +21,12 @@ fi
 BOLD='\[$(tput bold)\]'
 RESET='\[$(tput sgr0)\]'
 
-# Définition du prompt
+# Username or red color if root
 if [ $UID = 0 ]; then
     PS1_ID=$PS1_ROOT
 else
     PS1_ID=$PS1_USER'\u'$PS1_MISC@$PS1_HOST
 fi
+
+# Prompt definition
 PS1=$RESET$BOLD$PS1_ID'\h '$PS1_PATH'\w'$PS1_GIT'$(__git_ps1)'"\n"$PS1_MISC'\$ '$RESET

configuration/default.nix

@@ -3,7 +3,7 @@
 let
   #inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -15,13 +15,14 @@ in
     ./localisation.nix
     ./network.nix
     #./network-ipv6.nix
+    ./u2f.nix
     ./udev.nix
 
     # commandées par config-generator
     ## option de configuration spécifique
-    ./auto-upgrade.nix              # mise à jour automatique du système
     ./awesome.nix               # pour le gestionaire de fenêtres awesome
     ./laptop.nix                    # appli & configuration adaptée pour un PC portable
+    ./nix-options.nix              # options de Nix (update, gc, optimisation)
     ./swap.nix                      # définition de l'utilisation du swap
   ];
 }

configuration/environment.nix

@@ -3,16 +3,13 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
 {
-  # 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)
   system.copySystemConfiguration = true;
@@ -23,6 +20,13 @@ in
   # 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 = {
@@ -39,7 +43,6 @@ in
       vi = "vim";
       byobu-adminsys = "/etc/nixos/base/byobu-adminsys";
     };
-    etc.gitconfig.text = builtins.readFile ./gitconfig;
   };
   programs.bash = {
     enableCompletion = true;
@@ -54,7 +57,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

@@ -1,27 +0,0 @@
-# http://www.git-attitude.fr/2014/09/15/30-options-git-qui-gagnent-a-etre-connues/
-[color]
-    diff = auto
-    branch = auto
-    interactive = auto
-    pager = true
-    showbranch = auto
-    status = auto
-[alias]
-    a  = add -p
-    br = for-each-ref --sort=committerdate refs/heads/ --format='%(committerdate:short)\t%(authorname)\t%(refname:short)'
-    ci = commit
-    co = checkout
-    ff = pull --ff-only
-    oops = commit --amend --no-edit
-    # Show files ignored by git
-    ignored = ls-files -o -i --exclude-standard
-    ls = ls-files
-    st = status
-    # 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]
-    editor = /usr/bin/env vim

configuration/laptop.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -12,22 +12,29 @@ 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.blueman.enable = true;
+  services.xserver.libinput = {
     enable = true;
-    twoFingerScroll = true;
   };
 }

configuration/localisation.nix

@@ -3,16 +3,18 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
 mkIf true {
 
   # Select internationalisation properties.
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "fr";
+  };
   i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "fr";
     defaultLocale = "fr_FR.UTF-8";
   };
 

configuration/network-ipv6.nix

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

configuration/network.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -13,7 +13,7 @@ mkIf true {
   #      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}
+    127.0.0.1   ${config.networking.fqdn} ${config.networking.hostName}
   '';
 
   # Activation du routage

configuration/nix-options.nix

@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.fqdn}";
+  flags = currentMachine.configurationFlags;
+in
+
+{
+
+  # Automatic update & automatic clean
+
+  system.autoUpgrade.enable = flags.auto-upgrade;
+  nix = {
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+    settings = {
+      auto-optimise-store = true;
+      # Nombre de process d'installation en parrallèle effectués par Nix
+      cores = 0;
+    };
+    gc = {
+      automatic = true;
+      dates = "daily";
+      options = "--delete-older-than 7d";
+    };
+  };
+}

configuration/swap.nix

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

configuration/u2f.nix

@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.fqdn}";
+  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

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

iso-image/configuration.nix

@@ -19,5 +19,6 @@
     }
   ];
   environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";};
-  networking.hostName = "nixos-livecd.corp.capgemini.com";
+  networking.hostName = "nixos-livecd";
+  networking.domain = "grudu.net";
 }

module-template.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -22,4 +22,11 @@ mkIf true {
     allowedUDPPorts = [
     ];
   };
+} // {
+  assertions = [
+    {
+      assertion = true;
+      message = "Assetion toujours valide.";
+    }
+  ];
 }

options.nix

@@ -44,9 +44,11 @@ let
         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";
+        pipewire              = mkEnableOption "Profil pour activer pipewire.";
         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.";
@@ -61,10 +63,10 @@ let
       configurationOptions = {
 
       ipAddress = mkOption {
-        description = "Adresse IP";
-        type = lib.types.string;
+        description = "Adresse IP.";
+        type = lib.types.str;
       };
-      nix-serve-server = mkEnableOption "nix-serve server";
+      nix-serve-server = mkEnableOption "nix-serve server.";
       nix-serve-client = {
         enable =  mkEnableOption "nix-serve client";
         servers = mkOption {
@@ -75,17 +77,22 @@ let
       };
 
       tinc = {
-        enable = mkEnableOption "Enable tinc service";
+        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.string;
+          type = lib.types.str;
         };
         vpnAddress = mkOption {
           example = "192.168.69.69/24";
           description = "VPN local node IP address.";
-          type = lib.types.string;
+          type = lib.types.str;
         };
         vpnCidrLength = mkOption {
           default = 24;
@@ -99,8 +106,23 @@ let
               Mode = router
               ConnecTo = bar
           '';
-          description = "Configuration supplémentaire pour tinc";
-          type = lib.types.string;
+          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.
+          '';
         };
       };
 
@@ -108,7 +130,7 @@ let
         enable = mkEnableOption "Activation du démarrage de Windows par Grub";
         drive = mkOption {
           description = "Lecteur sur lequel est présent le système Windows (au format GRUB)";
-          type = lib.types.string;
+          type = lib.types.str;
           default = "hd0,1";
         };
       };
@@ -116,7 +138,7 @@ let
         enable = mkEnableOption "Montage de la partition data Windows";
         device = mkOption {
           description = "Lecteur sur lequel est présent le disque de data Windows";
-          type = lib.types.string;
+          type = lib.types.str;
           default = "/dev/sda2";
         };
       };
@@ -139,7 +161,7 @@ let
   };
 
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 

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,
+    naughty.notify({
+      preset = naughty.config.presets.critical,
       title = "Oops, there were errors during startup!",
-                     text = awesome.startup_errors })
+      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,
+        naughty.notify({
+            preset = naughty.config.presets.critical,
             title = "Oops, an error happened!",
-                         text = tostring(err) })
+            text = tostring(err)
+          })
         in_error = false
     end)
 end
@@ -102,13 +106,17 @@ myawesomemenu = {
     { "quit", function() awesome.quit() end}
 }
 
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
+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,24 +131,51 @@ 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)
+    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)
+        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)
+        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)
+    awful.button(
+        { },
+        1,
+        function (c)
             if c == client.focus then
                 c.minimized = true
             else
@@ -155,14 +190,28 @@ local tasklist_buttons = awful.util.table.join(
                 client.focus = c
                 c:raise()
             end
-                                          end),
-                     awful.button({ }, 3, client_menu_toggle_fn()),
-                     awful.button({ }, 4, function ()
+        end
+    ),
+    awful.button(
+        { },
+        3,
+        client_menu_toggle_fn()
+    ),
+    awful.button(
+        { },
+        4,
+        function ()
             awful.client.focus.byidx(1)
-                                          end),
-                     awful.button({ }, 5, function ()
+        end
+    ),
+    awful.button(
+        { },
+        5,
+        function ()
             awful.client.focus.byidx(-1)
-                                          end))
+        end
+    )
+)
 
 local function set_wallpaper(s)
     -- Wallpaper
@@ -176,10 +225,70 @@ 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)
+awful.screen.connect_for_each_screen(
+    function(s)
         -- Wallpaper
         set_wallpaper(s)
 
@@ -195,7 +304,8 @@ awful.screen.connect_for_each_screen(function(s)
             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)))
+            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)
 
@@ -212,18 +322,22 @@ awful.screen.connect_for_each_screen(function(s)
                 layout = wibox.layout.fixed.horizontal,
                 mylauncher,
                 s.mytaglist,
-            s.mypromptbox,
+                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,
-        },
+              s.mylayoutbox
             }
-end)
+        }
+    end
+)
 -- }}}
 
 -- {{{ Mouse bindings
@@ -236,89 +350,42 @@ 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,           }, "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,           }, "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"}),
 
     -- 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,
+    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,           }, "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,
+    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, "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 ()
@@ -331,66 +398,49 @@ globalkeys = awful.util.table.join(
     end,
                                                                                                       {description = "lua execute prompt", group = "awesome"}),
     -- Menubar
-    awful.key({ modkey }, "p", function() menubar.show() end,
-              {description = "show the menubar", group = "launcher"}),
+    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            }, "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 ,
+    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,           }, "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,
+        awful.key(
+            { modkey },
+            "#" .. i + 9,
             function ()
                 local screen = awful.screen.focused()
                 local tag = screen.tags[i]
@@ -398,9 +448,12 @@ for i = 1, 9 do
                     tag:view_only()
                 end
             end,
-                  {description = "view tag #"..i, group = "tag"}),
+            {description = "view tag #"..i, group = "tag"}
+        ),
         -- Toggle tag display.
-        awful.key({ modkey, "Control" }, "#" .. i + 9,
+        awful.key(
+            { modkey, "Control" },
+            "#" .. i + 9,
             function ()
                 local screen = awful.screen.focused()
                 local tag = screen.tags[i]
@@ -408,9 +461,12 @@ for i = 1, 9 do
                     awful.tag.viewtoggle(tag)
                 end
             end,
-                  {description = "toggle tag #" .. i, group = "tag"}),
+            {description = "toggle tag #" .. i, group = "tag"}
+        ),
         -- Move client to tag.
-        awful.key({ modkey, "Shift" }, "#" .. i + 9,
+        awful.key(
+            { modkey, "Shift" },
+            "#" .. i + 9,
             function ()
                 if client.focus then
                     local tag = client.focus.screen.tags[i]
@@ -419,9 +475,12 @@ for i = 1, 9 do
                     end
                 end
             end,
-                  {description = "move focused client to tag #"..i, group = "tag"}),
+            {description = "move focused client to tag #"..i, group = "tag"}
+        ),
         -- Toggle tag on focused client.
-        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
+        awful.key(
+            { modkey, "Control", "Shift" },
+            "#" .. i + 9,
             function ()
                 if client.focus then
                     local tag = client.focus.screen.tags[i]
@@ -430,7 +489,8 @@ for i = 1, 9 do
                     end
                 end
             end,
-                  {description = "toggle focused client on tag #" .. i, group = "tag"})
+            {description = "toggle focused client on tag #" .. i, group = "tag"}
+        )
     )
 end
 
@@ -447,8 +507,10 @@ 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,
+    {
+        rule = { },
+        properties = {
+            border_width = beautiful.border_width,
             border_color = beautiful.border_normal,
             focus = awful.client.focus.filter,
             raise = true,
@@ -458,9 +520,9 @@ awful.rules.rules = {
             placement = awful.placement.no_overlap+awful.placement.no_offscreen
           }
       },
-
       -- Floating clients.
-    { rule_any = {
+      {
+          rule_any = {
               instance = {
                   "DTA",  -- Firefox addon DownThemAll.
                   "copyq",  -- Includes session name in class.
@@ -474,8 +536,8 @@ awful.rules.rules = {
                   "Wpa_gui",
                   "pinentry",
                   "veromix",
-          "xtightvncviewer"},
-
+                  "xtightvncviewer"
+              },
               name = {
                   "Event Tester",  -- xev.
               },
@@ -483,11 +545,16 @@ awful.rules.rules = {
                   "AlarmWindow",  -- Thunderbird's calendar.
                   "pop-up",       -- e.g. Google Chrome's (detached) Developer Tools.
               }
-      }, properties = { floating = true }},
+          },
+          properties = { floating = true }
+      },
 
       -- Add titlebars to normal clients and dialogs
-    { rule_any = {type = { "normal", "dialog" }
-      }, properties = { titlebars_enabled = false }
+      {
+          rule_any = {
+              type = { "normal", "dialog" }
+          },
+          properties = { titlebars_enabled = false }
       },
 
       -- Set Firefox to always map on the tag named "2" on screen 1.
@@ -498,33 +565,45 @@ awful.rules.rules = {
 
 -- {{{ 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.
+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.
+            --[[ 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)
+client.connect_signal(
+    "request::titlebars",
+    function(c)
         -- buttons for the titlebar
         local buttons = awful.util.table.join(
-        awful.button({ }, 1, function()
+            awful.button(
+                { },
+                1,
+                function()
                     client.focus = c
                     c:raise()
                     awful.mouse.client.move(c)
-        end),
-        awful.button({ }, 3, function()
+                end
+            ),
+            awful.button(
+                { },
+                3,
+                function()
                     client.focus = c
                     c:raise()
                     awful.mouse.client.resize(c)
-        end)
+                end
+            )
         )
 
         awful.titlebar(c) : setup {
@@ -551,15 +630,19 @@ client.connect_signal("request::titlebars", function(c)
             },
             layout = wibox.layout.align.horizontal
         }
-end)
+    end
+)
 
 -- Enable sloppy focus, so that focus follows mouse.
-client.connect_signal("mouse::enter", function(c)
+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
         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

@@ -1,13 +0,0 @@
-{ 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

@@ -3,14 +3,13 @@
 let
   #inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
 {
   imports = [
     # installées systématiquement
-    ./dbus.nix
     ./gpm.nix
     ./haveged.nix
     ./monitoring-munin.nix
@@ -34,6 +33,7 @@ in
 
     ## if isDesktop
     ./pulseaudio.nix        # activation du serveur audio
+    ./pipewire.nix        # activation du serveur audio
     ./scanner.nix           # utilisation d'un scanner
     ./x11.nix               # activation du serveur graphique X
   ];

services/docker.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -13,7 +13,8 @@ mkIf flags.docker {
   environment.systemPackages = with pkgs; [
     # Ecosystème Docker
     docker
-    python27Packages.docker_compose
+    docker-compose
+    lazydocker
   ];
 
   virtualisation.docker.enable = true;

services/elasticsearch.nix

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

services/gpm.nix

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

services/haveged.nix

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

services/hoogle.nix

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

services/hydra-build.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 # TODO: ménage
@@ -23,7 +23,6 @@ mkIf flags.hydra-builder {
     docker.enable = true;
     libvirtd = {
       enable = true;
-      enableKVM = true;
     };
     virtualbox = {
       #guest.enable = true;

services/hydra-core.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 
 
@@ -54,8 +54,8 @@ mkIf flags.hydra-core {
 
   services.hydra = {
     enable = true;
-    hydraURL = "http://hydra.${config.networking.hostName}";
-    notificationSender = "hydra@${config.networking.hostName}";
+    hydraURL = "http://hydra.${config.networking.fqdn}";
+    notificationSender = "hydra@${config.networking.fqdn}";
     listenHost = "localhost";
     minimumDiskFree = 50; # Go
     smtpHost = "localhost";
@@ -76,7 +76,7 @@ mkIf flags.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

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

services/locate.nix

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

services/monitoring-munin.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -21,6 +21,23 @@ mkIf flags.munin {
   ## 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 ];
@@ -37,11 +54,24 @@ mkIf flags.munin {
   services.munin-cron = {
     enable = true;
     hosts = ''
-      [${config.networking.hostName}]
+      [${config.networking.fqdn}]
         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.fqdn}" 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.fqdn}" root@ocean.prunetwork.fr
+      contact.syslog.command /run/current-system/sw/bin/logger -p user.crit                 -t "Munin notification for ${config.networking.fqdn}"
+
+      #---
+      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

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -18,9 +18,8 @@ mkIf flags.nixos-manual {
   # Services
 
   ## documentation sur ctrl + alt + F8
-  services.nixosManual = {
+  documentation.nixos = {
     enable = true;
-    showManual = true;
   };
 
   # Réseau

services/pipewire.nix

@@ -0,0 +1,35 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.fqdn}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf flags.pipewire {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    helvum        # patchbay pipewire
+    paprefs       # préferences pulseaudio
+    pavucontrol   # mixer pulseaudio
+    pa_applet     # status et contrôle dans le system tray
+  ];
+
+  security.rtkit.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    jack.enable = true;
+  
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+}

services/print.nix

@@ -3,18 +3,25 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.print {
 
+  environment.systemPackages = with pkgs; [
+    samba
+    python310Packages.pysmbc
+  ];
+  services.samba.enable = true;
   # Services
   ## Enable CUPS to print documents.
   services.printing = {
     enable = true;
     drivers = [
       pkgs.samsung-unified-linux-driver
+      pkgs.fxlinuxprint
+      pkgs.gutenprint
     ];
     # Suppression automatique des fichiers temporaires.
     # Par défaut, cups conserve une copie de ce qui a été imprimé
@@ -24,4 +31,6 @@ mkIf flags.print {
       PreserveJobFiles No
     '';
   };
+  services.avahi.enable = true;
+  services.avahi.nssmdns = true;
 }

services/pulseaudio.nix

@@ -3,16 +3,20 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
 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

services/scanner.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -11,11 +11,20 @@ mkIf flags.scanner {
 
   # Paquets
   environment.systemPackages = with pkgs; [
+    # Driver
+    hplip                     # Scanner HP
+    python39Packages.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

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -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

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

services/x11.nix

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

services/xmonad/xmonad.nix

@@ -3,26 +3,18 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
 mkIf flags.xmonad {
-
-  # Paquets
-  environment.systemPackages = with pkgs; [
-    dmenu
-    haskellPackages.xmobar
-    trayer
-  ];
+  services.dbus.packages = with pkgs; [ dconf ];
+  programs.dconf.enable = true;
 
   # Services
   services.xserver.windowManager.xmonad = {
     enable = true;
     enableContribAndExtras = true;
-    extraPackages = haskellPackages: [
-      haskellPackages.xmobar
-    ];
   };
   environment.variables = {
     _JAVA_AWT_WM_NONREPARENTING = "1";

services/yubikey.nix

@@ -3,7 +3,7 @@
 let
   inherit (lib) mkIf mkMerge mkThenElse;
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
@@ -33,7 +33,7 @@ mkIf true {
     gnupg opensc pcsctools libu2f-host yubikey-personalization
   ];
 
-  security.pam.enableU2F = true;
+  security.pam.u2f.enable = true;
 
   /*users.extraUsers.joko = {
     isNormalUser = true;