Merge nixos-21.05-preparation fixes #9

nouveau site pour vérifier le status de NixOS
lancement auto des plugins vim selon le type de fichier
90 changed files with 316 additions and 241 deletions
--- a/6
+++ b/6
@ -32,10 +32,10 @@ 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-19.03 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.03 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
--- 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
@ -22,6 +22,7 @@ Ce dépôt stocke une configuration générique des machines.
 * mettre à jour les dépôts avec les dernières versions, `make submodules-update`
 * vérifier que `configuration.nix` contient `services.xserver.enable = true;` pour les machines avec interface graphique
 * vérifier que `configuration.nix` contient le nom de la machine `networking.hostName = "<X>";`
+* vérifier que `configuration.nix` contient le nom de domaine `networking.domain = "<X>";`
 * tester la configuration : `nixos-rebuild build`
 * corriger et ajouter les éléments manquant (notamment dans `private/annuaire.nix` )
 * lorsque tout semble bon, vérifier :
--- a/applications/graphical/adminsys.nix
+++ b/applications/graphical/adminsys.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

@ -27,10 +27,10 @@ mkIf currentMachine.profiles.isDesktopEnvironment {
    #kde5.dolphin          # gestionnaire de fichiers graphique
    #kde5.dolphin-plugins  # gestionnaire de fichiers graphique
    pcmanfm               # gestionnaire de fichiers graphique
-    spaceFM               # gestionnaire de fichiers graphique
    #vifm                  # gestionnaire de fichiers basé sur VIM (console)

    ## Terminal
+    kitty                  # terminal avec rendu par GPU
    sakura                # terminal
  ];

@ -42,14 +42,15 @@ 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" ];
+  };

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

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

    ## Visionneuse
    #kde5.okular   # pdf
-    mcomix        # livres (cbr, liste d'images), gestion d'une bibliothèque
+    #mcomix        # livres (cbr, liste d'images), gestion d'une bibliothèque # Supprimé dans NixOS 20.03
    pdfpc         # pdf
    qpdfview      # pdf
    gqview        # visionneuse image & gestion basique de collection
--- a/applications/graphical/cao.nix
+++ b/applications/graphical/cao.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

@ -18,16 +18,16 @@ environment.systemPackages = with pkgs; [
    firefox

    ## Mail & Discussion (texte, audio)
-    clawsMail
+    claws-mail
    hexchat
    quasselClient
-    #mumble
+    mumble
    pidgin
    thunderbird

    # Transfert de fichier
    filezilla
-    transmission_gtk
-    transmission_remote_gtk
+    transmission-gtk
+    transmission-remote-gtk
  ];
 }
--- a/applications/graphical/default-applications.nix
+++ b/applications/graphical/default-applications.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

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

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

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

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

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

@ -12,7 +12,7 @@ mkIf (flags.developpement && flags.graphical) {
  # Paquets
  environment.systemPackages = with pkgs; [
    # Base de données
-    pgadmin             # interface d'administration de postgres
+    #pgadmin             # interface d'administration de postgres ***plus à jour, version openssl dépréciée***
    #sqlitebrowser       # interface d'administration de sqlite

    # Documentation
@ -21,7 +21,6 @@ mkIf (flags.developpement && flags.graphical) {
    # Gestion des sources
    #gitg               # interface pour utiliser git (historique, commit)
    gitstats            # génère un site web statique avec des statistiques
-    gitAndTools.gitFull # pour gitk
    git-cola            # interface pour utiliser git (historique, commit)

    ## Visualisation & outils de diff
--- a/applications/graphical/edition-musique.nix
+++ b/applications/graphical/edition-musique.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

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

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

--- a/applications/graphical/network.nix
+++ b/applications/graphical/network.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

@ -12,15 +12,16 @@ mkIf (flags.radio && flags.graphical) {
  # Paquets
  environment.systemPackages = with pkgs; [
    ## GUI
+    chirp                   # Configuration de radios portatives
    gqrx                    # GUI
-    gnuradio                # Software Defined Radio (SDR) software
+    cubicsdr                # Another GUI
    gnuradio-with-packages  # Software Defined Radio (SDR) software

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

-    inspectrum    # Tool for analysing captured signals from sdr receivers
-    kalibrate-rtl # Calculate local oscillator frequency offset in RTL-SDR devices
+  nixpkgs.config.permittedInsecurePackages = [
+    "python2.7-Pillow-6.2.2"
  ];
 }
--- a/applications/graphical/securite.nix
+++ b/applications/graphical/securite.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

--- a/applications/overrides.nix
+++ b/applications/overrides.nix
@ -3,17 +3,17 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

 mkIf true {

  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é
+      #enablePluginFancy = false; # nécessite wekitgtk qui est troué # Option supprimée dans NixOS 20.03
      enablePluginPdf = true;
      enablePluginRavatar = true;
      enablePluginSmime = true;
--- a/applications/terminal/adminsys.nix
+++ b/applications/terminal/adminsys.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

@ -23,7 +23,7 @@ mkIf true {
    powerline-fonts
    powertop
    #ansible
-    python36Packages.glances
+    glances
    pv            # afficher le débit d'un flux     dd if=/dev/zero | pv | dd of=/dev/null
    sysstat       # pour la commande "iostat -x -1" de monitoring d'activité disque
    usbutils
@ -44,7 +44,7 @@ mkIf true {
    ntfs3g        # ntfs
    samba         # partages windows
    squashfsTools # squashfs
-    sshfsFuse     # ssh
+    sshfs-fuse    # ssh

    ## Gestion de FS
    nfs-utils
@ -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
  ];
 }
--- a/applications/terminal/bureau.nix
+++ b/applications/terminal/bureau.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

@ -13,7 +13,7 @@ mkIf flags.officeSuite {
  environment.systemPackages = with pkgs; [
    # Bureautique
    aspell aspellDicts.fr         # correction d'ortographe
-    python36Packages.grammalecte  # correction gramatical
+    python39Packages.grammalecte  # correction gramatical

    # Gestion de tâche
    taskwarrior     # gestionnaire de tâches en console
@ -24,7 +24,7 @@ mkIf flags.officeSuite {
    #jekyll       # générateur statique de site web
    #odpdown      # conversion md -> presentation ODP : https://github.com/thorstenb/odpdown
    pandoc
-    haskellPackages.pandoc-citeproc
+    #haskellPackages.pandoc-citeproc # ***BROKEN***
    texlive.combined.scheme-full # distribution LaTeX
    #texLive       # distribution LaTeX de base
    #texLiveBeamer # paquets et extensions pour Beamer
--- a/applications/terminal/cao.nix
+++ b/applications/terminal/cao.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

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

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

    ## Mail & Discussion (texte, audio)
--- a/applications/terminal/default-applications.nix
+++ b/applications/terminal/default-applications.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

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

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

@ -12,7 +12,6 @@ mkIf flags.developpement-java {
  # Installe le paquet + JAVA_HOME
  programs.java = {
    enable = true;
-    package = pkgs.jdk11;
  };

  # Paquets
--- a/applications/terminal/developpement-jetbrains.nix
+++ b/applications/terminal/developpement-jetbrains.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

@ -25,7 +25,6 @@ mkIf flags.developpement {

    # Gestion des sources
    cloc                   # outil pour compter les lignes de code source
-    git gitAndTools.gitSVN # git et git-svn
    mercurial
    subversion

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

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

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

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

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

--- a/applications/terminal/network.nix
+++ b/applications/terminal/network.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

@ -22,10 +22,8 @@ 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
-  boot.blacklistedKernelModules = [
-    "dvb_usb_rtl28xxu"
-  ];
+  hardware.rtl-sdr.enable = true;
 }
--- a/applications/terminal/securite.nix
+++ b/applications/terminal/securite.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

--- a/applications/terminal/vim.nix
+++ b/applications/terminal/vim.nix
@ -1,20 +1,28 @@
-with import <nixpkgs> {};
+{pkgs, ... }:

-vim_configurable.customize {
+let
+  myVim = pkgs.vim_configurable.customize {
    # Specifies the vim binary name.
    # E.g. set this to "my-vim" and you need to type "my-vim" to open this vim
    # This allows to have multiple vim packages installed (e.g. with a different set of plugins)
    name = "vim";
    vimrcConfig.customRC = builtins.readFile ./vimrc;
-  vimrcConfig.vam.knownPlugins = pkgs.vimPlugins;
-  vimrcConfig.vam.pluginDictionaries = [
-    { names = [
-      # Here you can place all your vim plugins
-      # They are installed managed by `vam` (a vim plugin manager)
-      #"vim-addon-nix"
-      "elm-vim"
-      "vim-nix"
-      "wombat256-vim"
-    ]; }
+    vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
+      start = [
+        wombat256-vim
      ];
+      opt = [
+        elm-vim
+        vim-fish
+        vim-nix
+        vimwiki
+      ];
+    };
+  };
+
+in {
+  programs.vim = {
+    defaultEditor = true;
+    package = myVim;
+  };
 }
--- a/applications/terminal/vimrc
+++ b/applications/terminal/vimrc
@ -2,6 +2,9 @@
 " This must be first, because it changes other options as a side effect.
 set nocompatible

+filetype plugin on
+syntax on
+
 " allow backspacing over everything in insert mode
 set backspace=indent,eol,start

@ -32,3 +35,10 @@ if &t_Co > 8
    let &colorcolumn="80,".join(range(120,999),",")
    highlight ColorColumn ctermbg=235 guibg=#2c2d27
 endif
+
+" vim hardcodes background color erase even if the terminfo file does
+" not contain bce (not to mention that libvte based terminals
+" incorrectly contain bce in their terminfo files). This causes
+" incorrect background rendering when using a color theme with a
+" background color.
+let &t_ut=''
--- a/config-generator.nix
+++ b/config-generator.nix
@ -5,9 +5,9 @@ let
  cfg = config.r6d.config-generator;
  pfl = config.r6d.profiles;
  comp = config.r6d.computers;
-  host = config.networking.hostName;
+  host = config.networking.fqdn;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

@ -43,7 +43,8 @@ in
    #tincAddress = "192.168.12.8/24";

    (mkIf comp.isNomade{
-      networking.hostName = "nomade.dubronetwork.fr"; # Define your hostname.
+      networking.hostName = "nomade"; # Define your hostname.
+      networking.domain = "dubronetwork.fr";
      r6d.profiles.isDubronetwork = true;

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

--- a/configuration/bash-prompt.sh
+++ b/configuration/bash-prompt.sh
@ -1,4 +1,7 @@
-# Définition des couleurs du prompt
+# Git information in prompt
+. /run/current-system/sw/share/bash-completion/completions/git-prompt.sh
+
+# Prompt colors
 if [[ $(tput colors) -ge 256 ]] 2>/dev/null; then
    PS1_USER='\[$(tput setaf 27)\]'
    PS1_HOST='\[$(tput setaf 37)\]'
@ -18,10 +21,12 @@ fi
 BOLD='\[$(tput bold)\]'
 RESET='\[$(tput sgr0)\]'

-# Définition du prompt
+# Username or red color if root
 if [ $UID = 0 ]; then
    PS1_ID=$PS1_ROOT
 else
    PS1_ID=$PS1_USER'\u'$PS1_MISC@$PS1_HOST
 fi
+
+# Prompt definition
 PS1=$RESET$BOLD$PS1_ID'\h '$PS1_PATH'\w'$PS1_GIT'$(__git_ps1)'"\n"$PS1_MISC'\$ '$RESET
--- 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

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

 {
-  # Nombre de process d'installation en parrallèle effectués par Nix
-  nix.buildCores = 0;
-
  # The NixOS release to be compatible with for stateful data such as databases.
-  system.stateVersion = "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;
@ -46,7 +43,6 @@ in
      vi = "vim";
      byobu-adminsys = "/etc/nixos/base/byobu-adminsys";
    };
-    etc.gitconfig.text = builtins.readFile ./gitconfig;
  };
  programs.bash = {
    enableCompletion = true;
--- a/configuration/gitconfig
+++ b/configuration/gitconfig
@ -1,27 +0,0 @@
-# http://www.git-attitude.fr/2014/09/15/30-options-git-qui-gagnent-a-etre-connues/
-[color]
-    diff = auto
-    branch = auto
-    interactive = auto
-    pager = true
-    showbranch = auto
-    status = auto
-[alias]
-    a  = add -p
-    br = for-each-ref --sort=committerdate refs/heads/ --format='%(committerdate:short)\t%(authorname)\t%(refname:short)'
-    ci = commit
-    co = checkout
-    ff = pull --ff-only
-    oops = commit --amend --no-edit
-    # Show files ignored by git
-    ignored = ls-files -o -i --exclude-standard
-    ls = ls-files
-    st = status
-    # Logs
-    lol = log --graph --decorate --pretty=oneline --abbrev-commit
-    lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
-    not-pushed = log --branches --not --remotes
-[push]
-    default = simple
-[core]
-    editor = /usr/bin/env vim
--- 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

@ -33,6 +33,7 @@ mkIf flags.laptop {
  ];

  # Services
+  services.blueman.enable = true;
  services.xserver.libinput = {
    enable = true;
  };
--- a/configuration/localisation.nix
+++ b/configuration/localisation.nix
@ -3,16 +3,18 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

 mkIf true {

  # Select internationalisation properties.
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "fr";
+  };
  i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "fr";
    defaultLocale = "fr_FR.UTF-8";
  };

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

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

@ -13,7 +13,7 @@ mkIf true {
  #      Il s'avère que hostname vérifie la validité du FQDN et du reverse.
  #      Fixer ces paramètres dans les hosts permet de faire tomber en marche
  networking.extraHosts = ''
-    127.0.0.1   ${config.networking.hostName}
+    127.0.0.1   ${config.networking.fqdn} ${config.networking.hostName}
  '';

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

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

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

--- a/iso-image/configuration.nix
+++ b/iso-image/configuration.nix
@ -19,5 +19,6 @@
    }
  ];
  environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";};
-  networking.hostName = "nixos-livecd.corp.capgemini.com";
+  networking.hostName = "nixos-livecd";
+  networking.domain = "grudu.net";
 }
--- a/module-template.nix
+++ b/module-template.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

--- 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.";
@ -63,7 +64,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 +81,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 +107,7 @@ let
              ConnecTo = bar
          '';
          description = "Configuration supplémentaire pour tinc.";
-          type = lib.types.string;
+          type = lib.types.str;
        };
      };

@ -129,7 +130,7 @@ let
        enable = mkEnableOption "Activation du démarrage de Windows par Grub";
        drive = mkOption {
          description = "Lecteur sur lequel est présent le système Windows (au format GRUB)";
-          type = lib.types.string;
+          type = lib.types.str;
          default = "hd0,1";
        };
      };
@ -137,7 +138,7 @@ let
        enable = mkEnableOption "Montage de la partition data Windows";
        device = mkOption {
          description = "Lecteur sur lequel est présent le disque de data Windows";
-          type = lib.types.string;
+          type = lib.types.str;
          default = "/dev/sda2";
        };
      };
@ -160,7 +161,7 @@ let
  };

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

--- a/public/config-awesome-4-rc.lua
+++ b/public/config-awesome-4-rc.lua
@ -413,7 +413,8 @@ globalkeys = awful.util.table.join(
    awful.key({ modkey, "Shift"   }, "F1",  function () awful.util.spawn("claws-mail") end,           {description = "Lance claws", group = "Lanceurs personnels"}),
    awful.key({ modkey, "Shift"   }, "F3",  function () awful.util.spawn("pcmanfm") end,              {description = "Lance pcmanfm", group = "Lanceurs personnels"}),
    awful.key({ modkey, "Shift"   }, "F6",  function () awful.util.spawn("clementine") end,           {description = "Lance clementine", group = "Lanceurs personnels"}),
-    awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("xrandr-auto-2") end,        {description = "Lance le script xrandr-auto-2", group = "Lanceurs personnels"})
+    awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("xrandr-auto-2") end,        {description = "Lance le script xrandr-auto-2", group = "Lanceurs personnels"}),
+    awful.key({ modkey  }, "l", function () awful.util.spawn("slock systemctl suspend -i") end, {description = "Verouille la session avec slock", group = "Lanceurs personnels"})
    --  awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-left") end),
    --  awful.key({ modkey, "Control" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-right") end),
 )
--- a/services/dbus.nix
+++ b/services/dbus.nix
@ -1,13 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf mkMerge mkThenElse;
-  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
-  flags = currentMachine.configurationFlags;
-in
-
-mkIf true {
-  # Lancement de dbus pour les utilisateurs
-  services.dbus.socketActivated = true;
-}
--- a/services/default.nix
+++ b/services/default.nix
@ -3,14 +3,13 @@
 let
  #inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

 {
  imports = [
    # installées systématiquement
-    ./dbus.nix
    ./gpm.nix
    ./haveged.nix
    ./monitoring-munin.nix
@ -34,6 +33,7 @@ in

    ## if isDesktop
    ./pulseaudio.nix        # activation du serveur audio
+    ./pipewire.nix        # activation du serveur audio
    ./scanner.nix           # utilisation d'un scanner
    ./x11.nix               # activation du serveur graphique X
  ];
--- 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

@ -14,6 +14,7 @@ mkIf flags.docker {
    # Ecosystème Docker
    docker
    docker-compose
+    lazydocker
  ];

  virtualisation.docker.enable = true;
--- a/services/elasticsearch.nix
+++ b/services/elasticsearch.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

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

--- a/services/hydra-build.nix
+++ b/services/hydra-build.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in
 # TODO: ménage
--- a/services/hydra-core.nix
+++ b/services/hydra-core.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;


@ -54,8 +54,8 @@ mkIf flags.hydra-core {

  services.hydra = {
    enable = true;
-    hydraURL = "http://hydra.${config.networking.hostName}";
-    notificationSender = "hydra@${config.networking.hostName}";
+    hydraURL = "http://hydra.${config.networking.fqdn}";
+    notificationSender = "hydra@${config.networking.fqdn}";
    listenHost = "localhost";
    minimumDiskFree = 50; # Go
    smtpHost = "localhost";
--- a/services/kibana.nix
+++ b/services/kibana.nix
@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

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

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

 mkIf flags.print {

+  environment.systemPackages = with pkgs; [
+    samba
+    python310Packages.pysmbc
+  ];
+  services.samba.enable = true;
  # Services
  ## Enable CUPS to print documents.
  services.printing = {
    enable = true;
    drivers = [
      pkgs.samsung-unified-linux-driver
+      pkgs.fxlinuxprint
+      pkgs.gutenprint
    ];
    # Suppression automatique des fichiers temporaires.
    # Par défaut, cups conserve une copie de ce qui a été imprimé
@ -24,4 +31,6 @@ mkIf flags.print {
      PreserveJobFiles No
    '';
  };
+  services.avahi.enable = true;
+  services.avahi.nssmdns = true;
 }
--- 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

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

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

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

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

--- a/services/xmonad/xmonad.nix
+++ b/services/xmonad/xmonad.nix
@ -3,26 +3,18 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

 mkIf flags.xmonad {
-
-  # Paquets
-  environment.systemPackages = with pkgs; [
-    dmenu
-    haskellPackages.xmobar
-    trayer
-  ];
+  services.dbus.packages = with pkgs; [ dconf ];
+  programs.dconf.enable = true;

  # Services
  services.xserver.windowManager.xmonad = {
    enable = true;
    enableContribAndExtras = true;
-    extraPackages = haskellPackages: [
-      haskellPackages.xmobar
-    ];
  };
  environment.variables = {
    _JAVA_AWT_WM_NONREPARENTING = "1";
--- 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
Author	SHA1	Message	Date
Yves Dubromelle	fe50587190	Merge nixos-21.05-preparation fixes #9	3 years ago
Yves Dubromelle	c1b40f9d07	nouveau site pour vérifier le status de NixOS	3 years ago
Yves Dubromelle	06d73c9519	lancement auto des plugins vim selon le type de fichier	3 years ago
Yves Dubromelle	f7264ae434	vim: nouvelle façon d'appeler les plugins, reorga du code	3 years ago
Yves Dubromelle	4fd9d0d7f8	config git au format Nix	3 years ago
Yves Dubromelle	963b0b9d4b	configuration gnome active pour xmonad	3 years ago
Yves Dubromelle	51b98cda4f	nettoyage paquets xmonad inutiles	3 years ago
Yves Dubromelle	f751e24839	outil pour générer une dérivation Nix dans un projet Rust	3 years ago
Yves Dubromelle	1b1aebd0a0	ajout du plugin vim-wiki	3 years ago
Yves Dubromelle	812bc511e0	impression vers des imprimantes Samba	3 years ago
Yves Dubromelle	e55568d1c6	rdfind cassé dans les paquets	3 years ago
Yves Dubromelle	d4f2298518	fix: mauvaise couleur de fond dans vim dans certains cas	3 years ago
Yves Dubromelle	2fad38532f	nouvelle syntaxe pour l'optimisation du store	3 years ago
Yves Dubromelle	28cf2d2071	lot de renommages dans nixpkgs	3 years ago
Yves Dubromelle	f6f3befe2f	activation des sous-commandes nix et des flakes	3 years ago
Yves Dubromelle	257f59054d	renommage d'options Nix	3 years ago
Yves Dubromelle	518054fd0a	gestionnaire graphique bluetooth	3 years ago
Yves Dubromelle	03bcc056c1	ajout d'un module pipewire en prévision de remplacement de pulseaudio	3 years ago
Yves Dubromelle	7679f865b0	lazydocker pour controller les imgaes et containers dans le terminal	3 years ago
Yves Dubromelle	2d63aae5a1	syntaxe fish pour vim	3 years ago
Yves Dubromelle	48a257405a	préconisations des devs d'OpenJDK : utilisons la dernière version disponible	3 years ago
Yves Dubromelle	30e2f31255	ajout de kitty : terminal virtuel rendu par GPU	3 years ago
Yves Dubromelle	0364ea9b29	ajout de lazygit ; interface terminal sympa pour git	3 years ago
Yves Dubromelle	b2505f45c4	prise en compte globale de fish	3 years ago
Yves Dubromelle	962c052b29	seule la maj auto a besoin d'être conditionnelle; nom de fichier	4 years ago
Yves Dubromelle	032d7e8e1a	auto-optimisation du store, options du ramasse-miettes	4 years ago
Yves Dubromelle	af35de1639	jetbrains mono en police mono par défaut (pour uniformiser avec Intellij)	4 years ago
Yves Dubromelle	c8ae50be5b	ajout de rustup pour faciliter l'installation de toolchain rust	4 years ago
Yves Dubromelle	9310d01af6	option dédiée au matériel rtl-sdr	4 years ago
Yves Dubromelle	ea33bac49b	options dédiées pour slock, spacefm et udevil	4 years ago
Yves Dubromelle	204fb83207	git a son option dédiée	4 years ago
Yves Dubromelle	cf3c3c3603	fix: infos git dans le prompt	4 years ago
Yves Dubromelle	edad20c5c0	prompt: commentaires	4 years ago
Yves Dubromelle	ed937ba5bc	activation par défaut de l'agent gnupg	4 years ago
Yves Dubromelle	3de6332c3e	pgadmin commenté, plus mis à jour, tire un openssl déprécié	4 years ago
Yves Dubromelle	e26453fc7e	gnuradio tire un vieux paquet python, Pilllow 6.2.2, marqué insecure	4 years ago
Yves Dubromelle	67b9f5b0f7	dbus est désormais tout le temps actif par défaut	4 years ago
Yves Dubromelle	8f4f8ef953	déplacement d'options et paquets upstream	4 years ago
Yves Dubromelle	c33f0f9c50	mise à jour paquets python en 3.9	4 years ago
Yves Dubromelle	2064606f18	paquets marqués comme cassés dans nixpkgs	4 years ago
Yves Dubromelle	4a5f0ba1a7	utilisation de networking.fqdn (hostName + domain) Les nouvelles règles dans NixOS obligent à avoir dans networking.hostName un label DNS strict, il faut donc préciser le domaine à part dans networking.domain. networking.fqdn est une facilité pour concaténer les deux, en lecture seule.	4 years ago
Yves Dubromelle	9ed945bba8	channel nixos-unstable	4 years ago
Jean-Pierre PRUNARET	65e5776f86	ménage appli pour préparation migration NixOS 20.03	5 years ago
Yves Dubromelle	235e636451	client mumble à nouveau fréquentable (build sans broncher)	5 years ago
Yves Dubromelle	e849c55297	radio: dump1090 écoute ADB-S des avions et placement sur une carte	5 years ago
Yves Dubromelle	1e51d11778	radio: CubicSDR comme alternative à gqrx	5 years ago
Yves Dubromelle	f39f486f51	awesome: meta+l pour slock et suspend combinés	5 years ago
Yves Dubromelle	2a5809c3de	radio: chirp pour programmer les radios portatives	5 years ago
Yves Dubromelle	7681f7774e	nixos: 19.03 -> 19.09	6 years ago
Yves Dubromelle	fe0ea31e30	les variantes de git se catapultent -> git full par défaut	6 years ago
Jean-Pierre PRUNARET	f7de6a69bd	oops	6 years ago
Jean-Pierre PRUNARET	9151b4dfc5	radio : ménage dans les paquets	6 years ago