EXP désactivation de darcs

This reverts commit 0c47de1cb1.

Makefile

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

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

applications/graphical/bureautique.nix

@@ -24,7 +24,7 @@ mkIf (flags.officeSuite && flags.graphical) {
     ## Editeur de texte
     #lyx          # surcouche WISIWIM à LaTeX
     #focuswriter  # outil pour l'écriture
-    textadept     # un éditeur de texte facile pour copier-coller graphique
+    #textadept     # un éditeur de texte facile pour copier-coller graphique
     #zim          # outil de prise de notes, wiki de bureau
 
     ## Visionneuse

applications/graphical/client-internet.nix

@@ -21,7 +21,7 @@ environment.systemPackages = with pkgs; [
     clawsMail
     hexchat
     quasselClient
-    mumble
+    #mumble
     pidgin
     thunderbird
 
@@ -30,22 +30,4 @@ environment.systemPackages = with pkgs; [
     transmission_gtk
     transmission_remote_gtk
   ];
-
-  /* TODO: voir pour appliquer la personnalisation
-  nixpkgs.config.packageOverrides = pkgs: {
-    clawsMail = pkgs.clawsMail.override {
-      enablePluginFancy = false; # nécessite wekitgtk qui est troué
-      enablePluginPdf = true;
-      enablePluginRavatar = true;
-      enablePluginSmime = true;
-      enablePluginVcalendar = true;
-      enableSpellcheck = true;
-    };
-    mumble = pkgs.mumble.override { pulseSupport = true; };
-  };
-  */
-
-  #nixpkgs.config.permittedInsecurePackages = [
-  #  "webkitgtk-2.4.11"       # pour que le plugin fancy de claws-mail fonctionne
-  #];
 }

applications/graphical/default.nix

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

applications/graphical/developpement-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)
   ]);
 }

applications/graphical/radio.nix

@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configurationFlags;
+in
+
+mkIf (flags.radio && flags.graphical) {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    ## GUI
+    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
+  ];
+}

applications/overrides.nix

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

applications/terminal/adminsys.nix

@@ -22,8 +22,9 @@ mkIf true {
     ntp
     powerline-fonts
     powertop
-    #python27Packages.ansible2
+    #ansible
-    python27Packages.glances
+    python36Packages.glances
+    pv            # afficher le débit d'un flux     dd if=/dev/zero | pv | dd of=/dev/null
     sysstat       # pour la commande "iostat -x -1" de monitoring d'activité disque
     usbutils
 

applications/terminal/bureautique.nix

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

applications/terminal/client-internet.nix

@@ -14,8 +14,8 @@ environment.systemPackages = with pkgs; [
     # Clients Internet
 
     ## Réseaux sociaux
-    #python27Packages.turses           # client twitter en ncurse
+    #turses                            # client twitter en ncurse
-    #python27Packages.rainbowstream    # client twitter en console
+    #python36Packages.rainbowstream    # client twitter en console
     #rtv                               # client reddit en console
 
     ## Mail & Discussion (texte, audio)

applications/terminal/default.nix

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

applications/terminal/developpement-haskell.nix

@@ -19,8 +19,9 @@ mkIf flags.developpement-haskell {
   ] ++ (with pkgs.haskellPackages; [
     # Haskell lib
     autoproc              # ? procmail
-    darcs                 # gestionnaire de version éponyme
+    #brittany              # formatteur de code
-    ghc-mod               # outil d'analyse de code haskell utilisé par IDE
+    #darcs                 # gestionnaire de version éponyme
+    #ghc-mod               # outil d'analyse de code haskell utilisé par IDE
     hindent               # indentation code
     hlint                 # qualite de code, analyse statique de code + astuces & bonnes pratiques
     #postgrest            # mapper HTTP <-> PostgreSQL
@@ -29,7 +30,7 @@ mkIf flags.developpement-haskell {
     turtle                # genre shell-scripting
 
     # Application perso
-    hahp
+    #hahp
     pandoc-filter-graphviz # filtre pour utiliser graphviz à partir de pandoc
   ]);
 }

applications/terminal/developpement.nix

@@ -11,6 +11,11 @@ mkIf flags.developpement {
 
   # Paquets
   environment.systemPackages = with pkgs; [
+    # Build / outil de construction
+    autobuild
+    autoconf
+    automake
+
     # Base de données
     pg_top                 # monitoring de PostgreSQL
     sqlite                 # le moteur de base de données

applications/terminal/edition-video.nix

@@ -13,13 +13,4 @@ mkIf flags.edition-video {
   environment.systemPackages = with pkgs; [
     ffmpeg-full   # assemblage de flux audio & video en ligne de commande
   ];
-
-  /* TODO: voir pour appliquer la personnalisation
-  nixpkgs.config.packageOverrides = pkgs: {
-    ffmpeg-full = pkgs.ffmpeg-full.override {
-      nonfreeLicensing = true;
-      nvenc  = true;
-    };
-  };
-  */
 }

applications/terminal/network.nix

@@ -19,15 +19,14 @@ mkIf true {
 
     ## Diagnostic
     arp-scan
+    #mtr  -> installé plus bas
     nmap          # outil de scan de port réseau
     whois
   ];
 
-  # Paquets avec setuid root
+  # https://github.com/NixOS/nixpkgs/issues/30335
-  security.wrappers = {
+  # Some programs need SUID wrappers, can be configured further or are started in user sessions.
-    # outil de diagnostic réseau
+  programs.mtr.enable = true;
-    mtr.source = "${pkgs.mtr}/bin/mtr";
-  };
 
   networking.firewall = {
     allowedTCPPorts = [

applications/terminal/radio.nix

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

base.nix

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

configuration/default.nix

@@ -15,6 +15,7 @@ in
     ./localisation.nix
     ./network.nix
     #./network-ipv6.nix
+    ./u2f.nix
     ./udev.nix
 
     # commandées par config-generator

configuration/environment.nix

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

configuration/u2f.nix

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

module-template.nix

@@ -22,4 +22,11 @@ mkIf true {
     allowedUDPPorts = [
     ];
   };
+} // {
+  assertions = [
+    {
+      assertion = true;
+      message = "Assetion toujours valide.";
+    }
+  ];
 }

options.nix

@@ -47,6 +47,7 @@ let
         print                 = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
         pulseaudio            = mkEnableOption "Profil pour activer pulseaudio.";
         rabbitmq              = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
+        radio                 = mkEnableOption "Profil pour activer les outils pour faire de radio numérique - SDR.";
         radicale              = mkEnableOption "Profil pour activer le service d'hébergement de calendrier + tâches & contacts.";
         rmilter               = mkEnableOption "Profil pour activer le filtrage de mails par postfix.";
         scanner               = mkEnableOption "Profil pour que les scanners soient utilisable.";
@@ -61,10 +62,10 @@ let
       configurationOptions = {
 
       ipAddress = mkOption {
-        description = "Adresse IP";
+        description = "Adresse IP.";
         type = lib.types.string;
       };
-      nix-serve-server = mkEnableOption "nix-serve server";
+      nix-serve-server = mkEnableOption "nix-serve server.";
       nix-serve-client = {
         enable =  mkEnableOption "nix-serve client";
         servers = mkOption {
@@ -75,7 +76,12 @@ let
       };
 
       tinc = {
-        enable = mkEnableOption "Enable tinc service";
+        enable = mkEnableOption "Enable tinc service.";
+        dnsFQDN = mkOption {
+          example = "device.example.net.";
+          description = "DNS name of host pointing to tunnel IP.";
+          type = lib.types.string;
+        };
         connectToAddress = mkOption {
           default = "";
           example = "192.168.1.1";
@@ -99,11 +105,26 @@ let
               Mode = router
               ConnecTo = bar
           '';
-          description = "Configuration supplémentaire pour tinc";
+          description = "Configuration supplémentaire pour tinc.";
           type = lib.types.string;
         };
       };
 
+      quagga = {
+        enable = mkEnableOption "Enable Quagga + BGP service";
+        bgpConfig = mkOption {
+          type = types.lines;
+          default = "";
+          example =''
+              router bgp 65001
+                neighbor 10.0.0.1 remote-as 65001
+            '';
+          description = ''
+            BGP configuration statements.
+          '';
+        };
+      };
+
       windowsBoot = {
         enable = mkEnableOption "Activation du démarrage de Windows par Grub";
         drive = mkOption {

public/config-awesome-4-rc.lua

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

services/docker.nix

@@ -13,7 +13,7 @@ mkIf flags.docker {
   environment.systemPackages = with pkgs; [
     # Ecosystème Docker
     docker
-    python27Packages.docker_compose
+    docker-compose
   ];
 
   virtualisation.docker.enable = true;

services/hydra-build.nix

@@ -23,7 +23,6 @@ mkIf flags.hydra-builder {
     docker.enable = true;
     libvirtd = {
       enable = true;
-      enableKVM = true;
     };
     virtualbox = {
       #guest.enable = true;

services/monitoring-munin.nix

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

services/pulseaudio.nix

@@ -9,6 +9,9 @@ in
 
 mkIf flags.pulseaudio {
 
+  # Notes
+  # commande pour lister les cartes son : pacmd list-cards
+
   # Paquets
   environment.systemPackages = with pkgs; [
     paprefs       # préferences pulseaudio

services/scanner.nix

@@ -11,11 +11,20 @@ mkIf flags.scanner {
 
   # Paquets
   environment.systemPackages = with pkgs; [
+    # Driver
+    hplip                     # Scanner HP
+    python27Packages.pyqt4    # dépendance hplip
+
+    # Outils pour exploiter les scanners
     simple-scan
   ];
 
   # Services
   hardware.sane.enable = true;
+  services.saned = {
+    enable = true;
+    extraConfig = "192.168.0.0/24";
+  };
 
   # Réseau
   networking.firewall = {

services/ssh.nix

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

services/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;