activation par défaut de l'agent gnupg

pgadmin commenté, plus mis à jour, tire un openssl déprécié
gnuradio tire un vieux paquet python, Pilllow 6.2.2, marqué insecure
2021-05-18 09:55:00 +02:00 · 2021-05-09 18:58:30 +02:00 · 2021-05-08 00:16:32 +02:00 · 2021-05-07 23:49:44 +02:00 · 2021-05-07 22:28:44 +02:00 · 2021-05-07 07:15:30 +02:00
90 changed files with 979 additions and 159 deletions
--- a/19
+++ b/19
@@ -3,6 +3,7 @@ TIME=time

 CHRONY_STATUS=chronyc tracking
 CHRONY_STATS=chronyc sources -v
+CHRONY_STATS_SOURCES=chronyc sourcestats

 all: rebuild-switch
 	date
@@ -24,10 +25,17 @@ 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 optimise-store

 rebuild-build:
+	nix-channel --add https://nixos.org/channels/nixos-unstable nixos
 	$(TIME) time nixos-rebuild build --fallback  --show-trace

 rebuild-switch:
@@ -43,14 +51,14 @@ show-roots:
 	nix-store --gc --print-roots

 show-time:
-	-@$(CHRONY_STATUS)
-	#CHRONY_STATUS='chronyc tracking' CHRONY_STATS='chronyc sources -v' ${CHRONY_STATS} && watch -d -n 20 "${CHRONY_STATUS} && echo "--" && ${CHRONY_STATS}"
-	-@watch -d -n 20 "$(CHRONY_STATUS) && echo "--" && $(CHRONY_STATS)"
+	-@$(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
@@ -105,3 +113,6 @@ tmpfs-umount:
 tmpfs-destroy: tmpfs-umount
 	rmdir /mnt/tmpfs

+##- Test awesome
+test-awesome:
+	Xephyr :5 & sleep 1; DISPLAY=:5 awesome
--- a/README.md
+++ b/README.md
@@ -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 :
--- a/applications/graphical/adminsys.nix
+++ b/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

--- a/applications/graphical/bureau.nix
+++ b/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

@@ -39,6 +39,7 @@ 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
  ];
--- a/applications/graphical/bureautique.nix
+++ b/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

@@ -29,7 +29,7 @@ mkIf (flags.officeSuite && flags.graphical) {

    ## 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
--- a/applications/graphical/cao.nix
+++ b/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

--- a/applications/graphical/cartographie.nix
+++ b/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

--- a/applications/graphical/client-internet.nix
+++ b/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

--- a/applications/graphical/default-applications.nix
+++ b/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

--- a/applications/graphical/default.nix
+++ b/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

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

--- a/applications/graphical/developpement-haskell.nix
+++ b/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)
  ]);
 }
--- a/applications/graphical/developpement-java.nix
+++ b/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

--- a/applications/graphical/developpement-jetbrains.nix
+++ b/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

--- a/applications/graphical/developpement-rust.nix
+++ b/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

--- a/applications/graphical/developpement.nix
+++ b/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
--- a/applications/graphical/edition-musique.nix
+++ b/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

--- a/applications/graphical/edition-photo.nix
+++ b/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

--- a/applications/graphical/edition-video.nix
+++ b/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

--- a/applications/graphical/jeux.nix
+++ b/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

--- a/applications/graphical/multimedia.nix
+++ b/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

--- a/applications/graphical/network.nix
+++ b/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
  ];
 }
--- a/applications/graphical/radio.nix
+++ b/applications/graphical/radio.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,15 +12,16 @@ mkIf (flags.radio && flags.graphical) {
  # Paquets
  environment.systemPackages = with pkgs; [
    ## GUI
-    gqrx          # GUI
-    #gnuradio     # Software Defined Radio (SDR) software
-    gnuradio-with-packages
+    chirp                   # Configuration de radios portatives
+    gqrx                    # GUI
+    cubicsdr                # Another GUI
+    gnuradio-with-packages  # Software Defined Radio (SDR) software

    ## A Trier
-    #
-    #gnuradio-osmosdr  # Gnuradio block for OsmoSDR and rtl-sdr
+    #inspectrum    # Tool for analysing captured signals from sdr receivers
+  ];

-    inspectrum    # Tool for analysing captured signals from sdr receivers
-    kalibrate-rtl # Calculate local oscillator frequency offset in RTL-SDR devices
+  nixpkgs.config.permittedInsecurePackages = [
+    "python2.7-Pillow-6.2.2"
  ];
 }
--- a/applications/graphical/securite.nix
+++ b/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

--- a/applications/overrides.nix
+++ b/applications/overrides.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 {
    clawsMail = pkgs.clawsMail.override {
      enablePgp = true;
      enablePluginArchive = true;
-      enablePluginFancy = false; # nécessite wekitgtk qui est troué
+      #enablePluginFancy = false; # nécessite wekitgtk qui est troué # Option supprimée dans NixOS 20.03
      enablePluginPdf = true;
      enablePluginRavatar = true;
      enablePluginSmime = true;
--- a/applications/terminal/adminsys.nix
+++ b/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

@@ -23,7 +23,7 @@ mkIf true {
    powerline-fonts
    powertop
    #ansible
-    python36Packages.glances
+    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
--- a/applications/terminal/bureau.nix
+++ b/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

--- a/applications/terminal/bureautique.nix
+++ b/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,7 +13,7 @@ mkIf flags.officeSuite {
  environment.systemPackages = with pkgs; [
    # Bureautique
    aspell aspellDicts.fr         # correction d'ortographe
-    python36Packages.grammalecte  # correction gramatical
+    python39Packages.grammalecte  # correction gramatical

    # Gestion de tâche
    taskwarrior     # gestionnaire de tâches en console
@@ -24,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
--- a/applications/terminal/cao.nix
+++ b/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

--- a/applications/terminal/cartographie.nix
+++ b/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

--- a/applications/terminal/client-internet.nix
+++ b/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

@@ -15,7 +15,7 @@ environment.systemPackages = with pkgs; [

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

    ## Mail & Discussion (texte, audio)
--- a/applications/terminal/default-applications.nix
+++ b/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
+      gitAndTools.gitFull gitAndTools.tig gti # outil de gestion de version
      gnumake       # pour décrire les recettes de compilation
      gnupg         # GPG
      htop          # monitoring
@@ -33,4 +33,5 @@ mkIf true {
      wget          # client HTTP console
      which         # pour connaitre le chemin d'un exécutable
  ];
+  programs.gnupg.agent.enable = true;
 }
--- a/applications/terminal/default.nix
+++ b/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

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

--- a/applications/terminal/developpement-haskell.nix
+++ b/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,9 +19,10 @@ 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
    servant               # génération d'API REST
@@ -29,7 +30,7 @@ mkIf flags.developpement-haskell {
    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***
  ]);
 }
--- a/applications/terminal/developpement-java.nix
+++ b/applications/terminal/developpement-java.nix
@@ -3,19 +3,23 @@
 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;
+    package = pkgs.jdk11;
+  };
+
  # Paquets
  environment.systemPackages = with pkgs; [
-    # Java
+    # Systèmes de build autour de java
+    ant
    maven
-    openjdk
+    gradle
  ];
-  environment.variables = {
-    JAVA_HOME = "${pkgs.openjdk}";
-  };
 }
--- a/applications/terminal/developpement-jetbrains.nix
+++ b/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

--- a/applications/terminal/developpement-rust.nix
+++ b/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

--- a/applications/terminal/developpement.nix
+++ b/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

@@ -25,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

--- a/applications/terminal/edition-musique.nix
+++ b/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

--- a/applications/terminal/edition-photo.nix
+++ b/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

--- a/applications/terminal/edition-video.nix
+++ b/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

--- a/applications/terminal/jeux.nix
+++ b/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

--- a/applications/terminal/multimedia.nix
+++ b/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

--- a/applications/terminal/network.nix
+++ b/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

--- a/applications/terminal/radio.nix
+++ b/applications/terminal/radio.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,6 +22,7 @@ mkIf flags.radio {
    gnss-sdr    # Global Navigation Satellite Systems software-defined receiver
    liquid-dsp  # Digital signal processing library for software-defined radios
    rtl-sdr     # Turns your Realtek RTL2832 based DVB dongle into a SDR receiver
+    dump1090    # Listen to planes ADS-B and view them on a map
  ];

  # Configuration matérielle
--- a/applications/terminal/securite.nix
+++ b/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

--- a/config-generator.nix
+++ b/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 = {
--- a/configuration/auto-upgrade.nix
+++ b/configuration/auto-upgrade.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

--- a/configuration/awesome.nix
+++ b/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

--- a/configuration/default.nix
+++ b/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,6 +15,7 @@ in
    ./localisation.nix
    ./network.nix
    #./network-ipv6.nix
+    ./u2f.nix
    ./udev.nix

    # commandées par config-generator
--- a/configuration/environment.nix
+++ b/configuration/environment.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 @@ in
  nix.buildCores = 0;

  # The NixOS release to be compatible with for stateful data such as databases.
-  system.stateVersion = "18.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;
@@ -27,7 +27,8 @@ in
  boot.cleanTmpDir = true;

  # Activation des pages de manuel
-  programs.man.enable = true;
+  documentation.man.enable = true;
+

  # Paquets
  environment = {
--- a/configuration/laptop.nix
+++ b/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,28 @@ mkIf flags.laptop {
  # Gestion spécifique pour PC portable

  ## Gestion de l'énergie
-  powerManagement.cpuFreqGovernor = "powersave";
+  services.tlp.enable = true;

  ## Activation d'un gestionnaire de réseau
  networking.networkmanager.enable = true;

-  hardware.bluetooth.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = false;
+  };
+
+  # Gestion graphique du réseau dans la barre système
+  programs.nm-applet.enable = true;

  # Paquets
  environment.systemPackages = with pkgs; [
-    networkmanagerapplet    # gestionnaire réseau graphique + console (nm-applet + nmtui)
    wirelesstools           # fournis iwconfig
+    blueman                 # outils bluetooth (manager, system tray)
+    cbatticon               # status de la batterie dans le system tray
  ];

  # Services
-  services.xserver.synaptics = {
+  services.xserver.libinput = {
    enable = true;
-    twoFingerScroll = true;
  };
 }
--- a/configuration/localisation.nix
+++ b/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";
  };

--- a/configuration/network-ipv6.nix
+++ b/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

--- a/configuration/network.nix
+++ b/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
--- a/configuration/swap.nix
+++ b/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

--- a/configuration/u2f.nix
+++ b/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
+  ];
+}
--- a/configuration/udev.nix
+++ b/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

--- a/iso-image/configuration.nix
+++ b/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";
 }
--- a/module-template.nix
+++ b/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.";
+    }
+  ];
 }
--- a/options.nix
+++ b/options.nix
@@ -62,10 +62,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 {
@@ -76,22 +76,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.string;
+          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;
@@ -105,8 +105,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.
+          '';
        };
      };

@@ -114,7 +129,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";
        };
      };
@@ -122,7 +137,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";
        };
      };
@@ -145,7 +160,7 @@ let
  };

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

--- a/public/config-awesome-4-rc.lua
+++ b/public/config-awesome-4-rc.lua
@@ -413,7 +413,8 @@ globalkeys = awful.util.table.join(
    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, "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),
 )
--- a/services/dbus.nix
+++ b/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;
-}
--- a/services/default.nix
+++ b/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
--- a/services/docker.nix
+++ b/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,7 @@ mkIf flags.docker {
  environment.systemPackages = with pkgs; [
    # Ecosystème Docker
    docker
-    python36Packages.docker_compose
+    docker-compose
  ];

  virtualisation.docker.enable = true;
--- a/services/elasticsearch.nix
+++ b/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

--- a/services/gpm.nix
+++ b/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

--- a/services/haveged.nix
+++ b/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

--- a/services/hoogle.nix
+++ b/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

--- a/services/hydra-build.nix
+++ b/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
--- a/services/hydra-core.nix
+++ b/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";
--- a/services/kibana.nix
+++ b/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

--- a/services/locate.nix
+++ b/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

--- a/services/monitoring-munin.nix
+++ b/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

@@ -30,6 +30,14 @@ mkIf flags.munin {
      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 ];
@@ -46,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/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
    '';
  };

--- a/services/munin-chrony
+++ b/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
--- a/services/munin-chrony-tracking-ppm
+++ b/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
--- a/services/munin-chrony-tracking-stratum
+++ b/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
--- a/services/munin-chrony-tracking-time
+++ b/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
--- a/services/munin-chrony-tracking-time-root
+++ b/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
--- a/services/munin-chrony-tracking-update-time
+++ b/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
--- a/services/nixos-manual.nix
+++ b/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
--- a/services/print.nix
+++ b/services/print.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

--- a/services/pulseaudio.nix
+++ b/services/pulseaudio.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

@@ -16,6 +16,7 @@ mkIf flags.pulseaudio {
  environment.systemPackages = with pkgs; [
    paprefs       # préferences pulseaudio
    pavucontrol   # mixer pulseaudio
+    pa_applet     # status et contrôle dans le system tray
  ];

  # Pulse Audio
--- a/services/scanner.nix
+++ b/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 = {
--- a/services/ssh.nix
+++ b/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
    '';
  };
 }
--- a/services/virtualbox.nix
+++ b/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

--- a/services/x11.nix
+++ b/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

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

--- a/services/yubikey.nix
+++ b/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;
Author	SHA1	Message	Date
Yves Dubromelle	ed937ba5bc	activation par défaut de l'agent gnupg	2021-05-18 09:55:00 +02:00
Yves Dubromelle	3de6332c3e	pgadmin commenté, plus mis à jour, tire un openssl déprécié	2021-05-09 18:58:30 +02:00
Yves Dubromelle	e26453fc7e	gnuradio tire un vieux paquet python, Pilllow 6.2.2, marqué insecure	2021-05-08 00:16:32 +02:00
Yves Dubromelle	67b9f5b0f7	dbus est désormais tout le temps actif par défaut	2021-05-07 23:49:44 +02:00
Yves Dubromelle	8f4f8ef953	déplacement d'options et paquets upstream	2021-05-07 22:28:44 +02:00
Yves Dubromelle	c33f0f9c50	mise à jour paquets python en 3.9	2021-05-07 07:15:30 +02:00
Yves Dubromelle	2064606f18	paquets marqués comme cassés dans nixpkgs	2021-05-07 07:14:24 +02:00
Yves Dubromelle	4a5f0ba1a7	utilisation de networking.fqdn (hostName + domain) 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.	2021-05-06 23:50:07 +02:00
Yves Dubromelle	9ed945bba8	channel nixos-unstable	2021-05-06 23:23:57 +02:00
Jean-Pierre PRUNARET	65e5776f86	ménage appli pour préparation migration NixOS 20.03	2020-06-30 18:58:17 +02:00
Yves Dubromelle	235e636451	client mumble à nouveau fréquentable (build sans broncher)	2020-04-16 01:19:06 +02:00
Yves Dubromelle	e849c55297	radio: dump1090 écoute ADB-S des avions et placement sur une carte	2020-04-16 01:19:06 +02:00
Yves Dubromelle	1e51d11778	radio: CubicSDR comme alternative à gqrx	2020-04-16 01:19:06 +02:00
Yves Dubromelle	f39f486f51	awesome: meta+l pour slock et suspend combinés	2020-04-16 01:19:06 +02:00
Yves Dubromelle	2a5809c3de	radio: chirp pour programmer les radios portatives	2020-04-16 01:19:06 +02:00
Yves Dubromelle	7681f7774e	nixos: 19.03 -> 19.09	2019-11-19 22:38:25 +01:00
Yves Dubromelle	fe0ea31e30	les variantes de git se catapultent -> git full par défaut	2019-08-21 00:11:09 +02:00
Jean-Pierre PRUNARET	f7de6a69bd	oops	2019-07-09 19:53:00 +02:00
Jean-Pierre PRUNARET	9151b4dfc5	radio : ménage dans les paquets	2019-07-09 02:21:18 +02:00
Yves Dubromelle	209b1b3e47	outils dans le system tray pour : batterie, volume, bluetooth	2019-06-23 19:13:23 +02:00
Yves Dubromelle	8355abcbfc	le bluetooth peut être éteint par défaut (ça consomme)	2019-06-23 19:12:47 +02:00
Yves Dubromelle	9150a37969	gestion de l'énergie : TLP fait bien le job	2019-06-19 09:51:46 +02:00
Yves Dubromelle	59d243bb9d	wireshark: package -> option (gestion fine des droits)	2019-06-10 17:22:56 +02:00
Yves Dubromelle	c7a1a433ef	nm-applet: package -> option (activation automatique)	2019-06-10 17:21:00 +02:00
Yves Dubromelle	da750b9c33	java 11 est la LTS officielle, autant l'utiliser	2019-06-10 12:53:08 +02:00
Yves Dubromelle	0ff5f2934e	synaptics est dépcrécié -> libinput	2019-06-10 12:53:08 +02:00
Yves Dubromelle	f0d5881c80	ajout de ant et gradle en plus de maven, pas de jaloux :)	2019-06-10 12:53:08 +02:00
Yves Dubromelle	16b0a5b617	nixpkgs a une nouvelle option pour gérer java + JAVA_HOME	2019-06-10 12:53:08 +02:00
Jean-Pierre PRUNARET	de02b42953	munin : ajout de monitoring pout chrony	2019-06-06 23:32:51 +02:00
Jean-Pierre PRUNARET	25275ec0dd	make : ajustement statistiques ntp	2019-06-01 19:56:37 +02:00
Jean-Pierre PRUNARET	19258654cf	nixos-manual : ajustement clef de config suite migration NixOS 19.03	2019-05-26 13:07:20 +02:00
Jean-Pierre PRUNARET	7a7bcc99f2	EXP désactivation de darcs	2019-05-18 12:15:09 +02:00
Jean-Pierre PRUNARET	dddc3e79e0	ajout font awesome	2019-05-18 12:14:23 +02:00
Jean-Pierre PRUNARET	1e8b78d720	make: ajout cible 'list-installed-packages'	2019-05-18 12:14:23 +02:00
Jean-Pierre PRUNARET	366eebee8a	radio : compilation ok gnu-radio	2019-05-18 12:14:23 +02:00
Jean-Pierre PRUNARET	5ecdc764ac	make: commande lancer awesome en mode de test	2019-05-18 12:14:23 +02:00
Yves Dubromelle	a5e03f769b	/!\ migration à nixos 19.03 (18.03 plus mis à jour)	2019-05-09 12:30:21 +02:00
Yves Dubromelle	c642afb7e6	formater de code haskell en vogue	2019-05-09 08:24:26 +02:00
Yves Dubromelle	1127daa925	désactivation de paquets haskell qui ne build plus	2019-05-09 08:23:44 +02:00
Jean-Pierre PRUNARET	328eabc735	ssh: augmentation du nombre de connexions simultanées en mode proxy	2018-12-31 14:17:45 +01:00
Jean-Pierre PRUNARET	f2247b6e3e	Revert "l'attribut de génération des pages de man a changé de nom (-> documentation.man.enable)" This reverts commit `0c47de1cb1`.	2018-05-05 22:15:06 +02:00
Jean-Pierre PRUNARET	0073763f32	Revert "munin : blocage du module car refuse de s'installer" -> fonctionne avec nixos stable This reverts commit `8dcdea29c1`.	2018-05-05 22:11:04 +02:00
Jean-Pierre PRUNARET	e2ba892109	/!\ FORCE NIXOS 18.03 pour corriger une infinite recursion sur nix	2018-05-05 22:10:48 +02:00
Jean-Pierre PRUNARET	0c47de1cb1	l'attribut de génération des pages de man a changé de nom (-> documentation.man.enable)	2018-04-18 07:34:36 +02:00
Jean-Pierre PRUNARET	8dcdea29c1	munin : blocage du module car refuse de s'installer	2018-04-07 10:41:04 +02:00
Jean-Pierre PRUNARET	cffcd9bd3e	makefile: utilisation de variable globale	2018-03-04 18:29:42 +01:00
Jean-Pierre PRUNARET	3f80d6be6e	scanner: activation du service + driver HP	2018-03-04 13:13:13 +01:00
Jean-Pierre PRUNARET	e94b16fce7	ahout de "." dans les descriptions	2018-03-02 08:02:41 +01:00
Jean-Pierre PRUNARET	3f038be64a	template : ajout d'un exemple d'assertion	2018-03-02 07:57:10 +01:00
Jean-Pierre PRUNARET	76fce51cf0	munin: config notifications	2018-02-16 00:32:52 +01:00
Jean-Pierre PRUNARET	264a782227	ajout options de config pour quagga	2018-01-18 22:56:20 +01:00
Jean-Pierre PRUNARET	e56040b333	u2f: import configuration pour activer le support des clefs FIDO / u2f Notes : - import de conf active sur radx - fonctionne avec Chromium & Github - ne fonctionne pas avec Firefox & Github	2018-01-17 21:08:25 +01:00