From 328eabc735657c51dc5cd83f7fdfb1cd688b9a28 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <root@hydra.prunetwork.fr>
Date: Mon, 31 Dec 2018 14:17:45 +0100
Subject: [PATCH 01/72] =?UTF-8?q?ssh:=20augmentation=20du=20nombre=20de=20?=
 =?UTF-8?q?connexions=20simultan=C3=A9es=20en=20mode=20proxy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/ssh.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/ssh.nix b/services/ssh.nix
index 8c13f95..1030bfd 100644
--- a/services/ssh.nix
+++ b/services/ssh.nix
@@ -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
     '';
   };
 }

From 1127daa9257d29415b7d6f71daa3bc31605cc534 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Thu, 9 May 2019 08:23:44 +0200
Subject: [PATCH 02/72] =?UTF-8?q?d=C3=A9sactivation=20de=20paquets=20haske?=
 =?UTF-8?q?ll=20qui=20ne=20build=20plus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/developpement-haskell.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix
index 62fb4ce..8e70be2 100644
--- a/applications/terminal/developpement-haskell.nix
+++ b/applications/terminal/developpement-haskell.nix
@@ -20,7 +20,7 @@ mkIf flags.developpement-haskell {
     # Haskell lib
     autoproc              # ? procmail
     darcs                 # gestionnaire de version éponyme
-    ghc-mod               # outil d'analyse de code haskell utilisé par IDE
+    #ghc-mod               # outil d'analyse de code haskell utilisé par IDE
     hindent               # indentation code
     hlint                 # qualite de code, analyse statique de code + astuces & bonnes pratiques
     #postgrest            # mapper HTTP <-> PostgreSQL
@@ -29,7 +29,7 @@ mkIf flags.developpement-haskell {
     turtle                # genre shell-scripting
 
     # Application perso
-    hahp
+    #hahp
     pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc
   ]);
 }

From c642afb7e6d496d0db3e3609464cbbba82b588a5 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Thu, 9 May 2019 08:24:26 +0200
Subject: [PATCH 03/72] formater de code haskell en vogue

---
 applications/terminal/developpement-haskell.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix
index 8e70be2..fee92d8 100644
--- a/applications/terminal/developpement-haskell.nix
+++ b/applications/terminal/developpement-haskell.nix
@@ -19,6 +19,7 @@ mkIf flags.developpement-haskell {
   ] ++ (with pkgs.haskellPackages; [
     # Haskell lib
     autoproc              # ? procmail
+    brittany              # formatteur de code
     darcs                 # gestionnaire de version éponyme
     #ghc-mod               # outil d'analyse de code haskell utilisé par IDE
     hindent               # indentation code

From a5e03f769b5b78ccec8d39bd1289c9a117e0d046 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Thu, 9 May 2019 12:30:21 +0200
Subject: [PATCH 04/72] =?UTF-8?q?/!\=20migration=20=C3=A0=20nixos=2019.03?=
 =?UTF-8?q?=20(18.03=20plus=20mis=20=C3=A0=20jour)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                         | 6 +++---
 applications/graphical/developpement-haskell.nix | 2 +-
 applications/terminal/developpement-haskell.nix  | 2 +-
 configuration/environment.nix                    | 4 ++--
 configuration/u2f.nix                            | 2 +-
 services/docker.nix                              | 2 +-
 services/yubikey.nix                             | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 2729856..ec1dd5c 100644
--- a/Makefile
+++ b/Makefile
@@ -25,10 +25,10 @@ full-auto: submodules-update upgrade clean optimise
 	@date
 
 optimise:
-	$(TIME) nix-store --optimise
+	$(TIME) nix optimise-store
 
 rebuild-build:
-	nix-channel --add https://nixos.org/channels/nixos-18.03 nixos
+	nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
 	$(TIME) time nixos-rebuild build --fallback  --show-trace
 
 rebuild-switch:
@@ -51,7 +51,7 @@ store-repair:
 	$(TIME) nix-store --verify --check-contents --repair
 
 upgrade:
-	nix-channel --add https://nixos.org/channels/nixos-18.03 nixos
+	nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
 	$(TIME) nixos-rebuild switch --upgrade --fallback --show-trace
 
 ##--------- Commandes spécifiques pour NixOS -- Opérations non courantes
diff --git a/applications/graphical/developpement-haskell.nix b/applications/graphical/developpement-haskell.nix
index 353322b..3257559 100644
--- a/applications/graphical/developpement-haskell.nix
+++ b/applications/graphical/developpement-haskell.nix
@@ -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)
   ]);
 }
diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix
index fee92d8..ca2d451 100644
--- a/applications/terminal/developpement-haskell.nix
+++ b/applications/terminal/developpement-haskell.nix
@@ -19,7 +19,7 @@ mkIf flags.developpement-haskell {
   ] ++ (with pkgs.haskellPackages; [
     # Haskell lib
     autoproc              # ? procmail
-    brittany              # formatteur de code
+    #brittany              # formatteur de code
     darcs                 # gestionnaire de version éponyme
     #ghc-mod               # outil d'analyse de code haskell utilisé par IDE
     hindent               # indentation code
diff --git a/configuration/environment.nix b/configuration/environment.nix
index d20e764..8425cd6 100644
--- a/configuration/environment.nix
+++ b/configuration/environment.nix
@@ -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.03";
 
   # 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,7 @@ in
   boot.cleanTmpDir = true;
 
   # Activation des pages de manuel
-  programs.man.enable = true;
+  documentation.man.enable = true;
 
 
   # Paquets
diff --git a/configuration/u2f.nix b/configuration/u2f.nix
index 7898217..a52b369 100644
--- a/configuration/u2f.nix
+++ b/configuration/u2f.nix
@@ -33,7 +33,7 @@ mkIf true {
   SUBSYSTEM=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2838", GROUP="audio", MODE="0666", SYMLINK+="rtl_sdr"
   '';
 
-  security.pam.enableU2F = true;
+  security.pam.u2f.enable = true;
 
   environment.systemPackages = with pkgs; [
     libu2f-host
diff --git a/services/docker.nix b/services/docker.nix
index 9663f89..95b96b4 100644
--- a/services/docker.nix
+++ b/services/docker.nix
@@ -13,7 +13,7 @@ mkIf flags.docker {
   environment.systemPackages = with pkgs; [
     # Ecosystème Docker
     docker
-    python36Packages.docker_compose
+    docker-compose
   ];
 
   virtualisation.docker.enable = true;
diff --git a/services/yubikey.nix b/services/yubikey.nix
index 2f786d7..3ca6d30 100644
--- a/services/yubikey.nix
+++ b/services/yubikey.nix
@@ -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;

From 5ecdc764ac77000e691421a65bf667cf296437de Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 15 Dec 2018 23:12:47 +0100
Subject: [PATCH 05/72] make: commande lancer awesome en mode de test

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index ec1dd5c..1fcd38d 100644
--- a/Makefile
+++ b/Makefile
@@ -106,3 +106,6 @@ tmpfs-umount:
 tmpfs-destroy: tmpfs-umount
 	rmdir /mnt/tmpfs
 
+##- Test awesome
+test-awesome:
+	Xephyr :5 & sleep 1; DISPLAY=:5 awesome

From 366eebee8afde656319c3fe190dcba3bb611412a Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 15 Dec 2018 23:16:41 +0100
Subject: [PATCH 06/72] radio : compilation ok gnu-radio

---
 applications/graphical/radio.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/graphical/radio.nix b/applications/graphical/radio.nix
index 3afa2b1..a748cfe 100644
--- a/applications/graphical/radio.nix
+++ b/applications/graphical/radio.nix
@@ -12,9 +12,9 @@ mkIf (flags.radio && flags.graphical) {
   # Paquets
   environment.systemPackages = with pkgs; [
     ## GUI
-    gqrx          # GUI
-    #gnuradio     # Software Defined Radio (SDR) software
-    gnuradio-with-packages
+    gqrx                    # GUI
+    gnuradio                # Software Defined Radio (SDR) software
+    gnuradio-with-packages  # Software Defined Radio (SDR) software
 
     ## A Trier
     #

From 1e8b78d720c09b8c532e21139d92863367abc712 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 15 Dec 2018 23:35:53 +0100
Subject: [PATCH 07/72] make: ajout cible 'list-installed-packages'

---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 1fcd38d..8a7b0dd 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,12 @@ 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 optimise-store
 

From dddc3e79e07879f4b29937102980e403d813192d Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 7 Apr 2019 23:24:17 +0200
Subject: [PATCH 08/72] ajout font awesome

---
 applications/graphical/bureau.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix
index 6ae07d6..1438c0e 100644
--- a/applications/graphical/bureau.nix
+++ b/applications/graphical/bureau.nix
@@ -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
   ];

From 7a7bcc99f2d54407b3ee3bbc0f2d11992c43215a Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 18 May 2019 12:11:24 +0200
Subject: [PATCH 09/72] =?UTF-8?q?EXP=20d=C3=A9sactivation=20de=20darcs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/developpement-haskell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix
index ca2d451..6425bb2 100644
--- a/applications/terminal/developpement-haskell.nix
+++ b/applications/terminal/developpement-haskell.nix
@@ -20,7 +20,7 @@ mkIf flags.developpement-haskell {
     # Haskell lib
     autoproc              # ? procmail
     #brittany              # formatteur de code
-    darcs                 # gestionnaire de version éponyme
+    #darcs                 # gestionnaire de version éponyme
     #ghc-mod               # outil d'analyse de code haskell utilisé par IDE
     hindent               # indentation code
     hlint                 # qualite de code, analyse statique de code + astuces & bonnes pratiques

From 19258654cf802d1ad5b29a7bd67577e7cc7b027a Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sun, 26 May 2019 13:07:20 +0200
Subject: [PATCH 10/72] nixos-manual : ajustement clef de config suite
 migration NixOS 19.03

---
 services/nixos-manual.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/nixos-manual.nix b/services/nixos-manual.nix
index fe7227a..fc2c9a3 100644
--- a/services/nixos-manual.nix
+++ b/services/nixos-manual.nix
@@ -18,9 +18,8 @@ mkIf flags.nixos-manual {
   # Services
 
   ## documentation sur ctrl + alt + F8
-  services.nixosManual = {
+  documentation.nixos = {
     enable = true;
-    showManual = true;
   };
 
   # Réseau

From 25275ec0ddb84479f6a538066e9b16e4e7ebfa50 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Sat, 1 Jun 2019 19:56:37 +0200
Subject: [PATCH 11/72] make : ajustement statistiques ntp

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8a7b0dd..f5c3d00 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ TIME=time
 
 CHRONY_STATUS=chronyc tracking
 CHRONY_STATS=chronyc sources -v
+CHRONY_STATS_SOURCES=chronyc sourcestats
 
 all: rebuild-switch
 	date
@@ -51,7 +52,7 @@ show-roots:
 
 show-time:
 	-@$(CHRONY_STATUS) && $(CHRONY_STATS)
-	-@watch -d -n 5 "$(CHRONY_STATUS) && echo "--" && $(CHRONY_STATS)"
+	-@watch -d -n 2 "$(CHRONY_STATUS) && echo "--" && $(CHRONY_STATS) && echo "--" && $(CHRONY_STATS_SOURCES)"
 
 store-repair:
 	$(TIME) nix-store --verify --check-contents --repair

From de02b42953fcd74c27f81b3231e39114ecd2275c Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Thu, 6 Jun 2019 23:32:51 +0200
Subject: [PATCH 12/72] munin : ajout de monitoring pout chrony

---
 Makefile                                   |   2 +-
 services/monitoring-munin.nix              |   8 ++
 services/munin-chrony                      | 123 +++++++++++++++++++++
 services/munin-chrony-tracking-ppm         | 116 +++++++++++++++++++
 services/munin-chrony-tracking-stratum     | 116 +++++++++++++++++++
 services/munin-chrony-tracking-time        | 118 ++++++++++++++++++++
 services/munin-chrony-tracking-time-root   | 115 +++++++++++++++++++
 services/munin-chrony-tracking-update-time | 114 +++++++++++++++++++
 8 files changed, 711 insertions(+), 1 deletion(-)
 create mode 100755 services/munin-chrony
 create mode 100755 services/munin-chrony-tracking-ppm
 create mode 100755 services/munin-chrony-tracking-stratum
 create mode 100755 services/munin-chrony-tracking-time
 create mode 100644 services/munin-chrony-tracking-time-root
 create mode 100755 services/munin-chrony-tracking-update-time

diff --git a/Makefile b/Makefile
index f5c3d00..3907b7b 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ show-roots:
 
 show-time:
 	-@$(CHRONY_STATUS) && $(CHRONY_STATS)
-	-@watch -d -n 2 "$(CHRONY_STATUS) && echo "--" && $(CHRONY_STATS) && echo "--" && $(CHRONY_STATS_SOURCES)"
+	-@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
diff --git a/services/monitoring-munin.nix b/services/monitoring-munin.nix
index ebde24e..6591a85 100644
--- a/services/monitoring-munin.nix
+++ b/services/monitoring-munin.nix
@@ -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 ];
diff --git a/services/munin-chrony b/services/munin-chrony
new file mode 100755
index 0000000..811b7ec
--- /dev/null
+++ 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
diff --git a/services/munin-chrony-tracking-ppm b/services/munin-chrony-tracking-ppm
new file mode 100755
index 0000000..da1d022
--- /dev/null
+++ 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
diff --git a/services/munin-chrony-tracking-stratum b/services/munin-chrony-tracking-stratum
new file mode 100755
index 0000000..bf25239
--- /dev/null
+++ 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
diff --git a/services/munin-chrony-tracking-time b/services/munin-chrony-tracking-time
new file mode 100755
index 0000000..cae65ee
--- /dev/null
+++ 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
diff --git a/services/munin-chrony-tracking-time-root b/services/munin-chrony-tracking-time-root
new file mode 100644
index 0000000..fa898fc
--- /dev/null
+++ 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
diff --git a/services/munin-chrony-tracking-update-time b/services/munin-chrony-tracking-update-time
new file mode 100755
index 0000000..1136b04
--- /dev/null
+++ 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

From 16b0a5b617445ea6e19761c66c445ea1009ad158 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Mon, 10 Jun 2019 12:53:08 +0200
Subject: [PATCH 13/72] =?UTF-8?q?nixpkgs=20a=20une=20nouvelle=20option=20p?=
 =?UTF-8?q?our=20g=C3=A9rer=20java=20+=20JAVA=5FHOME?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/developpement-java.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/applications/terminal/developpement-java.nix b/applications/terminal/developpement-java.nix
index 354a193..e49907f 100644
--- a/applications/terminal/developpement-java.nix
+++ b/applications/terminal/developpement-java.nix
@@ -9,13 +9,12 @@ 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
     maven
-    openjdk
   ];
-  environment.variables = {
-    JAVA_HOME = "${pkgs.openjdk}";
-  };
 }

From f0d5881c8067d072acf62488b4a641b2890685ce Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Mon, 10 Jun 2019 12:53:08 +0200
Subject: [PATCH 14/72] ajout de ant et gradle en plus de maven, pas de jaloux
 :)

---
 applications/terminal/developpement-java.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/applications/terminal/developpement-java.nix b/applications/terminal/developpement-java.nix
index e49907f..326e9ae 100644
--- a/applications/terminal/developpement-java.nix
+++ b/applications/terminal/developpement-java.nix
@@ -15,6 +15,8 @@ mkIf flags.developpement-java {
   # Paquets
   environment.systemPackages = with pkgs; [
     # Systèmes de build autour de java
+    ant
     maven
+    gradle
   ];
 }

From 0ff5f2934e8a4b7b967821e4fea4275c84960297 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Mon, 10 Jun 2019 12:53:08 +0200
Subject: [PATCH 15/72] =?UTF-8?q?synaptics=20est=20d=C3=A9pcr=C3=A9ci?=
 =?UTF-8?q?=C3=A9=20->=20libinput?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configuration/laptop.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configuration/laptop.nix b/configuration/laptop.nix
index 7e69cd3..2fc9b25 100644
--- a/configuration/laptop.nix
+++ b/configuration/laptop.nix
@@ -26,8 +26,7 @@ mkIf flags.laptop {
   ];
 
   # Services
-  services.xserver.synaptics = {
+  services.xserver.libinput = {
     enable = true;
-    twoFingerScroll = true;
   };
 }

From da750b9c33b12b3c182f45b0ac5e334a22c092be Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Mon, 10 Jun 2019 12:53:08 +0200
Subject: [PATCH 16/72] java 11 est la LTS officielle, autant l'utiliser

---
 applications/terminal/developpement-java.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/applications/terminal/developpement-java.nix b/applications/terminal/developpement-java.nix
index 326e9ae..c347694 100644
--- a/applications/terminal/developpement-java.nix
+++ b/applications/terminal/developpement-java.nix
@@ -10,7 +10,10 @@ in
 mkIf flags.developpement-java {
 
   # Installe le paquet + JAVA_HOME
-  programs.java.enable = true;
+  programs.java = {
+    enable = true;
+    package = pkgs.jdk11;
+  };
 
   # Paquets
   environment.systemPackages = with pkgs; [

From c7a1a433ef4b1c6627f335d8995b8596c7c5cad6 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Mon, 10 Jun 2019 17:21:00 +0200
Subject: [PATCH 17/72] nm-applet: package -> option (activation automatique)

---
 configuration/laptop.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configuration/laptop.nix b/configuration/laptop.nix
index 2fc9b25..b0f822c 100644
--- a/configuration/laptop.nix
+++ b/configuration/laptop.nix
@@ -19,9 +19,11 @@ mkIf flags.laptop {
 
   hardware.bluetooth.enable = true;
 
+  # 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
   ];
 

From 59d243bb9d22a65be200e4d295da5a93613feb94 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Mon, 10 Jun 2019 17:22:56 +0200
Subject: [PATCH 18/72] wireshark: package -> option (gestion fine des droits)

---
 applications/graphical/network.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/applications/graphical/network.nix b/applications/graphical/network.nix
index 15969e0..80cedb2 100644
--- a/applications/graphical/network.nix
+++ b/applications/graphical/network.nix
@@ -9,9 +9,13 @@ 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
   ];
 }

From 9150a3796912749ddb86d7f87dd514c3bf29b596 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Wed, 19 Jun 2019 09:51:46 +0200
Subject: [PATCH 19/72] =?UTF-8?q?gestion=20de=20l'=C3=A9nergie=20=20:=20TL?=
 =?UTF-8?q?P=20fait=20bien=20le=20job?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configuration/laptop.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration/laptop.nix b/configuration/laptop.nix
index b0f822c..250d3dd 100644
--- a/configuration/laptop.nix
+++ b/configuration/laptop.nix
@@ -12,7 +12,7 @@ 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;

From 8355abcbfcda5214b11bd767f5ec556be6f1ebc9 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Sun, 23 Jun 2019 19:12:47 +0200
Subject: [PATCH 20/72] =?UTF-8?q?le=20bluetooth=20peut=20=C3=AAtre=20?=
 =?UTF-8?q?=C3=A9teint=20par=20d=C3=A9faut=20(=C3=A7a=20consomme)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configuration/laptop.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configuration/laptop.nix b/configuration/laptop.nix
index 250d3dd..b465aeb 100644
--- a/configuration/laptop.nix
+++ b/configuration/laptop.nix
@@ -17,7 +17,10 @@ mkIf flags.laptop {
   ## 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;

From 209b1b3e474c9409fca20ffc7ffad8faa0c34a9e Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Sun, 23 Jun 2019 19:13:23 +0200
Subject: [PATCH 21/72] outils dans le system tray pour : batterie, volume,
 bluetooth

---
 configuration/laptop.nix | 2 ++
 services/pulseaudio.nix  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/configuration/laptop.nix b/configuration/laptop.nix
index b465aeb..0ed3ace 100644
--- a/configuration/laptop.nix
+++ b/configuration/laptop.nix
@@ -28,6 +28,8 @@ mkIf flags.laptop {
   # Paquets
   environment.systemPackages = with pkgs; [
     wirelesstools           # fournis iwconfig
+    blueman                 # outils bluetooth (manager, system tray)
+    cbatticon               # status de la batterie dans le system tray
   ];
 
   # Services
diff --git a/services/pulseaudio.nix b/services/pulseaudio.nix
index 98c1445..a770dd7 100644
--- a/services/pulseaudio.nix
+++ b/services/pulseaudio.nix
@@ -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

From 9151b4dfc51d810af636bd858b83e5c76f2bc427 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 9 Jul 2019 02:21:18 +0200
Subject: [PATCH 22/72] =?UTF-8?q?radio=20:=20m=C3=A9nage=20dans=20les=20pa?=
 =?UTF-8?q?quets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/graphical/radio.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/applications/graphical/radio.nix b/applications/graphical/radio.nix
index a748cfe..4dae78c 100644
--- a/applications/graphical/radio.nix
+++ b/applications/graphical/radio.nix
@@ -13,14 +13,10 @@ mkIf (flags.radio && flags.graphical) {
   environment.systemPackages = with pkgs; [
     ## GUI
     gqrx                    # GUI
-    gnuradio                # Software Defined Radio (SDR) software
     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
-    kalibrate-rtl # Calculate local oscillator frequency offset in RTL-SDR devices
+    #inspectrum    # Tool for analysing captured signals from sdr receivers
+/run/current-system/sw/bin/bash: q : commande introuvable
   ];
 }

From f7de6a69bde2b9aa39b711856cc61bdb88536b9b Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 9 Jul 2019 19:53:00 +0200
Subject: [PATCH 23/72] oops

---
 applications/graphical/radio.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/graphical/radio.nix b/applications/graphical/radio.nix
index 4dae78c..adacbca 100644
--- a/applications/graphical/radio.nix
+++ b/applications/graphical/radio.nix
@@ -17,6 +17,5 @@ mkIf (flags.radio && flags.graphical) {
 
     ## A Trier
     #inspectrum    # Tool for analysing captured signals from sdr receivers
-/run/current-system/sw/bin/bash: q : commande introuvable
   ];
 }

From fe0ea31e30095579601fd6e77db15c8554936fd5 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Wed, 21 Aug 2019 00:11:09 +0200
Subject: [PATCH 24/72] =?UTF-8?q?les=20variantes=20de=20git=20se=20catapul?=
 =?UTF-8?q?tent=20->=20git=20full=20par=20d=C3=A9faut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/graphical/developpement.nix       | 1 -
 applications/terminal/default-applications.nix | 2 +-
 applications/terminal/developpement.nix        | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/applications/graphical/developpement.nix b/applications/graphical/developpement.nix
index 1389237..51b8af2 100644
--- a/applications/graphical/developpement.nix
+++ b/applications/graphical/developpement.nix
@@ -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
diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix
index ee97dfe..05bec37 100644
--- a/applications/terminal/default-applications.nix
+++ b/applications/terminal/default-applications.nix
@@ -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
diff --git a/applications/terminal/developpement.nix b/applications/terminal/developpement.nix
index 7bc4cbc..dab2fa1 100644
--- a/applications/terminal/developpement.nix
+++ b/applications/terminal/developpement.nix
@@ -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
 

From 7681f7774efc7de82707c6389ae42f8eeafebaa6 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@phenom.dubronetwork.fr>
Date: Tue, 19 Nov 2019 22:38:25 +0100
Subject: [PATCH 25/72] nixos: 19.03 -> 19.09

---
 Makefile                      |  4 ++--
 configuration/environment.nix |  2 +-
 options.nix                   | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 3907b7b..3d4bff3 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ optimise:
 	$(TIME) nix optimise-store
 
 rebuild-build:
-	nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
+	nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
 	$(TIME) time nixos-rebuild build --fallback  --show-trace
 
 rebuild-switch:
@@ -58,7 +58,7 @@ store-repair:
 	$(TIME) nix-store --verify --check-contents --repair
 
 upgrade:
-	nix-channel --add https://nixos.org/channels/nixos-19.03 nixos
+	nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
 	$(TIME) nixos-rebuild switch --upgrade --fallback --show-trace
 
 ##--------- Commandes spécifiques pour NixOS -- Opérations non courantes
diff --git a/configuration/environment.nix b/configuration/environment.nix
index 8425cd6..811d77a 100644
--- a/configuration/environment.nix
+++ b/configuration/environment.nix
@@ -12,7 +12,7 @@ in
   nix.buildCores = 0;
 
   # The NixOS release to be compatible with for stateful data such as databases.
-  system.stateVersion = "19.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;
diff --git a/options.nix b/options.nix
index 97d38da..138e178 100644
--- a/options.nix
+++ b/options.nix
@@ -63,7 +63,7 @@ let
 
       ipAddress = mkOption {
         description = "Adresse IP.";
-        type = lib.types.string;
+        type = lib.types.str;
       };
       nix-serve-server = mkEnableOption "nix-serve server.";
       nix-serve-client = {
@@ -80,18 +80,18 @@ let
         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;
@@ -106,7 +106,7 @@ let
               ConnecTo = bar
           '';
           description = "Configuration supplémentaire pour tinc.";
-          type = lib.types.string;
+          type = lib.types.str;
         };
       };
 
@@ -129,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";
         };
       };
@@ -137,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";
         };
       };

From 2a5809c3def8cbd49ddea5ef714927b7b0ac4d1d Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@phenom.dubronetwork.fr>
Date: Sat, 25 Jan 2020 16:26:45 +0100
Subject: [PATCH 26/72] radio: chirp pour programmer les radios portatives

---
 applications/graphical/radio.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/graphical/radio.nix b/applications/graphical/radio.nix
index adacbca..f2b0b6e 100644
--- a/applications/graphical/radio.nix
+++ b/applications/graphical/radio.nix
@@ -12,6 +12,7 @@ mkIf (flags.radio && flags.graphical) {
   # Paquets
   environment.systemPackages = with pkgs; [
     ## GUI
+    chirp                   # Configuration de radios portatives
     gqrx                    # GUI
     gnuradio-with-packages  # Software Defined Radio (SDR) software
 

From f39f486f511c2e40570feaf2978001b0d1939032 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@phenom.dubronetwork.fr>
Date: Thu, 16 Apr 2020 01:14:39 +0200
Subject: [PATCH 27/72] =?UTF-8?q?awesome:=20meta+l=20pour=20slock=20et=20s?=
 =?UTF-8?q?uspend=20combin=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config-awesome-4-rc.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/config-awesome-4-rc.lua b/public/config-awesome-4-rc.lua
index e9bae9a..00cb1bb 100644
--- 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),
 )

From 1e51d11778dd72843f17eca80d3a9d561947adf5 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@phenom.dubronetwork.fr>
Date: Thu, 16 Apr 2020 01:15:52 +0200
Subject: [PATCH 28/72] =?UTF-8?q?radio:=20CubicSDR=20comme=20alternative?=
 =?UTF-8?q?=20=C3=A0=20gqrx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/graphical/radio.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/graphical/radio.nix b/applications/graphical/radio.nix
index f2b0b6e..05bbaed 100644
--- a/applications/graphical/radio.nix
+++ b/applications/graphical/radio.nix
@@ -14,6 +14,7 @@ mkIf (flags.radio && flags.graphical) {
     ## GUI
     chirp                   # Configuration de radios portatives
     gqrx                    # GUI
+    cubicsdr                # Another GUI
     gnuradio-with-packages  # Software Defined Radio (SDR) software
 
     ## A Trier

From e849c5529731caa5eb28718aca2aa0a1bff87bf5 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@phenom.dubronetwork.fr>
Date: Thu, 16 Apr 2020 01:18:01 +0200
Subject: [PATCH 29/72] =?UTF-8?q?radio:=20dump1090=20=C3=A9coute=20ADB-S?=
 =?UTF-8?q?=20des=20avions=20et=20placement=20sur=20une=20carte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/radio.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/terminal/radio.nix b/applications/terminal/radio.nix
index fc196f6..2b70407 100644
--- a/applications/terminal/radio.nix
+++ b/applications/terminal/radio.nix
@@ -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

From 235e6364512fb1e25d957250dbe48e1b9b22de14 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@phenom.dubronetwork.fr>
Date: Thu, 16 Apr 2020 01:18:35 +0200
Subject: [PATCH 30/72] =?UTF-8?q?client=20mumble=20=C3=A0=20nouveau=20fr?=
 =?UTF-8?q?=C3=A9quentable=20(build=20sans=20broncher)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/graphical/client-internet.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix
index 5d463cf..750aeaf 100644
--- a/applications/graphical/client-internet.nix
+++ b/applications/graphical/client-internet.nix
@@ -21,7 +21,7 @@ environment.systemPackages = with pkgs; [
     clawsMail
     hexchat
     quasselClient
-    #mumble
+    mumble
     pidgin
     thunderbird
 

From 65e5776f869856e71ad2af1cb462088afa118206 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 30 Jun 2020 18:58:17 +0200
Subject: [PATCH 31/72] =?UTF-8?q?m=C3=A9nage=20appli=20pour=20pr=C3=A9para?=
 =?UTF-8?q?tion=20migration=20NixOS=2020.03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/graphical/bureautique.nix | 2 +-
 applications/overrides.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/graphical/bureautique.nix b/applications/graphical/bureautique.nix
index a1149a4..fbc2a8c 100644
--- a/applications/graphical/bureautique.nix
+++ b/applications/graphical/bureautique.nix
@@ -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
diff --git a/applications/overrides.nix b/applications/overrides.nix
index 9ebd866..756c730 100644
--- a/applications/overrides.nix
+++ b/applications/overrides.nix
@@ -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;

From 9ed945bba84258cb51c9bf0a4dec7d4e96d9dc55 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Wed, 25 Nov 2020 00:18:49 +0100
Subject: [PATCH 32/72] channel nixos-unstable

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3d4bff3..6e2f698 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ optimise:
 	$(TIME) nix optimise-store
 
 rebuild-build:
-	nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
+	nix-channel --add https://nixos.org/channels/nixos-unstable nixos
 	$(TIME) time nixos-rebuild build --fallback  --show-trace
 
 rebuild-switch:
@@ -58,7 +58,7 @@ store-repair:
 	$(TIME) nix-store --verify --check-contents --repair
 
 upgrade:
-	nix-channel --add https://nixos.org/channels/nixos-19.09 nixos
+	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

From 4a5f0ba1a7748465b869bf98a1ff3a21a70b14cd Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Thu, 6 May 2021 23:50:07 +0200
Subject: [PATCH 33/72] utilisation de networking.fqdn (hostName + domain)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 README.md                                          |  1 +
 applications/graphical/adminsys.nix                |  2 +-
 applications/graphical/bureau.nix                  |  2 +-
 applications/graphical/bureautique.nix             |  2 +-
 applications/graphical/cao.nix                     |  2 +-
 applications/graphical/cartographie.nix            |  2 +-
 applications/graphical/client-internet.nix         |  2 +-
 applications/graphical/default-applications.nix    |  2 +-
 applications/graphical/default.nix                 |  2 +-
 applications/graphical/developpement-elm.nix       |  2 +-
 applications/graphical/developpement-haskell.nix   |  2 +-
 applications/graphical/developpement-java.nix      |  2 +-
 applications/graphical/developpement-jetbrains.nix |  2 +-
 applications/graphical/developpement-rust.nix      |  2 +-
 applications/graphical/developpement.nix           |  2 +-
 applications/graphical/edition-musique.nix         |  2 +-
 applications/graphical/edition-photo.nix           |  2 +-
 applications/graphical/edition-video.nix           |  2 +-
 applications/graphical/jeux.nix                    |  2 +-
 applications/graphical/multimedia.nix              |  2 +-
 applications/graphical/network.nix                 |  2 +-
 applications/graphical/radio.nix                   |  2 +-
 applications/graphical/securite.nix                |  2 +-
 applications/overrides.nix                         |  2 +-
 applications/terminal/adminsys.nix                 |  2 +-
 applications/terminal/bureau.nix                   |  2 +-
 applications/terminal/bureautique.nix              |  2 +-
 applications/terminal/cao.nix                      |  2 +-
 applications/terminal/cartographie.nix             |  2 +-
 applications/terminal/client-internet.nix          |  2 +-
 applications/terminal/default-applications.nix     |  2 +-
 applications/terminal/default.nix                  |  2 +-
 applications/terminal/developpement-elm.nix        |  2 +-
 applications/terminal/developpement-haskell.nix    |  2 +-
 applications/terminal/developpement-java.nix       |  2 +-
 applications/terminal/developpement-jetbrains.nix  |  2 +-
 applications/terminal/developpement-rust.nix       |  2 +-
 applications/terminal/developpement.nix            |  2 +-
 applications/terminal/edition-musique.nix          |  2 +-
 applications/terminal/edition-photo.nix            |  2 +-
 applications/terminal/edition-video.nix            |  2 +-
 applications/terminal/jeux.nix                     |  2 +-
 applications/terminal/multimedia.nix               |  2 +-
 applications/terminal/network.nix                  |  2 +-
 applications/terminal/radio.nix                    |  2 +-
 applications/terminal/securite.nix                 |  2 +-
 config-generator.nix                               |  7 ++++---
 configuration/auto-upgrade.nix                     |  2 +-
 configuration/awesome.nix                          |  2 +-
 configuration/default.nix                          |  2 +-
 configuration/environment.nix                      |  2 +-
 configuration/laptop.nix                           |  2 +-
 configuration/localisation.nix                     |  2 +-
 configuration/network-ipv6.nix                     |  2 +-
 configuration/network.nix                          |  4 ++--
 configuration/swap.nix                             |  2 +-
 configuration/u2f.nix                              |  2 +-
 configuration/udev.nix                             |  2 +-
 iso-image/configuration.nix                        |  3 ++-
 module-template.nix                                |  2 +-
 options.nix                                        |  2 +-
 services/dbus.nix                                  |  2 +-
 services/default.nix                               |  2 +-
 services/docker.nix                                |  2 +-
 services/elasticsearch.nix                         |  2 +-
 services/gpm.nix                                   |  2 +-
 services/haveged.nix                               |  2 +-
 services/hoogle.nix                                |  2 +-
 services/hydra-build.nix                           |  2 +-
 services/hydra-core.nix                            |  6 +++---
 services/kibana.nix                                |  2 +-
 services/locate.nix                                |  2 +-
 services/monitoring-munin.nix                      | 10 +++++-----
 services/nixos-manual.nix                          |  2 +-
 services/print.nix                                 |  2 +-
 services/pulseaudio.nix                            |  2 +-
 services/scanner.nix                               |  2 +-
 services/ssh.nix                                   |  2 +-
 services/virtualbox.nix                            |  2 +-
 services/x11.nix                                   |  2 +-
 services/xmonad/xmonad.nix                         |  2 +-
 services/yubikey.nix                               |  2 +-
 82 files changed, 93 insertions(+), 90 deletions(-)

diff --git a/README.md b/README.md
index d3310e7..dcaa86c 100644
--- 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 :
diff --git a/applications/graphical/adminsys.nix b/applications/graphical/adminsys.nix
index bfc6681..e213860 100644
--- 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
 
diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix
index 1438c0e..228d80c 100644
--- 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
 
diff --git a/applications/graphical/bureautique.nix b/applications/graphical/bureautique.nix
index fbc2a8c..8fab7d9 100644
--- 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
 
diff --git a/applications/graphical/cao.nix b/applications/graphical/cao.nix
index a3d2a6d..43db259 100644
--- 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
 
diff --git a/applications/graphical/cartographie.nix b/applications/graphical/cartographie.nix
index 4c3d269..cb18604 100644
--- 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
 
diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix
index 750aeaf..688aaf6 100644
--- 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
 
diff --git a/applications/graphical/default-applications.nix b/applications/graphical/default-applications.nix
index 659131d..7f75276 100644
--- 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
 
diff --git a/applications/graphical/default.nix b/applications/graphical/default.nix
index cdcdfc7..75e111e 100644
--- 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
 
diff --git a/applications/graphical/developpement-elm.nix b/applications/graphical/developpement-elm.nix
index f37bc7b..c0b7123 100644
--- 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
 
diff --git a/applications/graphical/developpement-haskell.nix b/applications/graphical/developpement-haskell.nix
index 3257559..ae2157e 100644
--- 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
 
diff --git a/applications/graphical/developpement-java.nix b/applications/graphical/developpement-java.nix
index 2b830f3..c43280d 100644
--- 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
 
diff --git a/applications/graphical/developpement-jetbrains.nix b/applications/graphical/developpement-jetbrains.nix
index b42320a..0a5f154 100644
--- 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
 
diff --git a/applications/graphical/developpement-rust.nix b/applications/graphical/developpement-rust.nix
index 0b6f0b4..f9ede33 100644
--- 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
 
diff --git a/applications/graphical/developpement.nix b/applications/graphical/developpement.nix
index 51b8af2..5d68fb2 100644
--- 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
 
diff --git a/applications/graphical/edition-musique.nix b/applications/graphical/edition-musique.nix
index 2d04441..3329821 100644
--- 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
 
diff --git a/applications/graphical/edition-photo.nix b/applications/graphical/edition-photo.nix
index e0573ad..c731c6b 100644
--- 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
 
diff --git a/applications/graphical/edition-video.nix b/applications/graphical/edition-video.nix
index 61f9a2b..124a911 100644
--- 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
 
diff --git a/applications/graphical/jeux.nix b/applications/graphical/jeux.nix
index d426081..b126e59 100644
--- 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
 
diff --git a/applications/graphical/multimedia.nix b/applications/graphical/multimedia.nix
index 1ea891a..3b2d0b8 100644
--- 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
 
diff --git a/applications/graphical/network.nix b/applications/graphical/network.nix
index 80cedb2..b3a6277 100644
--- a/applications/graphical/network.nix
+++ b/applications/graphical/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
 
diff --git a/applications/graphical/radio.nix b/applications/graphical/radio.nix
index 05bbaed..c0a6b3d 100644
--- 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
 
diff --git a/applications/graphical/securite.nix b/applications/graphical/securite.nix
index 543c611..4fd424d 100644
--- 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
 
diff --git a/applications/overrides.nix b/applications/overrides.nix
index 756c730..56d314e 100644
--- 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
 
diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix
index a66799a..92e6bb6 100644
--- 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
 
diff --git a/applications/terminal/bureau.nix b/applications/terminal/bureau.nix
index 02337b1..a68eb59 100644
--- 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
 
diff --git a/applications/terminal/bureautique.nix b/applications/terminal/bureautique.nix
index f594437..d30cfc2 100644
--- 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
 
diff --git a/applications/terminal/cao.nix b/applications/terminal/cao.nix
index 30f33c9..b40b88d 100644
--- 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
 
diff --git a/applications/terminal/cartographie.nix b/applications/terminal/cartographie.nix
index f748045..aa76d40 100644
--- 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
 
diff --git a/applications/terminal/client-internet.nix b/applications/terminal/client-internet.nix
index 7ee9da1..2b9445f 100644
--- 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
 
diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix
index 05bec37..1db9a37 100644
--- 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
 
diff --git a/applications/terminal/default.nix b/applications/terminal/default.nix
index cdcdfc7..75e111e 100644
--- 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
 
diff --git a/applications/terminal/developpement-elm.nix b/applications/terminal/developpement-elm.nix
index 01a604b..3782c50 100644
--- 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
 
diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix
index 6425bb2..9889fee 100644
--- 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
 
diff --git a/applications/terminal/developpement-java.nix b/applications/terminal/developpement-java.nix
index c347694..4062b11 100644
--- a/applications/terminal/developpement-java.nix
+++ b/applications/terminal/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
 
diff --git a/applications/terminal/developpement-jetbrains.nix b/applications/terminal/developpement-jetbrains.nix
index ff91e67..79ba128 100644
--- 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
 
diff --git a/applications/terminal/developpement-rust.nix b/applications/terminal/developpement-rust.nix
index 40a6750..b6981f1 100644
--- 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
 
diff --git a/applications/terminal/developpement.nix b/applications/terminal/developpement.nix
index dab2fa1..1f45c8f 100644
--- 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
 
diff --git a/applications/terminal/edition-musique.nix b/applications/terminal/edition-musique.nix
index cead741..6344c61 100644
--- 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
 
diff --git a/applications/terminal/edition-photo.nix b/applications/terminal/edition-photo.nix
index dc14969..89dacf9 100644
--- 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
 
diff --git a/applications/terminal/edition-video.nix b/applications/terminal/edition-video.nix
index af23cb8..8a375e4 100644
--- 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
 
diff --git a/applications/terminal/jeux.nix b/applications/terminal/jeux.nix
index 2f1aa79..615f422 100644
--- 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
 
diff --git a/applications/terminal/multimedia.nix b/applications/terminal/multimedia.nix
index 717b9fb..4ca10aa 100644
--- 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
 
diff --git a/applications/terminal/network.nix b/applications/terminal/network.nix
index 9e9c263..1a9a9db 100644
--- 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
 
diff --git a/applications/terminal/radio.nix b/applications/terminal/radio.nix
index 2b70407..d7f52b8 100644
--- 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
 
diff --git a/applications/terminal/securite.nix b/applications/terminal/securite.nix
index a03980e..eca7959 100644
--- 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
 
diff --git a/config-generator.nix b/config-generator.nix
index 92ddc96..891db05 100644
--- 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 = {
diff --git a/configuration/auto-upgrade.nix b/configuration/auto-upgrade.nix
index 04ff7f5..17e8d89 100644
--- 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
 
diff --git a/configuration/awesome.nix b/configuration/awesome.nix
index ae5b73d..25a3742 100644
--- 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
 
diff --git a/configuration/default.nix b/configuration/default.nix
index b521f55..7b38dd9 100644
--- 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
 
diff --git a/configuration/environment.nix b/configuration/environment.nix
index 811d77a..aa6ba87 100644
--- 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
 
diff --git a/configuration/laptop.nix b/configuration/laptop.nix
index 0ed3ace..019b8d2 100644
--- 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
 
diff --git a/configuration/localisation.nix b/configuration/localisation.nix
index aa0c60a..4340285 100644
--- a/configuration/localisation.nix
+++ b/configuration/localisation.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
 
diff --git a/configuration/network-ipv6.nix b/configuration/network-ipv6.nix
index ab2d78a..cd988a3 100644
--- 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
 
diff --git a/configuration/network.nix b/configuration/network.nix
index b6b181a..69042ba 100644
--- 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
diff --git a/configuration/swap.nix b/configuration/swap.nix
index 602fdd5..0f44623 100644
--- 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
 
diff --git a/configuration/u2f.nix b/configuration/u2f.nix
index a52b369..ac5c6e2 100644
--- a/configuration/u2f.nix
+++ b/configuration/u2f.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
 
diff --git a/configuration/udev.nix b/configuration/udev.nix
index bbdb94b..63adf9a 100644
--- 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
 
diff --git a/iso-image/configuration.nix b/iso-image/configuration.nix
index b5bf770..f411956 100644
--- 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";
 }
diff --git a/module-template.nix b/module-template.nix
index 3cb37ef..6d9b71a 100644
--- 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
 
diff --git a/options.nix b/options.nix
index 138e178..1bfe8ad 100644
--- a/options.nix
+++ b/options.nix
@@ -160,7 +160,7 @@ let
   };
 
   annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
   flags = currentMachine.configurationFlags;
 in
 
diff --git a/services/dbus.nix b/services/dbus.nix
index 78faab8..3419dfb 100644
--- a/services/dbus.nix
+++ b/services/dbus.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
 
diff --git a/services/default.nix b/services/default.nix
index 8f86e92..3b958a3 100644
--- a/services/default.nix
+++ b/services/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
 
diff --git a/services/docker.nix b/services/docker.nix
index 95b96b4..87164e1 100644
--- 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
 
diff --git a/services/elasticsearch.nix b/services/elasticsearch.nix
index f3f4974..3e2895c 100644
--- 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
 
diff --git a/services/gpm.nix b/services/gpm.nix
index 6bbcb44..913dd22 100644
--- 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
 
diff --git a/services/haveged.nix b/services/haveged.nix
index 35a272c..b419419 100644
--- 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
 
diff --git a/services/hoogle.nix b/services/hoogle.nix
index cb8760f..139cb48 100644
--- 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
 
diff --git a/services/hydra-build.nix b/services/hydra-build.nix
index 42aeb13..089a7ab 100644
--- 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
diff --git a/services/hydra-core.nix b/services/hydra-core.nix
index 0688dfd..757c615 100644
--- 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";
diff --git a/services/kibana.nix b/services/kibana.nix
index b002ef3..afaf86e 100644
--- 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
 
diff --git a/services/locate.nix b/services/locate.nix
index adac879..c8dde77 100644
--- 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
 
diff --git a/services/monitoring-munin.nix b/services/monitoring-munin.nix
index 6591a85..a4948ca 100644
--- 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
 
@@ -54,7 +54,7 @@ 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
@@ -65,9 +65,9 @@ mkIf flags.munin {
     # 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 ${config.networking.hostName}" root@ocean.prunetwork.fr
-      contact.email.command  /run/current-system/sw/bin/mutt -F /etc/nixos/base/services/munin-muttrc  -s "Munin notification for ${config.networking.hostName}" root@ocean.prunetwork.fr
-      contact.syslog.command /run/current-system/sw/bin/logger -p user.crit                 -t "Munin notification for ${config.networking.hostName}"
+      #contact.email.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
diff --git a/services/nixos-manual.nix b/services/nixos-manual.nix
index fc2c9a3..a49ff97 100644
--- 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
 
diff --git a/services/print.nix b/services/print.nix
index 1362bac..3a21096 100644
--- 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
 
diff --git a/services/pulseaudio.nix b/services/pulseaudio.nix
index a770dd7..bee41d4 100644
--- 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
 
diff --git a/services/scanner.nix b/services/scanner.nix
index e320186..86da935 100644
--- 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
 
diff --git a/services/ssh.nix b/services/ssh.nix
index 1030bfd..2abc847 100644
--- 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
 
diff --git a/services/virtualbox.nix b/services/virtualbox.nix
index 8d5e874..d61937e 100644
--- 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
 
diff --git a/services/x11.nix b/services/x11.nix
index acf108d..f91f8e6 100644
--- 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
 
diff --git a/services/xmonad/xmonad.nix b/services/xmonad/xmonad.nix
index 2f1768c..46734db 100644
--- 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
 
diff --git a/services/yubikey.nix b/services/yubikey.nix
index 3ca6d30..3aefd53 100644
--- 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
 

From 2064606f186f4a726070f4fc953c27a7d675a15a Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Fri, 7 May 2021 07:14:24 +0200
Subject: [PATCH 34/72] =?UTF-8?q?paquets=20marqu=C3=A9s=20comme=20cass?=
 =?UTF-8?q?=C3=A9s=20dans=20nixpkgs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/bureautique.nix           | 2 +-
 applications/terminal/developpement-haskell.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/terminal/bureautique.nix b/applications/terminal/bureautique.nix
index d30cfc2..ec91001 100644
--- a/applications/terminal/bureautique.nix
+++ b/applications/terminal/bureautique.nix
@@ -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
diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix
index 9889fee..20bb5e3 100644
--- a/applications/terminal/developpement-haskell.nix
+++ b/applications/terminal/developpement-haskell.nix
@@ -22,7 +22,7 @@ mkIf flags.developpement-haskell {
     #brittany              # formatteur de code
     #darcs                 # gestionnaire de version éponyme
     #ghc-mod               # outil d'analyse de code haskell utilisé par IDE
-    hindent               # indentation code
+    #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
@@ -31,6 +31,6 @@ mkIf flags.developpement-haskell {
 
     # Application perso
     #hahp
-    pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc
+    #pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc ***BROKEN***
   ]);
 }

From c33f0f9c506010ffc460d0391363e4ec08cda268 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Fri, 7 May 2021 07:15:30 +0200
Subject: [PATCH 35/72] =?UTF-8?q?mise=20=C3=A0=20jour=20paquets=20python?=
 =?UTF-8?q?=20en=203.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/bureautique.nix     | 2 +-
 applications/terminal/client-internet.nix | 2 +-
 services/scanner.nix                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/terminal/bureautique.nix b/applications/terminal/bureautique.nix
index ec91001..55aeede 100644
--- a/applications/terminal/bureautique.nix
+++ b/applications/terminal/bureautique.nix
@@ -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
diff --git a/applications/terminal/client-internet.nix b/applications/terminal/client-internet.nix
index 2b9445f..b51fb58 100644
--- a/applications/terminal/client-internet.nix
+++ b/applications/terminal/client-internet.nix
@@ -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)
diff --git a/services/scanner.nix b/services/scanner.nix
index 86da935..224b2fe 100644
--- a/services/scanner.nix
+++ b/services/scanner.nix
@@ -13,7 +13,7 @@ mkIf flags.scanner {
   environment.systemPackages = with pkgs; [
     # Driver
     hplip                     # Scanner HP
-    python27Packages.pyqt4    # dépendance hplip
+    python39Packages.pyqt4    # dépendance hplip
 
     # Outils pour exploiter les scanners
     simple-scan

From 8f4f8ef9530ed78b8d156f381dd43f330019680b Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Fri, 7 May 2021 22:28:44 +0200
Subject: [PATCH 36/72] =?UTF-8?q?d=C3=A9placement=20d'options=20et=20paque?=
 =?UTF-8?q?ts=20upstream?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/adminsys.nix | 2 +-
 configuration/localisation.nix     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix
index 92e6bb6..1f24e58 100644
--- a/applications/terminal/adminsys.nix
+++ b/applications/terminal/adminsys.nix
@@ -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
diff --git a/configuration/localisation.nix b/configuration/localisation.nix
index 4340285..cc5f738 100644
--- a/configuration/localisation.nix
+++ b/configuration/localisation.nix
@@ -10,9 +10,11 @@ in
 mkIf true {
 
   # Select internationalisation properties.
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "fr";
+  };
   i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "fr";
     defaultLocale = "fr_FR.UTF-8";
   };
 

From 67b9f5b0f798d1c5b35f56343b81dd44efc4677c Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Fri, 7 May 2021 23:47:18 +0200
Subject: [PATCH 37/72] =?UTF-8?q?dbus=20est=20d=C3=A9sormais=20tout=20le?=
 =?UTF-8?q?=20temps=20actif=20par=20d=C3=A9faut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/dbus.nix    | 13 -------------
 services/default.nix |  1 -
 2 files changed, 14 deletions(-)
 delete mode 100644 services/dbus.nix

diff --git a/services/dbus.nix b/services/dbus.nix
deleted file mode 100644
index 3419dfb..0000000
--- a/services/dbus.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf mkMerge mkThenElse;
-  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.fqdn}";
-  flags = currentMachine.configurationFlags;
-in
-
-mkIf true {
-  # Lancement de dbus pour les utilisateurs
-  services.dbus.socketActivated = true;
-}
diff --git a/services/default.nix b/services/default.nix
index 3b958a3..6f8523e 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -10,7 +10,6 @@ in
 {
   imports = [
     # installées systématiquement
-    ./dbus.nix
     ./gpm.nix
     ./haveged.nix
     ./monitoring-munin.nix

From e26453fc7ea79921aa81e71eea551d00692d7ffe Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Sat, 8 May 2021 00:16:32 +0200
Subject: [PATCH 38/72] =?UTF-8?q?gnuradio=20tire=20un=20vieux=20paquet=20p?=
 =?UTF-8?q?ython,=20Pilllow=206.2.2,=20marqu=C3=A9=20insecure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/graphical/radio.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/applications/graphical/radio.nix b/applications/graphical/radio.nix
index c0a6b3d..5941cf0 100644
--- a/applications/graphical/radio.nix
+++ b/applications/graphical/radio.nix
@@ -20,4 +20,8 @@ mkIf (flags.radio && flags.graphical) {
     ## A Trier
     #inspectrum    # Tool for analysing captured signals from sdr receivers
   ];
+
+  nixpkgs.config.permittedInsecurePackages = [
+    "python2.7-Pillow-6.2.2"
+  ];
 }

From 3de6332c3e6021d0879d9c9fb8927311fca8d39d Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Sun, 9 May 2021 18:58:30 +0200
Subject: [PATCH 39/72] =?UTF-8?q?pgadmin=20comment=C3=A9,=20plus=20mis=20?=
 =?UTF-8?q?=C3=A0=20jour,=20tire=20un=20openssl=20d=C3=A9pr=C3=A9ci=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/graphical/developpement.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/graphical/developpement.nix b/applications/graphical/developpement.nix
index 5d68fb2..44054b2 100644
--- a/applications/graphical/developpement.nix
+++ b/applications/graphical/developpement.nix
@@ -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

From ed937ba5bceac20b96392f498f79fe4964167b19 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@latitude.dubronetwork.fr>
Date: Tue, 18 May 2021 09:55:00 +0200
Subject: [PATCH 40/72] =?UTF-8?q?activation=20par=20d=C3=A9faut=20de=20l'a?=
 =?UTF-8?q?gent=20gnupg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/default-applications.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix
index 1db9a37..aa96d0a 100644
--- a/applications/terminal/default-applications.nix
+++ b/applications/terminal/default-applications.nix
@@ -33,4 +33,5 @@ mkIf true {
       wget          # client HTTP console
       which         # pour connaitre le chemin d'un exécutable
   ];
+  programs.gnupg.agent.enable = true;
 }

From edad20c5c073a524ac3d827e53b29efae662eb1b Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@impala.dubronetwork.fr>
Date: Mon, 11 Oct 2021 22:23:51 +0200
Subject: [PATCH 41/72] prompt: commentaires

---
 configuration/bash-prompt.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configuration/bash-prompt.sh b/configuration/bash-prompt.sh
index 90affa8..0e958f5 100644
--- a/configuration/bash-prompt.sh
+++ b/configuration/bash-prompt.sh
@@ -1,4 +1,4 @@
-# Définition des couleurs du prompt
+# Prompt colors
 if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
     PS1_USER='\[$(tput setaf 27)\]'
     PS1_HOST='\[$(tput setaf 37)\]'
@@ -18,10 +18,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

From cf3c3c3603ef2668fb20910911889e255ea4c757 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@impala.dubronetwork.fr>
Date: Mon, 11 Oct 2021 22:24:09 +0200
Subject: [PATCH 42/72] fix: infos git dans le prompt

---
 configuration/bash-prompt.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configuration/bash-prompt.sh b/configuration/bash-prompt.sh
index 0e958f5..23c8041 100644
--- a/configuration/bash-prompt.sh
+++ b/configuration/bash-prompt.sh
@@ -1,3 +1,6 @@
+# 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)\]'

From 204fb8320761cd1e1916b7225d3b8db723af601e Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@impala.dubronetwork.fr>
Date: Mon, 11 Oct 2021 22:24:56 +0200
Subject: [PATCH 43/72] =?UTF-8?q?git=20a=20son=20option=20d=C3=A9di=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/default-applications.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix
index aa96d0a..802f670 100644
--- a/applications/terminal/default-applications.nix
+++ b/applications/terminal/default-applications.nix
@@ -12,7 +12,7 @@ mkIf true {
   # Paquets
   environment.systemPackages = with pkgs; [
       byobu         # permet de se déconnecter d'un terminal sans l'arréter
-      gitAndTools.gitFull gitAndTools.tig gti # outil de gestion de version
+      tig gti # outil de gestion de version
       gnumake       # pour décrire les recettes de compilation
       gnupg         # GPG
       htop          # monitoring
@@ -33,5 +33,11 @@ mkIf true {
       wget          # client HTTP console
       which         # pour connaitre le chemin d'un exécutable
   ];
-  programs.gnupg.agent.enable = true;
+  programs = {
+    gnupg.agent.enable = true;
+    git = {
+      enable = true;
+      package = pkgs.gitFull;
+    };
+  };
 }

From ea33bac49be10ad5c19a7e11640f2f9e6cf07970 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@impala.dubronetwork.fr>
Date: Mon, 11 Oct 2021 22:38:42 +0200
Subject: [PATCH 44/72] =?UTF-8?q?options=20d=C3=A9di=C3=A9es=20pour=20sloc?=
 =?UTF-8?q?k,=20spacefm=20et=20udevil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/graphical/bureau.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix
index 228d80c..02ba6bd 100644
--- a/applications/graphical/bureau.nix
+++ b/applications/graphical/bureau.nix
@@ -27,7 +27,6 @@ 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
@@ -44,12 +43,9 @@ mkIf currentMachine.profiles.isDesktopEnvironment {
     hasklig         # police dérivée de source-code-pro mais avec des ligatures
   ];
 
-  # 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;
   };
 }

From 9310d01af6876c22c3ffd1bc349cc51ad52bcecd Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@impala.dubronetwork.fr>
Date: Mon, 11 Oct 2021 22:50:13 +0200
Subject: [PATCH 45/72] =?UTF-8?q?option=20d=C3=A9di=C3=A9e=20au=20mat?=
 =?UTF-8?q?=C3=A9riel=20rtl-sdr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/radio.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/applications/terminal/radio.nix b/applications/terminal/radio.nix
index d7f52b8..ac93540 100644
--- a/applications/terminal/radio.nix
+++ b/applications/terminal/radio.nix
@@ -25,8 +25,5 @@ mkIf flags.radio {
     dump1090    # Listen to planes ADS-B and view them on a map
   ];
 
-  # Configuration matérielle
-  boot.blacklistedKernelModules = [
-    "dvb_usb_rtl28xxu"
-  ];
+  hardware.rtl-sdr.enable = true;
 }

From c8ae50be5be9d6c73ade8a9464736b1a98a90987 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@impala.dubronetwork.fr>
Date: Mon, 11 Oct 2021 22:52:08 +0200
Subject: [PATCH 46/72] ajout de rustup pour faciliter l'installation de
 toolchain rust

---
 applications/terminal/developpement-rust.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/terminal/developpement-rust.nix b/applications/terminal/developpement-rust.nix
index b6981f1..9d07580 100644
--- a/applications/terminal/developpement-rust.nix
+++ b/applications/terminal/developpement-rust.nix
@@ -14,5 +14,6 @@ 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
   ];
 }

From af35de16392de694fd0d519a8d7fa59cb370fc71 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Tue, 18 May 2021 09:44:03 +0200
Subject: [PATCH 47/72] =?UTF-8?q?jetbrains=20mono=20en=20police=20mono=20p?=
 =?UTF-8?q?ar=20d=C3=A9faut=20(pour=20uniformiser=20avec=20Intellij)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/graphical/bureau.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix
index 02ba6bd..10c06ca 100644
--- a/applications/graphical/bureau.nix
+++ b/applications/graphical/bureau.nix
@@ -41,7 +41,11 @@ mkIf currentMachine.profiles.isDesktopEnvironment {
     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" ];
+  };
 
   programs = {
     slock.enable = true;

From 032d7e8e1a021b233250bf87fd101f2c72367e6e Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Sat, 6 Nov 2021 14:59:51 +0100
Subject: [PATCH 48/72] auto-optimisation du store, options du ramasse-miettes

---
 configuration/auto-upgrade.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/configuration/auto-upgrade.nix b/configuration/auto-upgrade.nix
index 17e8d89..fc5668f 100644
--- a/configuration/auto-upgrade.nix
+++ b/configuration/auto-upgrade.nix
@@ -12,5 +12,12 @@ mkIf flags.auto-upgrade {
   # Automatic update & automatic clean
 
   system.autoUpgrade.enable = true;
-  nix.gc.automatic = true;
+  nix = {
+    autoOptimiseStore = true;
+    gc = {
+      automatic = true;
+      dates = "daily";
+      options = "--delete-older-than 7d";
+    };
+  };
 }

From 962c052b29247bf07c1afd2a2048c5e974364493 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Sat, 6 Nov 2021 15:21:27 +0100
Subject: [PATCH 49/72] =?UTF-8?q?seule=20la=20maj=20auto=20a=20besoin=20d'?=
 =?UTF-8?q?=C3=AAtre=20conditionnelle;=20nom=20de=20fichier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configuration/default.nix                           | 2 +-
 configuration/{auto-upgrade.nix => nix-options.nix} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename configuration/{auto-upgrade.nix => nix-options.nix} (86%)

diff --git a/configuration/default.nix b/configuration/default.nix
index 7b38dd9..8f55fe9 100644
--- a/configuration/default.nix
+++ b/configuration/default.nix
@@ -20,9 +20,9 @@ in
 
     # 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
   ];
 }
diff --git a/configuration/auto-upgrade.nix b/configuration/nix-options.nix
similarity index 86%
rename from configuration/auto-upgrade.nix
rename to configuration/nix-options.nix
index fc5668f..52971c4 100644
--- a/configuration/auto-upgrade.nix
+++ b/configuration/nix-options.nix
@@ -7,11 +7,11 @@ let
   flags = currentMachine.configurationFlags;
 in
 
-mkIf flags.auto-upgrade {
+{
 
   # Automatic update & automatic clean
 
-  system.autoUpgrade.enable = true;
+  system.autoUpgrade.enable = flags.auto-upgrade;
   nix = {
     autoOptimiseStore = true;
     gc = {

From b2505f45c48cf783755bdca72dd146b2a461ab96 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@impala.dubronetwork.fr>
Date: Thu, 27 Jan 2022 23:33:34 +0100
Subject: [PATCH 50/72] prise en compte globale de fish

---
 applications/terminal/default-applications.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix
index 802f670..a833a7f 100644
--- a/applications/terminal/default-applications.nix
+++ b/applications/terminal/default-applications.nix
@@ -34,6 +34,7 @@ mkIf true {
       which         # pour connaitre le chemin d'un exécutable
   ];
   programs = {
+    fish.enable = true;
     gnupg.agent.enable = true;
     git = {
       enable = true;

From 0364ea9b292b24ebeada3e2d340b929b8e8cdea2 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@impala.dubronetwork.fr>
Date: Thu, 27 Jan 2022 23:36:07 +0100
Subject: [PATCH 51/72] ajout de lazygit ; interface terminal sympa pour git

---
 applications/terminal/default-applications.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix
index a833a7f..1cbbda7 100644
--- a/applications/terminal/default-applications.nix
+++ b/applications/terminal/default-applications.nix
@@ -12,7 +12,7 @@ mkIf true {
   # Paquets
   environment.systemPackages = with pkgs; [
       byobu         # permet de se déconnecter d'un terminal sans l'arréter
-      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

From 30e2f312550ff9ce7436fcd48ab11d7e4061358f Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@impala.dubronetwork.fr>
Date: Thu, 27 Jan 2022 23:39:05 +0100
Subject: [PATCH 52/72] ajout de kitty : terminal virtuel rendu par GPU

---
 applications/graphical/bureau.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix
index 10c06ca..c133e1a 100644
--- a/applications/graphical/bureau.nix
+++ b/applications/graphical/bureau.nix
@@ -30,6 +30,7 @@ mkIf currentMachine.profiles.isDesktopEnvironment {
     #vifm                  # gestionnaire de fichiers basé sur VIM (console)
 
     ## Terminal
+    kitty                  # terminal avec rendu par GPU
     sakura                # terminal
   ];
 

From 48a257405a72518558ba2bdf14b3e042c1b95429 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Tue, 1 Mar 2022 20:11:25 +0100
Subject: [PATCH 53/72] =?UTF-8?q?pr=C3=A9conisations=20des=20devs=20d'Open?=
 =?UTF-8?q?JDK=20:=20utilisons=20la=20derni=C3=A8re=20version=20disponible?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/developpement-java.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/terminal/developpement-java.nix b/applications/terminal/developpement-java.nix
index 4062b11..6f33d47 100644
--- a/applications/terminal/developpement-java.nix
+++ b/applications/terminal/developpement-java.nix
@@ -12,7 +12,6 @@ mkIf flags.developpement-java {
   # Installe le paquet + JAVA_HOME
   programs.java = {
     enable = true;
-    package = pkgs.jdk11;
   };
 
   # Paquets

From 2d63aae5a1cb0c64b17c9d8199b259cc04b0f0c0 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Tue, 1 Mar 2022 20:13:16 +0100
Subject: [PATCH 54/72] syntaxe fish pour vim

---
 applications/terminal/vim.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/terminal/vim.nix b/applications/terminal/vim.nix
index dd0c13a..9ec78a7 100644
--- a/applications/terminal/vim.nix
+++ b/applications/terminal/vim.nix
@@ -13,6 +13,7 @@ vim_configurable.customize {
       # They are installed managed by `vam` (a vim plugin manager)
       #"vim-addon-nix"
       "elm-vim"
+      "vim-fish"
       "vim-nix"
       "wombat256-vim"
     ]; }

From 7679f865b06ede8cdec12970a7171f8bcaa475dc Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Tue, 1 Mar 2022 20:20:42 +0100
Subject: [PATCH 55/72] lazydocker pour controller les imgaes et containers
 dans le terminal

---
 services/docker.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/docker.nix b/services/docker.nix
index 87164e1..235617a 100644
--- a/services/docker.nix
+++ b/services/docker.nix
@@ -14,6 +14,7 @@ mkIf flags.docker {
     # Ecosystème Docker
     docker
     docker-compose
+    lazydocker
   ];
 
   virtualisation.docker.enable = true;

From 03bcc056c1ef700bc0b7576a0182d7053694be76 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Tue, 1 Mar 2022 20:35:28 +0100
Subject: [PATCH 56/72] =?UTF-8?q?ajout=20d'un=20module=20pipewire=20en=20p?=
 =?UTF-8?q?r=C3=A9vision=20de=20remplacement=20de=20pulseaudio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options.nix           |  1 +
 services/default.nix  |  1 +
 services/pipewire.nix | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 services/pipewire.nix

diff --git a/options.nix b/options.nix
index 1bfe8ad..5aa062d 100644
--- a/options.nix
+++ b/options.nix
@@ -44,6 +44,7 @@ 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.";
diff --git a/services/default.nix b/services/default.nix
index 6f8523e..cb5237b 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -33,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
   ];
diff --git a/services/pipewire.nix b/services/pipewire.nix
new file mode 100644
index 0000000..28dd419
--- /dev/null
+++ b/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;
+  };
+
+}

From 518054fd0a663059bd0103c4365f92fc202bc77e Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Tue, 1 Mar 2022 20:55:11 +0100
Subject: [PATCH 57/72] gestionnaire graphique bluetooth

---
 configuration/laptop.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configuration/laptop.nix b/configuration/laptop.nix
index 019b8d2..5878457 100644
--- a/configuration/laptop.nix
+++ b/configuration/laptop.nix
@@ -33,6 +33,7 @@ mkIf flags.laptop {
   ];
 
   # Services
+  services.blueman.enable = true;
   services.xserver.libinput = {
     enable = true;
   };

From 257f59054d90ef85c0130808d27125cba9badd05 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Tue, 1 Mar 2022 22:06:12 +0100
Subject: [PATCH 58/72] renommage d'options Nix

---
 configuration/environment.nix | 3 ---
 configuration/nix-options.nix | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configuration/environment.nix b/configuration/environment.nix
index aa6ba87..83765ed 100644
--- a/configuration/environment.nix
+++ b/configuration/environment.nix
@@ -8,9 +8,6 @@ let
 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 = "19.09";
 
diff --git a/configuration/nix-options.nix b/configuration/nix-options.nix
index 52971c4..b44530a 100644
--- a/configuration/nix-options.nix
+++ b/configuration/nix-options.nix
@@ -13,7 +13,11 @@ in
 
   system.autoUpgrade.enable = flags.auto-upgrade;
   nix = {
-    autoOptimiseStore = true;
+    settings = {
+      auto-optimise-store = true;
+      # Nombre de process d'installation en parrallèle effectués par Nix
+      cores = 0;
+    };
     gc = {
       automatic = true;
       dates = "daily";

From f6f3befe2fbdcd1116216f033a71e7c732e88794 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Wed, 2 Mar 2022 17:36:54 +0100
Subject: [PATCH 59/72] activation des sous-commandes nix et des flakes

---
 configuration/nix-options.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configuration/nix-options.nix b/configuration/nix-options.nix
index b44530a..29d6c87 100644
--- a/configuration/nix-options.nix
+++ b/configuration/nix-options.nix
@@ -13,6 +13,9 @@ in
 
   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

From 28cf2d20719b913948f02258d5561e8dcb66bbb1 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Thu, 3 Mar 2022 11:57:10 +0100
Subject: [PATCH 60/72] lot de renommages dans nixpkgs

---
 applications/graphical/client-internet.nix         | 6 +++---
 applications/graphical/developpement-java.nix      | 2 +-
 applications/graphical/developpement-jetbrains.nix | 8 ++++----
 applications/overrides.nix                         | 2 +-
 applications/terminal/adminsys.nix                 | 2 +-
 applications/terminal/default-applications.nix     | 2 +-
 applications/terminal/network.nix                  | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix
index 688aaf6..75e6be2 100644
--- a/applications/graphical/client-internet.nix
+++ b/applications/graphical/client-internet.nix
@@ -18,7 +18,7 @@ environment.systemPackages = with pkgs; [
     firefox
 
     ## Mail & Discussion (texte, audio)
-    clawsMail
+    claws-mail
     hexchat
     quasselClient
     mumble
@@ -27,7 +27,7 @@ environment.systemPackages = with pkgs; [
 
     # Transfert de fichier
     filezilla
-    transmission_gtk
-    transmission_remote_gtk
+    transmission-gtk
+    transmission-remote-gtk
   ];
 }
diff --git a/applications/graphical/developpement-java.nix b/applications/graphical/developpement-java.nix
index c43280d..dcc6609 100644
--- a/applications/graphical/developpement-java.nix
+++ b/applications/graphical/developpement-java.nix
@@ -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
   ];
 }
diff --git a/applications/graphical/developpement-jetbrains.nix b/applications/graphical/developpement-jetbrains.nix
index 0a5f154..e5302f0 100644
--- a/applications/graphical/developpement-jetbrains.nix
+++ b/applications/graphical/developpement-jetbrains.nix
@@ -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
   ];
 }
diff --git a/applications/overrides.nix b/applications/overrides.nix
index 56d314e..6349f52 100644
--- a/applications/overrides.nix
+++ b/applications/overrides.nix
@@ -10,7 +10,7 @@ in
 mkIf true {
 
   nixpkgs.config.packageOverrides = pkgs: {
-    clawsMail = pkgs.clawsMail.override {
+    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
diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix
index 1f24e58..e48ec3f 100644
--- a/applications/terminal/adminsys.nix
+++ b/applications/terminal/adminsys.nix
@@ -44,7 +44,7 @@ mkIf true {
     ntfs3g        # ntfs
     samba         # partages windows
     squashfsTools # squashfs
-    sshfsFuse     # ssh
+    sshfs-fuse    # ssh
 
     ## Gestion de FS
     nfs-utils
diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix
index 1cbbda7..6049299 100644
--- a/applications/terminal/default-applications.nix
+++ b/applications/terminal/default-applications.nix
@@ -25,7 +25,7 @@ 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
diff --git a/applications/terminal/network.nix b/applications/terminal/network.nix
index 1a9a9db..bb93553 100644
--- a/applications/terminal/network.nix
+++ b/applications/terminal/network.nix
@@ -15,7 +15,7 @@ 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

From 2fad38532f374d6ccfcfb3f6103395828908804e Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Mon, 14 Mar 2022 09:21:37 +0100
Subject: [PATCH 61/72] nouvelle syntaxe pour l'optimisation du store

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6e2f698..a6b3cfd 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ list-installed-packages:
 	nixos-option environment.systemPackages | head -2 | tail -1 | sed -e 's/ /\n/g' | cut -d- -f2- | sort | uniq| sed -e 's/"$$//'
 
 optimise:
-	$(TIME) nix optimise-store
+	$(TIME) nix store optimise
 
 rebuild-build:
 	nix-channel --add https://nixos.org/channels/nixos-unstable nixos

From d4f2298518e63c15d13b89a31a397e4471e3a70c Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Mon, 25 Apr 2022 10:00:11 +0200
Subject: [PATCH 62/72] fix: mauvaise couleur de fond dans vim dans certains
 cas

---
 applications/terminal/vimrc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/applications/terminal/vimrc b/applications/terminal/vimrc
index 257846c..24051b9 100644
--- a/applications/terminal/vimrc
+++ b/applications/terminal/vimrc
@@ -32,3 +32,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=''

From e55568d1c699957c0cb34adc21bcc6f4f2479d96 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@rollo.dubronetwork.fr>
Date: Sat, 7 May 2022 12:21:28 +0200
Subject: [PATCH 63/72] =?UTF-8?q?rdfind=20cass=C3=A9=20dans=20les=20paquet?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/adminsys.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix
index e48ec3f..f2a120b 100644
--- a/applications/terminal/adminsys.nix
+++ b/applications/terminal/adminsys.nix
@@ -53,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
   ];
 }

From 812bc511e07050bee1962213602d9f3fba302e65 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Wed, 8 Jun 2022 15:51:06 +0200
Subject: [PATCH 64/72] impression vers des imprimantes Samba

---
 services/print.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/services/print.nix b/services/print.nix
index 3a21096..d476097 100644
--- a/services/print.nix
+++ b/services/print.nix
@@ -9,12 +9,19 @@ 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;
 }

From 1b1aebd0a0d374845d0b868204851fe7c3066d16 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Wed, 8 Jun 2022 15:51:30 +0200
Subject: [PATCH 65/72] ajout du plugin vim-wiki

---
 applications/terminal/vim.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/terminal/vim.nix b/applications/terminal/vim.nix
index 9ec78a7..6cac9e0 100644
--- a/applications/terminal/vim.nix
+++ b/applications/terminal/vim.nix
@@ -16,6 +16,7 @@ vim_configurable.customize {
       "vim-fish"
       "vim-nix"
       "wombat256-vim"
+      "vimwiki"
     ]; }
   ];
 }

From f751e24839f33bd20604f1caa644a8903d48d130 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Wed, 8 Jun 2022 15:52:09 +0200
Subject: [PATCH 66/72] =?UTF-8?q?outil=20pour=20g=C3=A9n=C3=A9rer=20une=20?=
 =?UTF-8?q?d=C3=A9rivation=20Nix=20dans=20un=20projet=20Rust?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 applications/terminal/developpement-rust.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/terminal/developpement-rust.nix b/applications/terminal/developpement-rust.nix
index 9d07580..5f24eb9 100644
--- a/applications/terminal/developpement-rust.nix
+++ b/applications/terminal/developpement-rust.nix
@@ -15,5 +15,6 @@ mkIf flags.developpement-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
   ];
 }

From 51b98cda4f4643e53ce8f4911fa47f46355a37c0 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@impala.dubronetwork.fr>
Date: Fri, 10 Jun 2022 15:27:15 +0200
Subject: [PATCH 67/72] nettoyage paquets xmonad inutiles

---
 services/xmonad/xmonad.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/services/xmonad/xmonad.nix b/services/xmonad/xmonad.nix
index 46734db..14b86b9 100644
--- a/services/xmonad/xmonad.nix
+++ b/services/xmonad/xmonad.nix
@@ -9,20 +9,10 @@ in
 
 mkIf flags.xmonad {
 
-  # Paquets
-  environment.systemPackages = with pkgs; [
-    dmenu
-    haskellPackages.xmobar
-    trayer
-  ];
-
   # Services
   services.xserver.windowManager.xmonad = {
     enable = true;
     enableContribAndExtras = true;
-    extraPackages = haskellPackages: [
-      haskellPackages.xmobar
-    ];
   };
   environment.variables = {
     _JAVA_AWT_WM_NONREPARENTING = "1";

From 963b0b9d4b2bd60bb2891c33ad7ec2f6f64cd343 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@impala.dubronetwork.fr>
Date: Fri, 10 Jun 2022 15:27:40 +0200
Subject: [PATCH 68/72] configuration gnome active pour xmonad

---
 services/xmonad/xmonad.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/xmonad/xmonad.nix b/services/xmonad/xmonad.nix
index 14b86b9..60e8af1 100644
--- a/services/xmonad/xmonad.nix
+++ b/services/xmonad/xmonad.nix
@@ -8,6 +8,8 @@ let
 in
 
 mkIf flags.xmonad {
+  services.dbus.packages = with pkgs; [ dconf ];
+  programs.dconf.enable = true;
 
   # Services
   services.xserver.windowManager.xmonad = {

From 4fd9d0d7f87fe47b4507963a76f11490bc97c69f Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Fri, 5 Aug 2022 14:52:06 +0200
Subject: [PATCH 69/72] config git au format Nix

---
 .../terminal/default-applications.nix         | 31 +++++++++++++++++++
 configuration/environment.nix                 |  1 -
 configuration/gitconfig                       | 27 ----------------
 3 files changed, 31 insertions(+), 28 deletions(-)
 delete mode 100644 configuration/gitconfig

diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix
index 6049299..ca150ef 100644
--- a/applications/terminal/default-applications.nix
+++ b/applications/terminal/default-applications.nix
@@ -39,6 +39,37 @@ mkIf 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;
+    };
     };
   };
 }
diff --git a/configuration/environment.nix b/configuration/environment.nix
index 83765ed..8cc100b 100644
--- a/configuration/environment.nix
+++ b/configuration/environment.nix
@@ -43,7 +43,6 @@ in
       vi = "vim";
       byobu-adminsys = "/etc/nixos/base/byobu-adminsys";
     };
-    etc.gitconfig.text = builtins.readFile ./gitconfig;
   };
   programs.bash = {
     enableCompletion = true;
diff --git a/configuration/gitconfig b/configuration/gitconfig
deleted file mode 100644
index e3d4d5e..0000000
--- a/configuration/gitconfig
+++ /dev/null
@@ -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

From f7264ae43434ab218fab3f6982e7a277719cfe54 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Fri, 5 Aug 2022 16:03:14 +0200
Subject: [PATCH 70/72] =?UTF-8?q?vim:=20nouvelle=20fa=C3=A7on=20d'appeler?=
 =?UTF-8?q?=20les=20plugins,=20reorga=20du=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../terminal/default-applications.nix         |  2 -
 applications/terminal/default.nix             |  1 +
 applications/terminal/vim.nix                 | 46 +++++++++++--------
 applications/terminal/vimrc                   |  2 +
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix
index ca150ef..89d3188 100644
--- a/applications/terminal/default-applications.nix
+++ b/applications/terminal/default-applications.nix
@@ -29,7 +29,6 @@ mkIf true {
       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
   ];
@@ -70,6 +69,5 @@ mkIf true {
       };
       lfs.enable = true;
     };
-    };
   };
 }
diff --git a/applications/terminal/default.nix b/applications/terminal/default.nix
index 75e111e..510a21c 100644
--- a/applications/terminal/default.nix
+++ b/applications/terminal/default.nix
@@ -27,6 +27,7 @@ in
     ./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
diff --git a/applications/terminal/vim.nix b/applications/terminal/vim.nix
index 6cac9e0..e392e77 100644
--- a/applications/terminal/vim.nix
+++ b/applications/terminal/vim.nix
@@ -1,22 +1,28 @@
-with import <nixpkgs> {};
+{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-fish"
-      "vim-nix"
-      "wombat256-vim"
-      "vimwiki"
-    ]; }
-  ];
+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.packages.myVimPackage = with pkgs.vimPlugins; {
+      start = [
+        wombat256-vim
+      ];
+      opt = [
+        elm-vim
+        vim-fish
+        vim-nix
+        vimwiki
+      ];
+    };
+  };
+
+in {
+  programs.vim = {
+    defaultEditor = true;
+    package = myVim;
+  };
 }
diff --git a/applications/terminal/vimrc b/applications/terminal/vimrc
index 24051b9..b9f3c41 100644
--- a/applications/terminal/vimrc
+++ b/applications/terminal/vimrc
@@ -2,6 +2,8 @@
 " This must be first, because it changes other options as a side effect.
 set nocompatible
 
+syntax on
+
 " allow backspacing over everything in insert mode
 set backspace=indent,eol,start
 

From 06d73c9519abc12629b4e94f80417efd61bb9f42 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Tue, 9 Aug 2022 18:57:40 +0200
Subject: [PATCH 71/72] lancement auto des plugins vim selon le type de fichier

---
 applications/terminal/vimrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/terminal/vimrc b/applications/terminal/vimrc
index b9f3c41..f10a1a4 100644
--- a/applications/terminal/vimrc
+++ b/applications/terminal/vimrc
@@ -2,6 +2,7 @@
 " 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

From c1b40f9d07f67ab255b0602da87bd86a1af8a91a Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <yves+git@dubronetwork.fr>
Date: Fri, 12 Aug 2022 15:30:32 +0200
Subject: [PATCH 72/72] =?UTF-8?q?nouveau=20site=20pour=20v=C3=A9rifier=20l?=
 =?UTF-8?q?e=20status=20de=20NixOS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dcaa86c..f01ad20 100644
--- a/README.md
+++ b/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