activation par défaut de l'agent gnupg

pgadmin commenté, plus mis à jour, tire un openssl déprécié
gnuradio tire un vieux paquet python, Pilllow 6.2.2, marqué insecure
2021-05-18 09:55:00 +02:00 · 2021-05-09 18:58:30 +02:00 · 2021-05-08 00:16:32 +02:00 · 2021-05-07 23:49:44 +02:00 · 2021-05-07 22:28:44 +02:00 · 2021-05-07 07:15:30 +02:00
84 changed files with 119 additions and 119 deletions
--- a/4
+++ b/4
@@ -35,7 +35,7 @@ optimise:
 	$(TIME) nix optimise-store

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

 rebuild-switch:
@@ -58,7 +58,7 @@ store-repair:
 	$(TIME) nix-store --verify --check-contents --repair

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

 ##--------- Commandes spécifiques pour NixOS -- Opérations non courantes
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ Ce dépôt stocke une configuration générique des machines.
 * mettre à jour les dépôts avec les dernières versions, `make submodules-update`
 * vérifier que `configuration.nix` contient `services.xserver.enable = true;` pour les machines avec interface graphique
 * vérifier que `configuration.nix` contient le nom de la machine `networking.hostName = "<X>";`
+* vérifier que `configuration.nix` contient le nom de domaine `networking.domain = "<X>";`
 * tester la configuration : `nixos-rebuild build`
 * corriger et ajouter les éléments manquant (notamment dans `private/annuaire.nix` )
 * lorsque tout semble bon, vérifier :
--- a/applications/graphical/adminsys.nix
+++ b/applications/graphical/adminsys.nix
@@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

@@ -21,7 +21,7 @@ environment.systemPackages = with pkgs; [
    clawsMail
    hexchat
    quasselClient
-    #mumble
+    mumble
    pidgin
    thunderbird

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

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

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

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

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

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

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

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

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

@@ -23,7 +23,7 @@ mkIf true {
    powerline-fonts
    powertop
    #ansible
-    python36Packages.glances
+    glances
    pv            # afficher le débit d'un flux     dd if=/dev/zero | pv | dd of=/dev/null
    sysstat       # pour la commande "iostat -x -1" de monitoring d'activité disque
    usbutils
--- a/applications/terminal/bureau.nix
+++ b/applications/terminal/bureau.nix
@@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

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

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

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

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

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

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

@@ -33,4 +33,5 @@ mkIf true {
      wget          # client HTTP console
      which         # pour connaitre le chemin d'un exécutable
  ];
+  programs.gnupg.agent.enable = true;
 }
--- a/applications/terminal/default.nix
+++ b/applications/terminal/default.nix
@@ -3,7 +3,7 @@
 let
  #inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

--- a/config-generator.nix
+++ b/config-generator.nix
@@ -5,9 +5,9 @@ let
  cfg = config.r6d.config-generator;
  pfl = config.r6d.profiles;
  comp = config.r6d.computers;
-  host = config.networking.hostName;
+  host = config.networking.fqdn;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

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

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

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

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

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

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

 mkIf true {

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

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

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

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

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

--- a/configuration/u2f.nix
+++ b/configuration/u2f.nix
@@ -3,7 +3,7 @@
 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
@@ -160,7 +160,7 @@ let
  };

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

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

 {
  imports = [
    # installées systématiquement
-    ./dbus.nix
    ./gpm.nix
    ./haveged.nix
    ./monitoring-munin.nix
--- a/services/docker.nix
+++ b/services/docker.nix
@@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in

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

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

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

--- a/services/yubikey.nix
+++ b/services/yubikey.nix
@@ -3,7 +3,7 @@
 let
  inherit (lib) mkIf mkMerge mkThenElse;
  annuaire = config.r6d.machines;
-  currentMachine = annuaire."${config.networking.hostName}";
+  currentMachine = annuaire."${config.networking.fqdn}";
  flags = currentMachine.configurationFlags;
 in
Author	SHA1	Message	Date
Yves Dubromelle	ed937ba5bc	activation par défaut de l'agent gnupg	2021-05-18 09:55:00 +02:00
Yves Dubromelle	3de6332c3e	pgadmin commenté, plus mis à jour, tire un openssl déprécié	2021-05-09 18:58:30 +02:00
Yves Dubromelle	e26453fc7e	gnuradio tire un vieux paquet python, Pilllow 6.2.2, marqué insecure	2021-05-08 00:16:32 +02:00
Yves Dubromelle	67b9f5b0f7	dbus est désormais tout le temps actif par défaut	2021-05-07 23:49:44 +02:00
Yves Dubromelle	8f4f8ef953	déplacement d'options et paquets upstream	2021-05-07 22:28:44 +02:00
Yves Dubromelle	c33f0f9c50	mise à jour paquets python en 3.9	2021-05-07 07:15:30 +02:00
Yves Dubromelle	2064606f18	paquets marqués comme cassés dans nixpkgs	2021-05-07 07:14:24 +02:00
Yves Dubromelle	4a5f0ba1a7	utilisation de networking.fqdn (hostName + domain) Les nouvelles règles dans NixOS obligent à avoir dans networking.hostName un label DNS strict, il faut donc préciser le domaine à part dans networking.domain. networking.fqdn est une facilité pour concaténer les deux, en lecture seule.	2021-05-06 23:50:07 +02:00
Yves Dubromelle	9ed945bba8	channel nixos-unstable	2021-05-06 23:23:57 +02:00
Jean-Pierre PRUNARET	65e5776f86	ménage appli pour préparation migration NixOS 20.03	2020-06-30 18:58:17 +02:00
Yves Dubromelle	235e636451	client mumble à nouveau fréquentable (build sans broncher)	2020-04-16 01:19:06 +02:00
Yves Dubromelle	e849c55297	radio: dump1090 écoute ADB-S des avions et placement sur une carte	2020-04-16 01:19:06 +02:00
Yves Dubromelle	1e51d11778	radio: CubicSDR comme alternative à gqrx	2020-04-16 01:19:06 +02:00
Yves Dubromelle	f39f486f51	awesome: meta+l pour slock et suspend combinés	2020-04-16 01:19:06 +02:00
Yves Dubromelle	2a5809c3de	radio: chirp pour programmer les radios portatives	2020-04-16 01:19:06 +02:00