munin: augmentation du lelais de timeout pour le démarrage du daemon

monstre est un serveur nix
nix-serve est disponible uniquement par tinc
2017-01-22 19:07:16 +01:00 · 2017-01-22 00:00:38 +01:00 · 2017-01-21 23:57:51 +01:00 · 2017-01-21 16:35:22 +01:00 · 2017-01-21 16:16:21 +01:00 · 2017-01-21 16:14:35 +01:00
60 changed files with 2089 additions and 278 deletions
--- a/56
+++ b/56
@@ -1,5 +1,8 @@
+GSF=git submodule foreach
+
 all: rebuild-switch
 	date
+##--------- Commandes spécifiques pour NixOS

 clean:
 	nix-collect-garbage -d --delete-older-than 15d
@@ -14,35 +17,66 @@ clean-log:
 	journalctl --vacuum-size=1G

 full-auto: submodules-update upgrade clean optimise
+	@date

 optimise:
 	nix-store --optimise

-push: submodules-push
-	git push --all
-	git push --tags
-
 rebuild-switch:
 	nixos-rebuild switch --fallback  --show-trace

 store-repair:
 	nix-store --verify --check-contents --repair

+upgrade:
+	nixos-rebuild switch --upgrade --fallback --show-trace
+
+##--------- Commandes spécifiques pour NixOS -- Opérations non courantes
+
+download-sources:
+	# https://nixos.org/wiki/Download_all_sources
+	nix-store -r $$(grep -l outputHash $$(nix-store -qR $$(nix-instantiate '<nixpkgs>' -A geeqie) | grep '.drv$$'))
+
+##--------- Commandes spécifiques pour GIT
+
+push: submodules-push
+	git push --all
+	git push --tags
+
 submodules-update:
 	#git submodule update --remote
-	git submodule foreach git co master
-	git submodule foreach git ff
+	$(GSF) git co master
+	$(GSF) git ff
+	$(GSF) git gc --auto

 submodules-push:
-	git submodule foreach git push --all
-	git submodule foreach git push --tags
+	$(GSF) git push --all
+	$(GSF) git push --tags

 submodules-tag:
-	git submodule foreach git tag -f "$$(date +%F)-$$(hostname -s)"
+	$(GSF) git tag -f "$$(date +%F)-$$(hostname -s)"
+
+template:
+	find . -name "*.nix" -exec meld /etc/nixos/base/module-template.nix {} \;

 tag: submodules-tag
 	git tag -f "$$(date +%F)-$$(hostname -s)"

-upgrade:
-	nixos-rebuild switch --upgrade --fallback --show-trace
+##--------- Munin
+
+munin:
+	pushd /var/www/munin/ ; python -m SimpleHTTPServer 8000
+##--------- Gestion d'un système de fichier monté en mémoire
+
+tmpfs-create:
+	mkdir -p /mnt/tmpfs
+
+tmpfs-mount: tmpfs-create
+	mount -t tmpfs -o size=10G tmpfs /mnt/tmpfs
+
+tmpfs-umount:
+	umount /mnt/tmpfs
+
+tmpfs-destroy: tmpfs-umount
+	rmdir /mnt/tmpfs

--- a/11
+++ b/11
@@ -1,11 +0,0 @@
-# nixos-template-base
-
-Ce dépôt stocke une configuration générique des machines.
-Une recette dite "config-generator" adapte la configuration selon le nom de la machine (FQDN).
-
-Actuellement, les scripts contiennent un peu de configuration spécifique pour les machines des mainteneurs.
-
-# Lien pour install sur machine distante
-
-* https://nixos.org/wiki/How_to_install_NixOS_from_Linux#Installing_through_a_chroot
-* https://github.com/NixOS/nixpkgs/issues/13305
--- a/README.md
+++ b/README.md
@@ -0,0 +1,43 @@
+# nixos-template-base
+
+Version de nixos supportée : NixOs 16.09
+
+Ce dépôt stocke une configuration générique des machines.
+Une recette dite "config-generator" adapte la configuration selon le nom de la machine (FQDN).
+
+Actuellement, les scripts contiennent un peu de configuration spécifique pour les machines des mainteneurs.
+
+# Lien pour install sur machine distante
+
+* https://nixos.org/wiki/How_to_install_NixOS_from_Linux#Installing_through_a_chroot
+* https://github.com/NixOS/nixpkgs/issues/13305
+
+# Notes pour l'upgrade de 16.03 vers 16.09
+
+* mettre le dépôt base sur la branche upgrade-16.09
+* changer le channel nixos : ```nix-channel --add https://nixos.org/channels/nixos-16.09 nixos```
+* activer x11 dans le configuration.nix
+
+~~~
+services.xserver.enable = true;
+~~~
+
+* remplacer le bootloader si gummiboot était utilisé
+
+~~~
+boot.loader.gummiboot.enable = true;
+~~~
+
+devient
+
+~~~
+boot.loader.systemd-boot.enable = true;
+~~~
+
+Pour résoudre les soucis d'upgrade, il est conseillé :
+* de désactiver tous les imports (sauf `hardware.nix`)
+* d'ajouter `.../localisation.nix` dans les imports sous peine d'être en clavier US
+* d'ajouter ```nixpkgs.config.allowUnfree = true;```
+* d'ajouter `vim` aux paquets
+* de réactiver petit à petit les lignes désactivées
+
--- a/base.nix
+++ b/base.nix
@@ -1,4 +1,11 @@
-{ ... }:
+{ config, lib, pkgs, ... }:
+
+let
+  #inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in

 {
  imports = [
--- a/base/activation-manuelle/nix-serve-client.nix
+++ b/base/activation-manuelle/nix-serve-client.nix
@@ -1,21 +1,22 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf mkMerge;
-  profiles = config.r6d.profiles;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
 in

 mkIf cfg.nix-serve-client {
+
  nix = {
    # Cache http pour le store
    requireSignedBinaryCaches = false;
    binaryCaches =  [
-      "https://cache.nixos.org/"
+      (mkIf (profiles.isDubronetwork && (! computers.isPedro) && (! computers.isRollo)) "http://nix-cache.dubronetwork.fr:5001")

-      (mkIf (profiles.isDubronetwork && (! computers.isRollo)) "http://nix-cache.dubronetwork.fr:5001")
-      (mkIf (profiles.isPrunetwork && !profiles.isServer) "http://192.168.1.20:5000")
+      (mkIf profiles.isPrunetwork "https://cache.nixos.org/")
+      (mkIf (profiles.isPrunetwork && !profiles.isServer) "http://nix-cache.dubronetwork.fr:5001")
    ];
    extraOptions = ''
    connect-timeout = 5
--- a/base/activation-manuelle/nix-serve-server.nix
+++ b/base/activation-manuelle/nix-serve-server.nix
@@ -1,12 +1,31 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
+{ config, lib, pkgs, ... }:

 let
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
-in {
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.nix-serve-server {
+
  # Cache http pour le store

-  services.nix-serve.enable = cfg.nix-serve-server;
-  networking.firewall.allowedTCPPorts = mkIf cfg.nix-serve-server [ 5000 ];
+  # Services
+  services.nix-serve = {
+    enable = true;
+  };
+
+  # Réseau
+  networking.firewall = {
+    allowedTCPPorts = [
+      #5000 # ouvert sur tinc
+    ];
+    allowedUDPPorts = [
+    ];
+    extraCommands = ''
+      iptables  -A INPUT -i tinc.grudunet -p tcp --dport 5000 -j ACCEPT
+      ip6tables -A INPUT -i tinc.grudunet -p tcp --dport 5000 -j ACCEPT
+    '';
+  };
 }
--- a/base/activation-manuelle/service-fail2ban.nix
+++ b/base/activation-manuelle/service-fail2ban.nix
@@ -1,17 +1,28 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
+{ config, lib, pkgs, ... }:

 let
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;

  ignoreip = "pedro.dubronetwork.fr cube.dubronetwork.fr voyage.prunetwork.fr xray.prunetwork.fr 192.168.0.0/16 172.16.0.0/16";
  destemail = "admins@dubronetwork.fr";
+in
+
+mkIf cfg.fail2ban {

-in {
  # Gestion de fail2ban
-  
-  services = mkIf cfg.fail2ban {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    mailutils
+    whois
+  ];
+
+
+  # Services
+  services = {
    fail2ban = {
      enable = true;
      jails = {
@@ -27,13 +38,27 @@ in {
          maxretry = 3

          destemail = ${destemail}
+
+          # https://github.com/Baughn/nixpkgs/blob/master/nixos/modules/services/security/fail2ban.nix
+          findtime = 600
+          maxretry = 3
+          backend  = systemd
+          enabled  = true
        '';
        ssh-route = ''
          filter   = sshd
          action   = route[blocktype=blackhole]
-          maxretry = 3
        '';
+        # désactivation car souci de PATH avec les commandes mail ou sendmail. Nécessite un path motifiable
+        # ticket à ouvrir
+        #ssh-mail = ''
+        #  filter   = sshd
+        #  action   = sendmail[sendername=Fail2ban @${config.networking.hostName}]
+        #'';
      };
    };
  };
+
+  # https://github.com/NixOS/nixpkgs/issues/8437
+  services.fail2ban.jails.ssh-iptables = "enabled = true";
 }
--- a/base/activation-manuelle/users.nix
+++ b/base/activation-manuelle/users.nix
--- a/base/base.nix
+++ b/base/base.nix
@@ -1,4 +1,11 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
+
+let
+  #inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in

 {
  imports = [
--- a/base/network-dns.nix
+++ b/base/network-dns.nix
@@ -1,6 +1,14 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf true {

-{
  # Définition des domaines utilisés lorsque un identifiant non-FQDN est donné (ping, nslookup)
  networking = {
    search = [
--- a/config-generator.nix
+++ b/config-generator.nix
@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:

-# exemple utilisé pour commencer bird.nix
 let
  inherit (lib) mkEnableOption mkIf mkMerge mkOption singleton types;
  cfg = config.r6d.config-generator;
@@ -17,60 +16,84 @@ in
      #* Utilisé pour afecter des capacités aux machines
      r6d.profiles  = {
        # Domaine
-        isDubronetwork  = mkEnableOption "Pour distinguer les machines dubronetwork.";
-        isPrunetwork    = mkEnableOption "Pour distinguer les machines prunetwork.";
+        isDubronetwork        = mkEnableOption "Pour distinguer les machines dubronetwork.";
+        isPrunetwork          = mkEnableOption "Pour distinguer les machines prunetwork.";
        # Utilisation machine
-        isDesktop       = mkEnableOption "Pour indiquer une machine avec interface graphique.";
-        isHome          = mkEnableOption "Pour indiquer que la machine sert à la maison (divertissement & autre).";
-        isServer        = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur.";
-        isWorkstation   = mkEnableOption "Pour indiquer que la machine sert à travailler.";
+        isDesktop             = mkEnableOption "Pour indiquer une machine avec interface graphique.";
+        isHome                = mkEnableOption "Pour indiquer que la machine sert à la maison (divertissement & autre).";
+        isServer              = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur.";
+        isWorkstation         = mkEnableOption "Pour indiquer que la machine sert à travailler.";
      };

      #* Utilisé dans les fichiers .nix
      r6d.config-generator = {
-        enable          = mkEnableOption "Génération de la configuration d'une machine.";
-        awesome         = mkEnableOption "Profil pour activer le gestionnaire de fenêtre awesome.";
-        auto-upgrade    = mkEnableOption "Profil pour activer les mises à jour automatiques.";
-        cartographie    = mkEnableOption "Profil pour activer les outils de gestion de données géographiques.";
-        conception-assistee = mkEnableOption "Profil pour activer les outils de conception électronique & modélisation 3D";
-        database_postgres=mkEnableOption "Profil pour activer le SGBD PostgreSQL.";
-        developpement   = mkEnableOption "Profil pour activer les outils de développement";
-        docker          = mkEnableOption "Profil pour l'utilisation de Docker.";
-        dovecot         = mkEnableOption "Profil pour activer le serveur Dovecot.";
-        dns_autorite    = mkEnableOption "Profil pour servir les fichiers de zone DNS.";
-        dns_resolveur   = mkEnableOption "Profil pour activer un résolveur DNS local.";
-        edition-musique = mkEnableOption "Profil pour la création/édition de musique.";
-        edition-photo   = mkEnableOption "Profil pour la création/édition de photos.";
-        edition-video   = mkEnableOption "Profil pour la création/édition de video.";
-        fail2ban        = mkEnableOption "Profil pour activer Fail2ban.";
-        jeux            = mkEnableOption "Profil pour les jeux vidéos.";
-        laptop          = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables..";
-        locate          = mkEnableOption "Profil pour activer la fonction locate.";
-        mailboxes       = mkEnableOption "Profil pour stocker les mails dans des boîtes aux lettres.";
-        murmur          = mkEnableOption "Profil pour activer un serveur Mumble (murmur)";
-        nix-serve-client= mkEnableOption "Profil pour que la machine soit un client de cache nix.";
-        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";
-        online-ipv6     = mkEnableOption "Profil pour activer l'IPv6 de online.net";
-        print           = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
-        rabbitmq        = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
-        swap            = mkEnableOption "Profil pour que le swap soit activé.";
-        virtualbox      = mkEnableOption "Profil pour l'utilisation de VirtualBox.";
-        xmonad          = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad.";
-        znc             = mkEnableOption "Profil pour activer le relais IRC ZNC.";
+        enable                = mkEnableOption "Génération de la configuration d'une machine.";
+        awesome               = mkEnableOption "Profil pour activer le gestionnaire de fenêtre awesome.";
+        auto-upgrade          = mkEnableOption "Profil pour activer les mises à jour automatiques.";
+        cartographie          = mkEnableOption "Profil pour activer les outils de gestion de données géographiques.";
+        conception-assistee   = mkEnableOption "Profil pour activer les outils de conception électronique & modélisation 3D";
+        database_postgres     = mkEnableOption "Profil pour activer le SGBD PostgreSQL.";
+        developpement         = mkEnableOption "Profil pour activer les outils de développement";
+        developpement-haskell = mkEnableOption "Profil pour activer les outils de développement Haskell";
+        developpement-java    = mkEnableOption "Profil pour activer les outils de développement Java";
+        developpement-rust    = mkEnableOption "Profil pour activer les outils de développement Rust";
+        docker                = mkEnableOption "Profil pour l'utilisation de Docker.";
+        dovecot               = mkEnableOption "Profil pour activer le serveur Dovecot.";
+        dns_autorite          = mkEnableOption "Profil pour servir les fichiers de zone DNS.";
+        dns_resolveur         = mkEnableOption "Profil pour activer un résolveur DNS local.";
+        edition-musique       = mkEnableOption "Profil pour la création/édition de musique.";
+        edition-photo         = mkEnableOption "Profil pour la création/édition de photos.";
+        edition-video         = mkEnableOption "Profil pour la création/édition de video.";
+        elasticsearch         = mkEnableOption "Profil pour activer le service elasticsearch.";
+        fail2ban              = mkEnableOption "Profil pour activer Fail2ban.";
+        hydra-builder         = mkEnableOption "Profil pour une machine qui compile pour hydra.";
+        hydra-core            = mkEnableOption "Profil pour un serveur hydra.";
+        kibana                = mkEnableOption "Profil pour activer le service kibana.";
+        jetbrains-licensed    = mkEnableOption "Profil pour la suite de développement Jetbrains payante (sous-ensemble).";
+        jeux                  = mkEnableOption "Profil pour les jeux vidéos.";
+        laptop                = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables.";
+        locate                = mkEnableOption "Profil pour activer la fonction locate.";
+        mailboxes             = mkEnableOption "Profil pour stocker les mails dans des boîtes aux lettres.";
+        murmur                = mkEnableOption "Profil pour activer un serveur Mumble (murmur)";
+        nix-serve-client      = mkEnableOption "Profil pour que la machine soit un client de cache nix.";
+        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";
+        print                 = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
+        rabbitmq              = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
+        radicale              = mkEnableOption "Profil pour activer le service d'hébergement de calendrier + tâches & contacts.";
+        scanner               = mkEnableOption "Profil pour que les scanners soient utilisable.";
+        swap                  = mkEnableOption "Profil pour que le swap soit activé.";
+        virtualbox            = mkEnableOption "Profil pour l'utilisation de VirtualBox.";
+        xmonad                = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad.";
+        znc                   = mkEnableOption "Profil pour activer le relais IRC ZNC.";
+
+        tincAddress     = mkOption {
+          default = "";
+          example = "192.168.1.1";
+          description = "Adresse du noeud tinc local";
+          type = lib.types.string;
+        };
+        tincExtraConfig = mkOption {
+          default = "";
+          example = ''
+            Mode = router
+            ConnecTo = bar
+          '';
+          description = "Configuration supplémentaire pour tinc";
+          type = lib.types.string;
+        };
      };
      #* Utilisé pour avoir des raccourcis de machine
      r6d.computers = {
-        isLatitude      = mkEnableOption "Identification du nom de machine.";
-        isMonstre       = mkEnableOption "Identification du nom de machine.";
-        isNeoNomade     = mkEnableOption "Identification du nom de machine.";
-        isNomade        = mkEnableOption "Identification du nom de machine.";
-        isOcean         = mkEnableOption "Identification du nom de machine.";
-        isPedro         = mkEnableOption "Identification du nom de machine.";
-        isPhenom        = mkEnableOption "Identification du nom de machine.";
-        isRadx          = mkEnableOption "Identification du nom de machine.";
-        isRollo         = mkEnableOption "Identification du nom de machine.";
-        isXray          = mkEnableOption "Identification du nom de machine.";
+        isLatitude  = mkEnableOption "Identification du nom de machine.";
+        isMonstre   = mkEnableOption "Identification du nom de machine.";
+        isNeoNomade = mkEnableOption "Identification du nom de machine.";
+        isNomade    = mkEnableOption "Identification du nom de machine.";
+        isOcean     = mkEnableOption "Identification du nom de machine.";
+        isPedro     = mkEnableOption "Identification du nom de machine.";
+        isPhenom    = mkEnableOption "Identification du nom de machine.";
+        isRadx      = mkEnableOption "Identification du nom de machine.";
+        isRollo     = mkEnableOption "Identification du nom de machine.";
      };
    };

@@ -91,7 +114,6 @@ in
        isPhenom    = host == "phenom.dubronetwork.fr";
        isRadx      = host == "radx.prunetwork.fr";
        isRollo     = host == "rollo.dubronetwork.fr";
-        isXray      = host == "xray.prunetwork.fr";
      };
    }

@@ -101,13 +123,14 @@ in
    (mkIf pfl.isDesktop {
      r6d.config-generator = {
        awesome = true;
-        nix-serve-client = true;
+        #nix-serve-client = true;
+        scanner = true;
      };
    })
    (mkIf pfl.isHome {
      r6d.profiles.isDesktop = true;
    })
-    (mkIf pfl.isServer {
+    (mkIf (pfl.isServer && !comp.isMonstre) {
      r6d.config-generator = {
        #database_postgres = true;
        dns_autorite = true;
@@ -119,7 +142,7 @@ in
      };
    })
    # /!\ PAS un serveur
-    (mkIf (!pfl.isServer) {
+    (mkIf (!pfl.isServer || comp.isMonstre) {
      r6d.config-generator = {
        dns_resolveur = true;
      };
@@ -128,13 +151,7 @@ in
      r6d.profiles.isDesktop = true;

      r6d.config-generator = {
-        cartographie = true;
-        developpement = true;
        docker = true;
-
-        edition-musique = true;
-        edition-photo = true;
-        edition-video = true;
      };
    })

@@ -142,15 +159,22 @@ in
    (mkIf pfl.isDubronetwork {
      r6d.config-generator = {
        auto-upgrade = true;
+        locate = true;
        print = true;
      };
    })
-    (mkIf (pfl.isDubronetwork && pfl.isServer) {
-      r6d.config-generator.nix-serve-server = true;
-    })
    (mkIf (pfl.isDubronetwork && pfl.isWorkstation) {
      r6d.config-generator = {
+        cartographie = true;
        conception-assistee = true;
+        docker = true;
+        developpement = true;
+        developpement-haskell = true;
+        developpement-java = true;
+        developpement-rust = true;
+        edition-musique = true;
+        edition-photo = true;
+        edition-video = true;
        virtualbox = true;
        xmonad = true;
      };
@@ -160,10 +184,26 @@ in
    (mkIf pfl.isPrunetwork {
      r6d.config-generator = {
        auto-upgrade = true;
+        docker = true;
+        locate = true;
        fail2ban = true;
        swap = true;
      };
    })
+    (mkIf (pfl.isPrunetwork && pfl.isWorkstation) {
+      r6d.config-generator = {
+        cartographie = true;
+        developpement = true;
+        developpement-haskell = true;
+        developpement-java = true;
+        #developpement-rust = true;
+        #edition-musique = true;
+        edition-photo = true;
+        #edition-video = true;
+        print = true;
+        virtualbox = true;
+      };
+    })


    ## Affectation des profils aux machines
@@ -175,6 +215,11 @@ in

      r6d.config-generator = {
        docker = true;
+        radicale = true;
+        tincAddress = "192.168.12.6/24";
+        tincExtraConfig = ''
+          ConnectTo = rollo_dubronetwork_fr
+          '';
      };
    })
    (mkIf comp.isRadx {
@@ -185,13 +230,17 @@ in
      };

      r6d.config-generator = {
-        virtualbox = true;
-      };
-    })
-    (mkIf comp.isXray {
-      r6d.profiles = {
-        isPrunetwork = true;
-        isServer = true;
+        elasticsearch = true;
+        hydra-builder = true;
+        hydra-core = true;
+        kibana = true;
+        rabbitmq = true;
+        tincAddress = "192.168.12.3/24";
+        tincExtraConfig = ''
+          ConnectTo = monstre_dubronetwork_fr
+          ConnectTo = rollo_dubronetwork_fr
+          ConnectTo = ocean_prunetwork_fr
+          '';
      };
    })

@@ -203,7 +252,14 @@ in
      };

      r6d.config-generator = {
+        jetbrains-licensed = true;
        laptop = true;
+        tincAddress = "192.168.12.2/24";
+        tincExtraConfig = ''
+          ConnectTo = monstre_dubronetwork_fr
+          ConnectTo = rollo_dubronetwork_fr
+          ConnectTo = ocean_prunetwork_fr
+          '';
      };
    })
    (mkIf comp.isMonstre {
@@ -214,8 +270,15 @@ in

      r6d.config-generator = {
        fail2ban = true;
+        murmur = true;
        nix-serve-client = true;
+        nix-serve-server = true;
        nixStoreProxyCache = true;
+        tincAddress = "192.168.12.4/24";
+        tincExtraConfig = ''
+          ConnectTo = rollo_dubronetwork_fr
+          ConnectTo = ocean_prunetwork_fr
+          '';
      };
    })
    (mkIf comp.isNeoNomade{
@@ -226,6 +289,12 @@ in

      r6d.config-generator = {
        laptop = true;
+        tincAddress = "192.168.12.7/24";
+        tincExtraConfig = ''
+          ConnectTo = monstre_dubronetwork_fr
+          ConnectTo = rollo_dubronetwork_fr
+          ConnectTo = ocean_prunetwork_fr
+          '';
      };
    })
    (mkIf comp.isNomade{
@@ -243,7 +312,6 @@ in

      r6d.config-generator = {
        fail2ban = true;
-        online-ipv6 = true;
      };
    })
    (mkIf comp.isPhenom {
@@ -254,7 +322,16 @@ in
      };

      r6d.config-generator = {
+        jetbrains-licensed = true;
+        hydra-core = true;
        nix-serve-server = true;
+        edition-photo = true;
+        tincAddress = "192.168.12.1/24";
+        tincExtraConfig = ''
+          ConnectTo = monstre_dubronetwork_fr
+          ConnectTo = rollo_dubronetwork_fr
+          ConnectTo = ocean_prunetwork_fr
+          '';
      };
    })
    (mkIf comp.isRollo {
@@ -268,7 +345,10 @@ in
        fail2ban = true;
        mailboxes = true;
        murmur = true;
-        online-ipv6 = true;
+        tincAddress = "192.168.12.5/24";
+        tincExtraConfig = ''
+          ConnectTo = ocean_prunetwork_fr
+          '';
        znc = true;
      };
    })
--- a/desktop/activation-manuelle/xmonad/xmonad.nix
+++ b/desktop/activation-manuelle/xmonad/xmonad.nix
@@ -1,19 +1,21 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
+in

-in  mkIf cfg.xmonad {
-  # Paquets spécifiques pour xmonad
+mkIf cfg.xmonad {

-  environment.systemPackages = with pkgs;[
+  # Paquets
+  environment.systemPackages = with pkgs; [
    dmenu
    haskellPackages.xmobar
  ];

+  # Services
  services.xserver.windowManager.xmonad = {
    enable = true;
    enableContribAndExtras = true;
--- a/desktop/desktop.nix
+++ b/desktop/desktop.nix
@@ -1,10 +1,10 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:

 let
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
-  mkIf = pkgs.lib.mkIf;
+  mkIf = lib.mkIf;
 in

 {
@@ -13,17 +13,18 @@ in
    ./activation-manuelle/xmonad/xmonad.nix      # gestionnaire de fenêtres xmonad
  ];

+  # Paquets
  environment.systemPackages = with pkgs; mkIf profiles.isDesktop [
    # Environement de bureau
    arandr          # interface graphique pour xrandr
    wmname          # pour définir le nom du gestionnaire de fenêtre (utile pour java)
-    kde4.ksnapshot# capture d'écran
+    #kde4.ksnapshot # capture d'écran
    xorg.xbacklight # pour gérer la luminosité de l'écran
    xorg.xev        # pour repérer les codes + noms standard des actions clavier/souris
    xorg.xkill      # pour 'tuer une application'

    ## Gestionnaire de fenêtre & Thème
-    gnome.gnome_icon_theme  # thème d'icone - semble fonctionner avec spaceFM
+    gnome3.adwaita-icon-theme  # thème d'icone - semble fonctionner avec spaceFM

    ## Manipulation de fichier
    pcmanfm         # gestionnaire de fichiers graphique
@@ -51,7 +52,16 @@ in
  ];

  nixpkgs.config.packageOverrides = pkgs: {
-    clawsMail = pkgs.clawsMail.override { enablePluginFancy = true; };
+    clawsMail = pkgs.clawsMail.override {
+      enablePluginFancy = true;
+      enablePluginPdf = true;
+      enablePluginRavatar = true;
+      enablePluginSmime = true;
+      enablePluginVcalendar = true;
+      enableSpellcheck = true;
+    };
    mumble = pkgs.mumble.override { pulseSupport = true; };
  };
+
+  security.setuidPrograms = [ "udevil" ];
 }
--- a/module-template.nix
+++ b/module-template.nix
@@ -1,11 +1,25 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
 in

 mkIf true {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+  ];
+
+  # Services
+
+  # Réseau
+  networking.firewall = {
+    allowedTCPPorts = [
+    ];
+    allowedUDPPorts = [
+    ];
+  };
 }
--- a/munin-www.sh
+++ b/munin-www.sh
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-pushd /var/www/munin/ && python -m SimpleHTTPServer 8000
--- a/public/app-adminsys.nix
+++ b/public/app-adminsys.nix
@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
 in

-mkIf profiles.isDesktop {
+mkIf true {

+  # Paquets
  environment.systemPackages = with pkgs; [
    # Adminsys
    iotop
@@ -22,22 +23,35 @@ mkIf profiles.isDesktop {
    python27Packages.glances
    usbutils

-    # DNS
-    unbound
+    # Backup
+    duplicity     # création de sauvegarde chiffrées (GPG)

    # Compression
    lz4
    lzop

    # Système de fichier
-    curlftpfs
-    gparted
-    inotify-tools
-    nfs-utils
-    ntfs3g
-    sshfsFuse
+    ## Montage de filesystem
+    curlftpfs     # ftp
+    exfat         # Pour monter les FAT avec Fuse
+    hubicfuse     # montage hubic
+    ntfs3g        # ntfs
+    sshfsFuse     # ssh

-    #
-    unetbootin    # création de clefs USB bootables
+    ## Gestion de FS
+    nfs-utils
+
+    ## Exploitation FS
+    inotify-tools # être notifié lorsque le contenu d'un répertoire change
+    duff          # outil de recherche de fichiers en doublons
+    rdfind        # recherche de fichiers doublons pour remplacement par hard/soft link
+
+    (mkIf profiles.isDesktop
+      ## Gestion de FS
+      gparted       # Gestion graphique de partitions
+    )
+    (mkIf profiles.isDesktop
+      unetbootin    # création de clefs USB bootables
+    )
  ];
 }
--- a/public/app-awesome.nix
+++ b/public/app-awesome.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
--- a/public/app-bureautique.nix
+++ b/public/app-bureautique.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,22 +9,27 @@ in

 mkIf profiles.isDesktop {

+  # Paquets
  environment.systemPackages = with pkgs; [
    # Bureautique
-    aspell aspellDicts.fr
-    dia
-    gnumeric
+    aspell aspellDicts.fr # correction d'ortographe
+    gnumeric      # tableur
+    #kde4.ksnapshot# réalisation de capture d'écran

    ## Cartes mentales
    freemind

+    ## Diagrammes & Schémas
+    dia           # dessin & schéma technique
+
    ## Editeur de texte
-    lyx           # surcouche WISIWIM à LaTeX
+    #lyx          # surcouche WISIWIM à LaTeX
+    #focuswriter  # outil pour l'écriture
    textadept     # un éditeur de texte facile pour copier-coller graphique
-    zim           # outil de prise de notes, wiki de bureau
+    #zim          # outil de prise de notes, wiki de bureau

    ## Visionneuse
-    kde5.okular   # pdf
+    #kde5.okular   # pdf
    mcomix        # livres (cbr, liste d'images), gestion d'une bibliothèque
    pdfpc         # pdf
    qpdfview      # pdf
@@ -33,9 +38,11 @@ mkIf profiles.isDesktop {
    ## Convertisseurs (texte -> <autre format>)
    gnuplot       # générateur de graphes à partir de données numériques
    graphviz      # dot, neato : traçage de graphes (carré, rond)
-    jekyll        # générateur statique de site web
+    #jekyll       # générateur statique de site web
+    #odpdown      # conversion md -> presentation ODP : https://github.com/thorstenb/odpdown
    pandoc
-    texLiveFull   # distribution LaTeX
+    haskellPackages.pandoc-citeproc
+    texlive.combined.scheme-full # distribution LaTeX
    #texLive       # distribution LaTeX de base
    #texLiveBeamer # paquets et extensions pour Beamer
    #texLiveModerncv # paquets pour la classe Modern CV
--- a/public/app-cao.nix
+++ b/public/app-cao.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,7 +9,8 @@ in

 mkIf cfg.conception-assistee {

-environment.systemPackages = with pkgs; [
+  # Paquets
+  environment.systemPackages = with pkgs; [
    # CAO
    ## Modélisation 3D
    freecad   # modélisation de pièces en 3D
--- a/public/app-cartographie.nix
+++ b/public/app-cartographie.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,12 +9,13 @@ in

 mkIf cfg.cartographie {

+  # Paquets
  environment.systemPackages = with pkgs; [
    # Gestion de données géographiques
    expat         
    gpsbabel      # pour convettir les données des GPS
    josm          # outil de contribution à OpenStreetMap
-    qgis          # client lourd de manipulation de données géographiques
+    #qgis         # client lourd de manipulation de données géographiques
    viking        # analyse de topo, gestion de données GPS
  ];
 }
--- a/public/app-client-internet.nix
+++ b/public/app-client-internet.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,6 +9,7 @@ in

 mkIf profiles.isDesktop {

+# Paquets
 environment.systemPackages = with pkgs; [
    # Clients Internet

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

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

    ## Mail & Discussion (texte, audio)
    clawsMail
    hexchat
-    kde5.quasselClient
+    quasselClient
    mumble
    mutt
    pidgin
--- a/public/app-developpement-haskell.nix
+++ b/public/app-developpement-haskell.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.developpement-haskell {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    # Haskell
+    cabal-install         # fournis cabal
+    cabal2nix             # convertir les .cabal en .nix
+    ghc                   # pour les appels depuis les scripts
+    stack                 # pour les paquets en LTS de stackage
+
+    haskellPackages.stylish-haskell # qualité de code
+
+    # Application perso
+    haskellPackages.hahp
+  ];
+}
--- a/public/app-developpement-java.nix
+++ b/public/app-developpement-java.nix
@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.developpement-java {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    # IDE
+    idea.idea-community # IntelliJ IDEA
+
+    # Java
+    maven
+  ];
+}
--- a/public/app-developpement-jetbrains.nix
+++ b/public/app-developpement-jetbrains.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.jetbrains-licensed {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    idea.idea-ultimate
+    idea.clion
+    idea.datagrip
+    idea.pycharm-professional
+  ];
+}
--- a/public/app-developpement-rust.nix
+++ b/public/app-developpement-rust.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.developpement-rust {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    # Rust
+    cargo               # récupération des dépendances + compilation projet rust
+    rustc               # pour les appels depuis les scripts
+  ];
+}
--- a/public/app-developpement.nix
+++ b/public/app-developpement.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,36 +9,34 @@ in

 mkIf cfg.developpement {

+  # Paquets
  environment.systemPackages = with pkgs; [
    # Base de données
-    pgadmin
-    sqlitebrowser
+    pgadmin             # interface d'administration de postgres
+    sqlitebrowser       # interface d'administration de sqlite

-    # Développement
-    cloc
-    idea.idea-community
-    gcc           # pour les appels depuis les scripts
+    # C / C++
+    gcc                 # pour les appels depuis les scripts

    # Documentation
-    zeal
+    #zeal                # consulter la documentation hors ligne

-    ## Gestion des sources
-    # git       # déjà présent dans "base"
-    git-cola
+    # Gestion des sources
+    cloc                # outil pour compter les lignes de code source
+    git                 # déjà présent dans "base"
+    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)
    mercurial
    subversion

-    ## Haskell
-    ghc
-    stack
-
-    ## Rust
-    cargo       # récupération des dépendances + compilation projet rust
-    rustPlatform.rustc
+    # Mono
+    #mono46              # interpréteur .NET

    ## Visualisation & outils de diff
-    gource
-    meld
-    vbindiff    # diff de fichier hexadecimaux avec vim
+    #gource              # visualisation en mouvement de l'historique git
+    meld                # outil de comparaison graphique
+    #vbindiff           # diff de fichier hexadecimaux avec vim
  ];
 }
--- a/public/app-docker.nix
+++ b/public/app-docker.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,6 +9,7 @@ in

 mkIf cfg.docker {

+  # Paquets
  environment.systemPackages = with pkgs; [
    # Ecosystème Docker
    docker
--- a/public/app-edition-musique.nix
+++ b/public/app-edition-musique.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,7 +9,8 @@ in

 mkIf cfg.edition-musique {

-environment.systemPackages = with pkgs; [
+  # Paquets
+  environment.systemPackages = with pkgs; [
    #
    audacity      # montage audio
    easytag       # gestion des métadonnées des fichiers musicaux
--- a/public/app-edition-photo.nix
+++ b/public/app-edition-photo.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,6 +9,7 @@ in

 mkIf cfg.edition-photo {

+  # Paquets
 environment.systemPackages = with pkgs; [
    # Méta données
    exif
@@ -18,9 +19,9 @@ environment.systemPackages = with pkgs; [
    gimp          # logiciel d'édition/montage/retouche photo
    inkscape      # édition d'image vectorielle (svg & autre)
    imagemagick   # modification image en CLI
-    rawtherapee   # développemen de photos en RAW
+    #rawtherapee  # développemen de photos en RAW

    # TEST d'outil de gestion de catalogue de photos
-    kde4.digikam  # gestionnaire de bibliothèque de photo
+    #kde4.digikam  # gestionnaire de bibliothèque de photo
  ];
 }
--- a/public/app-edition-video.nix
+++ b/public/app-edition-video.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,7 +9,8 @@ in

 mkIf cfg.edition-video {

-environment.systemPackages = with pkgs; [
+  # Paquets
+  environment.systemPackages = with pkgs; [
    # Vidéo
    #cinelerra     # editeur video
    pitivi        # montage vidéo
--- a/public/app-jeux.nix
+++ b/public/app-jeux.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,6 +9,7 @@ in

 mkIf cfg.jeux {

+  # Paquets
  environment.systemPackages = with pkgs; [
    # Jeux
    urbanterror
--- a/public/app-multimedia.nix
+++ b/public/app-multimedia.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,6 +9,7 @@ in

 mkIf profiles.isDesktop {

+  # Paquets
  environment.systemPackages = with pkgs; [
    # Multimedia

@@ -23,7 +24,5 @@ mkIf profiles.isDesktop {
    ## Video
    smplayer      # lecteur vidéo
    vlc           # lecteur vidéo
-
-    kde4.ksnapshot# réalisation de capture d'écran
  ];
 }
--- a/public/app-network.nix
+++ b/public/app-network.nix
@@ -7,8 +7,10 @@ let
  profiles = config.r6d.profiles;
 in

-mkIf profiles.isDesktop {
+mkIf true {
+#mkIf profiles.isDesktop {

+  # Paquets
  environment.systemPackages = with pkgs; [
    # Outils réseau
    iperf         # outil de mesure de la qualité du réseau
@@ -18,12 +20,18 @@ mkIf profiles.isDesktop {

    ## Diagnostic
    arp-scan
-    wireshark
+    nmap          # outil de scan de port réseau
+    mtr           # outil de diagnostic réseau
+    #wireshark
    whois
  ];

  networking.firewall = {
-    allowedTCPPorts = [5201]; # iperf
-    allowedUDPPorts = [5201]; # iperf
+    allowedTCPPorts = [
+      5201 # iperf
+    ];
+    allowedUDPPorts = [
+      5201 # iperf
+    ];
  };
 }
--- a/public/app-securite.nix
+++ b/public/app-securite.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,12 +9,14 @@ in

 mkIf profiles.isDesktop {

+  # Paquets
  environment.systemPackages = with pkgs; [
    # Securité
    gnome3.seahorse # gestionnaire graphique de clef GPG
    pass            # gestionnaire de mots de passe
    pwgen           # générateur de mots de passe
    slock           # vérouiller l''écran. "cannot disable the out-of-memory killer for this process (make sure to suid or sgid slock)" --> en root
-    yubikey-personalization-gui # utilisation de la clef Yubikey
+    #yubikey-personalization-gui # utilisation de la clef Yubikey
  ];
+  security.setuidPrograms = [ "slock" ];
 }
--- a/public/app-virtualbox.nix
+++ b/public/app-virtualbox.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,10 +9,19 @@ in

 mkIf cfg.virtualbox {

+  # Paquets
  environment.systemPackages = with pkgs; [
    linuxPackages.virtualbox
    linuxPackages.virtualboxGuestAdditions
  ];

+  # À décommenter pour activer le pack d'extension
+  #boot.kernelPackages = pkgs.linuxPackages // {
+  #  virtualbox = pkgs.linuxPackages.virtualbox.override {
+  #    enableExtensionPack = true;
+  #    pulseSupport = true;
+  #  };
+  #};
+
  virtualisation.virtualbox.host.enable = true;
 }
--- a/public/auto-upgrade.nix
+++ b/public/auto-upgrade.nix
@@ -1,13 +1,14 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
 in

 mkIf cfg.auto-upgrade {
+
  # Automatic update & automatic clean

  system.autoUpgrade.enable = true;
--- a/public/config-awesome-3-rc.lua
+++ b/public/config-awesome-3-rc.lua
@@ -0,0 +1,470 @@
+-- ~home : .config/awesome/rc.lua
+
+-- Standard awesome library
+local gears = require("gears")
+local awful = require("awful")
+awful.rules = require("awful.rules")
+require("awful.autofocus")
+-- Widget and layout library
+local wibox = require("wibox")
+-- Theme handling library
+local beautiful = require("beautiful")
+-- Notification library
+local naughty = require("naughty")
+local menubar = require("menubar")
+
+-- {{{ Error handling
+-- Check if awesome encountered an error during startup and fell back to
+-- another config (This code will only ever execute for the fallback config)
+if awesome.startup_errors then
+    naughty.notify({ preset = naughty.config.presets.critical,
+                     title = "Oops, there were errors during startup!",
+                     text = awesome.startup_errors })
+end
+
+-- Handle runtime errors after startup
+do
+    local in_error = false
+    awesome.connect_signal("debug::error", function (err)
+        -- Make sure we don't go into an endless error loop
+        if in_error then return end
+        in_error = true
+
+        naughty.notify({ preset = naughty.config.presets.critical,
+                         title = "Oops, an error happened!",
+                         text = err })
+        in_error = false
+    end)
+end
+-- }}}
+
+-- {{{ Variable definitions
+-- Themes define colours, icons, font and wallpapers.
+
+local config_dir = os.getenv("AWESOME_CONFIG_DIR")
+beautiful.init(config_dir .. "/share/awesome/themes/zenburn/theme.lua")
+-- beautiful.init("/nix/store/vpj4i2vmqbinqfcigy44xzh81k9h0mv8-awesome-3.5.8/share/awesome/themes/zenburn/theme.lua")
+
+-- This is used later as the default terminal and editor to run.
+terminal = "sakura"
+editor = os.getenv("EDITOR") or "vim"
+editor_cmd = terminal .. " -e " .. editor
+
+-- Default modkey.
+-- Usually, Mod4 is the key with a logo between Control and Alt.
+-- If you do not like this or do not have such a key,
+-- I suggest you to remap Mod4 to another key using xmodmap or other tools.
+-- However, you can use another modifier like Mod1, but it may interact with others.
+modkey = "Mod4"
+
+-- Table of layouts to cover with awful.layout.inc, order matters.
+local layouts =
+{
+	awful.layout.suit.fair,
+	awful.layout.suit.fair.horizontal,
+	awful.layout.suit.max.fullscreen,
+	awful.layout.suit.spiral,
+	awful.layout.suit.spiral.dwindle,
+	awful.layout.suit.max,
+	awful.layout.suit.floating,
+	awful.layout.suit.tile,
+	awful.layout.suit.tile.left,
+	awful.layout.suit.tile.bottom,
+	awful.layout.suit.tile.top,
+	awful.layout.suit.magnifier
+}
+-- }}}
+
+-- {{{ Wallpaper
+if beautiful.wallpaper then
+    for s = 1, screen.count() do
+        gears.wallpaper.maximized(beautiful.wallpaper, s, true)
+    end
+end
+-- }}}
+
+-- {{{ Tags
+-- Define a tag table which hold all screen tags.
+tags = {}
+for s = 1, screen.count() do
+    -- Each screen has its own tag table.
+    tags[s] = awful.tag({ 1, 2, 3, 4, 5, 6, 7, 8, 9 }, s, layouts[1])
+end
+-- }}}
+
+-- {{{ Menu
+-- Create a laucher widget and a main menu
+myawesomemenu = {
+   { "manual", terminal .. " -e man awesome" },
+   { "edit config", editor_cmd .. " " .. awesome.conffile },
+   { "restart", awesome.restart },
+   { "quit", awesome.quit }
+}
+
+mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
+                                    { "open terminal", terminal }
+                                  }
+                        })
+
+mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
+                                     menu = mymainmenu })
+
+-- Menubar configuration
+menubar.utils.terminal = terminal -- Set the terminal for applications that require it
+-- }}}
+
+-- {{{ Wibox
+-- Create a textclock widget
+mytextclock = awful.widget.textclock()
+
+-- Create a wibox for each screen and add it
+mywibox = {}
+mypromptbox = {}
+mylayoutbox = {}
+mytaglist = {}
+mytaglist.buttons = awful.util.table.join(
+                    awful.button({ }, 1, awful.tag.viewonly),
+                    awful.button({ modkey }, 1, awful.client.movetotag),
+                    awful.button({ }, 3, awful.tag.viewtoggle),
+                    awful.button({ modkey }, 3, awful.client.toggletag),
+                    awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end),
+                    awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end)
+                    )
+mytasklist = {}
+mytasklist.buttons = awful.util.table.join(
+                     awful.button({ }, 1, function (c)
+                                              if c == client.focus then
+                                                  c.minimized = true
+                                              else
+                                                  -- Without this, the following
+                                                  -- :isvisible() makes no sense
+                                                  c.minimized = false
+                                                  if not c:isvisible() then
+                                                      awful.tag.viewonly(c:tags()[1])
+                                                  end
+                                                  -- This will also un-minimize
+                                                  -- the client, if needed
+                                                  client.focus = c
+                                                  c:raise()
+                                              end
+                                          end),
+                     awful.button({ }, 3, function ()
+                                              if instance then
+                                                  instance:hide()
+                                                  instance = nil
+                                              else
+                                                  instance = awful.menu.clients({
+                                                      theme = { width = 250 }
+                                                  })
+                                              end
+                                          end),
+                     awful.button({ }, 4, function ()
+                                              awful.client.focus.byidx(1)
+                                              if client.focus then client.focus:raise() end
+                                          end),
+                     awful.button({ }, 5, function ()
+                                              awful.client.focus.byidx(-1)
+                                              if client.focus then client.focus:raise() end
+                                          end))
+
+for s = 1, screen.count() do
+    -- Create a promptbox for each screen
+    mypromptbox[s] = awful.widget.prompt()
+    -- Create an imagebox widget which will contains an icon indicating which layout we're using.
+    -- We need one layoutbox per screen.
+    mylayoutbox[s] = awful.widget.layoutbox(s)
+    mylayoutbox[s]:buttons(awful.util.table.join(
+                           awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end),
+                           awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end),
+                           awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end),
+                           awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end)))
+    -- Create a taglist widget
+    mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons)
+
+    -- Create a tasklist widget
+    mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons)
+
+    -- Create the wibox
+    mywibox[s] = awful.wibox({ position = "top", screen = s })
+
+    -- Widgets that are aligned to the left
+    local left_layout = wibox.layout.fixed.horizontal()
+    left_layout:add(mylauncher)
+    left_layout:add(mytaglist[s])
+    left_layout:add(mypromptbox[s])
+
+    -- Widgets that are aligned to the right
+    local right_layout = wibox.layout.fixed.horizontal()
+    if s == 1 then right_layout:add(wibox.widget.systray()) end
+    right_layout:add(mytextclock)
+    right_layout:add(mylayoutbox[s])
+
+    -- Now bring it all together (with the tasklist in the middle)
+    local layout = wibox.layout.align.horizontal()
+    layout:set_left(left_layout)
+    layout:set_middle(mytasklist[s])
+    layout:set_right(right_layout)
+
+    mywibox[s]:set_widget(layout)
+end
+-- }}}
+
+-- {{{ Mouse bindings
+root.buttons(awful.util.table.join(
+    awful.button({ }, 3, function () mymainmenu:toggle() end),
+    awful.button({ }, 4, awful.tag.viewnext),
+    awful.button({ }, 5, awful.tag.viewprev)
+))
+-- }}}
+
+-- {{{ Key bindings
+globalkeys = awful.util.table.join(
+    awful.key({ modkey,           }, "Left",   awful.tag.viewprev       ),
+    awful.key({ modkey,           }, "Right",  awful.tag.viewnext       ),
+    awful.key({ modkey,           }, "Escape", awful.tag.history.restore),
+
+    awful.key({ modkey,           }, "j",
+        function ()
+            awful.client.focus.byidx( 1)
+            if client.focus then client.focus:raise() end
+        end),
+    awful.key({ modkey,           }, "k",
+        function ()
+            awful.client.focus.byidx(-1)
+            if client.focus then client.focus:raise() end
+        end),
+    awful.key({ modkey,           }, "w", function () mymainmenu:show() end),
+
+    -- Layout manipulation
+    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end),
+    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end),
+    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end),
+    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
+    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto),
+    awful.key({ modkey,           }, "Tab",
+        function ()
+            awful.client.focus.history.previous()
+            if client.focus then
+                client.focus:raise()
+            end
+        end),
+
+    -- Standard program
+    awful.key({ modkey,           }, "Return", function () awful.util.spawn(terminal) end),
+    awful.key({ modkey, "Control" }, "r", awesome.restart),
+    awful.key({ modkey, "Shift"   }, "q", awesome.quit),
+
+    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)    end),
+    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)    end),
+    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1)      end),
+    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1)      end),
+    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1)         end),
+    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1)         end),
+    awful.key({ modkey,           }, "space", function () awful.layout.inc(layouts,  1) end),
+    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(layouts, -1) end),
+
+    awful.key({ modkey, "Control" }, "n", awful.client.restore),
+
+    -- Prompt
+    awful.key({ modkey            }, "r",     function () mypromptbox[mouse.screen]:run() end),
+    awful.key({ modkey            }, "x",
+              function ()
+                  awful.prompt.run({ prompt = "Run Lua code: " },
+                  mypromptbox[mouse.screen].widget,
+                  awful.util.eval, nil,
+                  awful.util.getdir("cache") .. "/history_eval")
+              end),
+    -- Menubar
+    awful.key({ modkey            }, "p",  function() menubar.show() end),
+    -- Lanceurs perso
+    awful.key({ modkey            }, "F1", function () awful.util.spawn("kontact") end),
+    awful.key({ modkey, "Shift"   }, "F1", function () awful.util.spawn("claws-mail") end),
+    awful.key({ modkey            }, "F2", function () awful.util.spawn("firefox") end),
+    awful.key({ modkey, "Shift"   }, "F2", function () awful.util.spawn("uzbl-tabbed") end),
+    awful.key({ modkey            }, "F3", function () awful.util.spawn("spacefm") end),
+    awful.key({ modkey, "Shift"   }, "F3", function () awful.util.spawn("pcmanfm") end),
+--  awful.key({ modkey            }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-auto") end),
+--  awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-left") end),
+--  awful.key({ modkey, "Control" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-right") end),
+    awful.key({ modkey            }, "F12", function () awful.util.spawn("slock") end)
+)
+
+clientkeys = awful.util.table.join(
+    awful.key({ modkey,           }, "f",      function (c) c.fullscreen = not c.fullscreen  end),
+    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end),
+    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ),
+    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end),
+    awful.key({ modkey,           }, "o",      awful.client.movetoscreen                        ),
+    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end),
+    awful.key({ modkey,           }, "n",
+        function (c)
+            -- The client currently has the input focus, so it cannot be
+            -- minimized, since minimized clients can't have the focus.
+            c.minimized = true
+        end),
+    awful.key({ modkey,           }, "m",
+        function (c)
+            c.maximized_horizontal = not c.maximized_horizontal
+            c.maximized_vertical   = not c.maximized_vertical
+        end)
+)
+
+-- Bind all key numbers to tags.
+-- Be careful: we use keycodes to make it works on any keyboard layout.
+-- This should map on the top row of your keyboard, usually 1 to 9.
+for i = 1, 9 do
+    globalkeys = awful.util.table.join(globalkeys,
+        -- View tag only.
+        awful.key({ modkey }, "#" .. i + 9,
+                  function ()
+                        local screen = mouse.screen
+                        local tag = awful.tag.gettags(screen)[i]
+                        if tag then
+                           awful.tag.viewonly(tag)
+                        end
+                  end),
+        -- Toggle tag.
+        awful.key({ modkey, "Control" }, "#" .. i + 9,
+                  function ()
+                      local screen = mouse.screen
+                      local tag = awful.tag.gettags(screen)[i]
+                      if tag then
+                         awful.tag.viewtoggle(tag)
+                      end
+                  end),
+        -- Move client to tag.
+        awful.key({ modkey, "Shift" }, "#" .. i + 9,
+                  function ()
+                      if client.focus then
+                          local tag = awful.tag.gettags(client.focus.screen)[i]
+                          if tag then
+                              awful.client.movetotag(tag)
+                          end
+                     end
+                  end),
+        -- Toggle tag.
+        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
+                  function ()
+                      if client.focus then
+                          local tag = awful.tag.gettags(client.focus.screen)[i]
+                          if tag then
+                              awful.client.toggletag(tag)
+                          end
+                      end
+                  end))
+end
+
+clientbuttons = awful.util.table.join(
+    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
+    awful.button({ modkey }, 1, awful.mouse.client.move),
+    awful.button({ modkey }, 3, awful.mouse.client.resize)
+)
+
+-- Set keys
+root.keys(globalkeys)
+-- }}}
+
+-- {{{ Rules
+-- Rules to apply to new clients (through the "manage" signal).
+awful.rules.rules = {
+    -- All clients will match this rule.
+    { rule = { },
+      properties = { border_width = beautiful.border_width,
+                     border_color = beautiful.border_normal,
+                     focus = awful.client.focus.filter,
+                     raise = true,
+                     keys = clientkeys,
+                     buttons = clientbuttons }
+    },
+    {   rule = { class = "MPlayer" },
+        properties = { floating = true }
+    },
+    {   rule = { class = "pinentry" },
+        properties = { floating = true }
+    },
+    {   rule = { class = "gimp" },
+        properties = { floating = true }
+    }
+    -- Set Firefox to always map on tags number 2 of screen 1.
+    -- { rule = { class = "Firefox" },
+    --   properties = { tag = tags[1][2] } },
+}
+-- }}}
+
+-- {{{ Signals
+-- Signal function to execute when a new client appears.
+client.connect_signal("manage", function (c, startup)
+    -- Enable sloppy focus
+    c:connect_signal("mouse::enter", function(c)
+        if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
+            and awful.client.focus.filter(c) then
+            client.focus = c
+        end
+    end)
+
+    if not startup then
+        -- Set the windows at the slave,
+        -- i.e. put it at the end of others instead of setting it master.
+        -- awful.client.setslave(c)
+
+        -- Put windows in a smart way, only if they does not set an initial position.
+        if not c.size_hints.user_position and not c.size_hints.program_position then
+            awful.placement.no_overlap(c)
+            awful.placement.no_offscreen(c)
+        end
+    end
+
+    local titlebars_enabled = false
+    if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then
+        -- buttons for the titlebar
+        local buttons = awful.util.table.join(
+                awful.button({ }, 1, function()
+                    client.focus = c
+                    c:raise()
+                    awful.mouse.client.move(c)
+                end),
+                awful.button({ }, 3, function()
+                    client.focus = c
+                    c:raise()
+                    awful.mouse.client.resize(c)
+                end)
+                )
+
+        -- Widgets that are aligned to the left
+        local left_layout = wibox.layout.fixed.horizontal()
+        left_layout:add(awful.titlebar.widget.iconwidget(c))
+        left_layout:buttons(buttons)
+
+        -- Widgets that are aligned to the right
+        local right_layout = wibox.layout.fixed.horizontal()
+        right_layout:add(awful.titlebar.widget.floatingbutton(c))
+        right_layout:add(awful.titlebar.widget.maximizedbutton(c))
+        right_layout:add(awful.titlebar.widget.stickybutton(c))
+        right_layout:add(awful.titlebar.widget.ontopbutton(c))
+        right_layout:add(awful.titlebar.widget.closebutton(c))
+
+        -- The title goes in the middle
+        local middle_layout = wibox.layout.flex.horizontal()
+        local title = awful.titlebar.widget.titlewidget(c)
+        title:set_align("center")
+        middle_layout:add(title)
+        middle_layout:buttons(buttons)
+
+        -- Now bring it all together
+        local layout = wibox.layout.align.horizontal()
+        layout:set_left(left_layout)
+        layout:set_right(right_layout)
+        layout:set_middle(middle_layout)
+
+        awful.titlebar(c):set_widget(layout)
+    end
+end)
+
+client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
+client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
+-- }}}
+
+-- Au démarrage
+-- awful.util.spawn_with_shell("/home/taeradan/bin/xrandr-auto")
+-- awful.util.spawn_with_shell("gnome-sound-applet")
+-- awful.util.spawn_with_shell("nm-applet")
--- a/public/config-awesome-4-rc.lua
+++ b/public/config-awesome-4-rc.lua
@@ -0,0 +1,569 @@
+-- $HOME : .config/awesome/rc.lua
+
+-- Standard awesome library
+local gears = require("gears")
+local awful = require("awful")
+awful.rules = require("awful.rules")
+require("awful.autofocus")
+-- Widget and layout library
+local wibox = require("wibox")
+-- Theme handling library
+local beautiful = require("beautiful")
+-- Notification library
+local naughty = require("naughty")
+local menubar = require("menubar")
+local hotkeys_popup = require("awful.hotkeys_popup").widget
+
+-- {{{ Error handling
+-- Check if awesome encountered an error during startup and fell back to
+-- another config (This code will only ever execute for the fallback config)
+if awesome.startup_errors then
+    naughty.notify({ preset = naughty.config.presets.critical,
+                     title = "Oops, there were errors during startup!",
+                     text = awesome.startup_errors })
+end
+
+-- Handle runtime errors after startup
+do
+    local in_error = false
+    awesome.connect_signal("debug::error", function (err)
+        -- Make sure we don't go into an endless error loop
+        if in_error then return end
+        in_error = true
+
+        naughty.notify({ preset = naughty.config.presets.critical,
+                         title = "Oops, an error happened!",
+                         text = tostring(err) })
+        in_error = false
+    end)
+end
+-- }}}
+
+-- {{{ Variable definitions
+-- Themes define colours, icons, font and wallpapers.
+local config_dir = os.getenv("AWESOME_CONFIG_DIR")
+beautiful.init(config_dir .. "/share/awesome/themes/zenburn/theme.lua")
+
+-- This is used later as the default terminal and editor to run.
+terminal = "sakura"
+editor = os.getenv("EDITOR") or "vim"
+editor_cmd = terminal .. " -e " .. editor
+
+-- Default modkey.
+-- Usually, Mod4 is the key with a logo between Control and Alt.
+-- If you do not like this or do not have such a key,
+-- I suggest you to remap Mod4 to another key using xmodmap or other tools.
+-- However, you can use another modifier like Mod1, but it may interact with others.
+modkey = "Mod4"
+
+-- Table of layouts to cover with awful.layout.inc, order matters.
+awful.layout.layouts = {
+    awful.layout.suit.corner.nw,
+    awful.layout.suit.tile,
+    awful.layout.suit.tile.left,
+    awful.layout.suit.tile.bottom,
+    awful.layout.suit.tile.top,
+    awful.layout.suit.fair,
+    awful.layout.suit.fair.horizontal,
+    awful.layout.suit.spiral,
+    awful.layout.suit.spiral.dwindle,
+    awful.layout.suit.max,
+    awful.layout.suit.max.fullscreen,
+    awful.layout.suit.magnifier,
+    awful.layout.suit.floating,
+    -- awful.layout.suit.corner.ne,
+    -- awful.layout.suit.corner.sw,
+    -- awful.layout.suit.corner.se,
+}
+-- }}}
+
+-- {{{ Helper functions
+local function client_menu_toggle_fn()
+    local instance = nil
+
+    return function ()
+        if instance and instance.wibox.visible then
+            instance:hide()
+            instance = nil
+        else
+            instance = awful.menu.clients({ theme = { width = 250 } })
+        end
+    end
+end
+-- }}}
+
+-- {{{ Menu
+-- Create a launcher widget and a main menu
+myawesomemenu = {
+   { "hotkeys", function() return false, hotkeys_popup.show_help end},
+   { "manual", terminal .. " -e man awesome" },
+   { "edit config", editor_cmd .. " " .. awesome.conffile },
+   { "restart", awesome.restart },
+   { "quit", function() awesome.quit() end}
+}
+
+mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
+                                    { "open terminal", terminal }
+                                  }
+                        })
+
+mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
+                                     menu = mymainmenu })
+
+-- Menubar configuration
+menubar.utils.terminal = terminal -- Set the terminal for applications that require it
+-- }}}
+
+-- Keyboard map indicator and switcher
+mykeyboardlayout = awful.widget.keyboardlayout()
+
+-- {{{ Wibar
+-- Create a textclock widget
+mytextclock = wibox.widget.textclock()
+
+-- Create a wibox for each screen and add it
+local taglist_buttons = awful.util.table.join(
+                    awful.button({ }, 1, function(t) t:view_only() end),
+                    awful.button({ modkey }, 1, function(t)
+                                              if client.focus then
+                                                  client.focus:move_to_tag(t)
+                                              end
+                                          end),
+                    awful.button({ }, 3, awful.tag.viewtoggle),
+                    awful.button({ modkey }, 3, function(t)
+                                              if client.focus then
+                                                  client.focus:toggle_tag(t)
+                                              end
+                                          end),
+                    awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end),
+                    awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
+                )
+
+local tasklist_buttons = awful.util.table.join(
+                     awful.button({ }, 1, function (c)
+                                              if c == client.focus then
+                                                  c.minimized = true
+                                              else
+                                                  -- Without this, the following
+                                                  -- :isvisible() makes no sense
+                                                  c.minimized = false
+                                                  if not c:isvisible() and c.first_tag then
+                                                      c.first_tag:view_only()
+                                                  end
+                                                  -- This will also un-minimize
+                                                  -- the client, if needed
+                                                  client.focus = c
+                                                  c:raise()
+                                              end
+                                          end),
+                     awful.button({ }, 3, client_menu_toggle_fn()),
+                     awful.button({ }, 4, function ()
+                                              awful.client.focus.byidx(1)
+                                          end),
+                     awful.button({ }, 5, function ()
+                                              awful.client.focus.byidx(-1)
+                                          end))
+
+local function set_wallpaper(s)
+    -- Wallpaper
+    if beautiful.wallpaper then
+        local wallpaper = beautiful.wallpaper
+        -- If wallpaper is a function, call it with the screen
+        if type(wallpaper) == "function" then
+            wallpaper = wallpaper(s)
+        end
+        gears.wallpaper.maximized(wallpaper, s, true)
+    end
+end
+
+-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
+screen.connect_signal("property::geometry", set_wallpaper)
+
+awful.screen.connect_for_each_screen(function(s)
+    -- Wallpaper
+    set_wallpaper(s)
+
+    -- Each screen has its own tag table.
+    awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
+
+    -- Create a promptbox for each screen
+    s.mypromptbox = awful.widget.prompt()
+    -- Create an imagebox widget which will contains an icon indicating which layout we're using.
+    -- We need one layoutbox per screen.
+    s.mylayoutbox = awful.widget.layoutbox(s)
+    s.mylayoutbox:buttons(awful.util.table.join(
+                           awful.button({ }, 1, function () awful.layout.inc( 1) end),
+                           awful.button({ }, 3, function () awful.layout.inc(-1) end),
+                           awful.button({ }, 4, function () awful.layout.inc( 1) end),
+                           awful.button({ }, 5, function () awful.layout.inc(-1) end)))
+    -- Create a taglist widget
+    s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons)
+
+    -- Create a tasklist widget
+    s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons)
+
+    -- Create the wibox
+    s.mywibox = awful.wibar({ position = "top", screen = s })
+
+    -- Add widgets to the wibox
+    s.mywibox:setup {
+        layout = wibox.layout.align.horizontal,
+        { -- Left widgets
+            layout = wibox.layout.fixed.horizontal,
+            mylauncher,
+            s.mytaglist,
+            s.mypromptbox,
+        },
+        s.mytasklist, -- Middle widget
+        { -- Right widgets
+            layout = wibox.layout.fixed.horizontal,
+            mykeyboardlayout,
+            wibox.widget.systray(),
+            mytextclock,
+            s.mylayoutbox,
+        },
+    }
+end)
+-- }}}
+
+-- {{{ Mouse bindings
+root.buttons(awful.util.table.join(
+    awful.button({ }, 3, function () mymainmenu:toggle() end),
+    awful.button({ }, 4, awful.tag.viewnext),
+    awful.button({ }, 5, awful.tag.viewprev)
+))
+-- }}}
+
+-- {{{ Key bindings
+globalkeys = awful.util.table.join(
+    awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
+              {description="show help", group="awesome"}),
+    awful.key({ modkey,           }, "Left",   awful.tag.viewprev,
+              {description = "view previous", group = "tag"}),
+    awful.key({ modkey,           }, "Right",  awful.tag.viewnext,
+              {description = "view next", group = "tag"}),
+    awful.key({ modkey,           }, "Escape", awful.tag.history.restore,
+              {description = "go back", group = "tag"}),
+
+    awful.key({ modkey,           }, "j",
+        function ()
+            awful.client.focus.byidx( 1)
+        end,
+        {description = "focus next by index", group = "client"}
+    ),
+    awful.key({ modkey,           }, "k",
+        function ()
+            awful.client.focus.byidx(-1)
+        end,
+        {description = "focus previous by index", group = "client"}
+    ),
+    awful.key({ modkey,           }, "w", function () mymainmenu:show() end,
+              {description = "show main menu", group = "awesome"}),
+
+    -- Layout manipulation
+    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end,
+              {description = "swap with next client by index", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "k", function () awful.client.swap.byidx( -1)    end,
+              {description = "swap with previous client by index", group = "client"}),
+    awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end,
+              {description = "focus the next screen", group = "screen"}),
+    awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end,
+              {description = "focus the previous screen", group = "screen"}),
+    awful.key({ modkey,           }, "u", awful.client.urgent.jumpto,
+              {description = "jump to urgent client", group = "client"}),
+    awful.key({ modkey,           }, "Tab",
+        function ()
+            awful.client.focus.history.previous()
+            if client.focus then
+                client.focus:raise()
+            end
+        end,
+        {description = "go back", group = "client"}),
+
+    -- Standard program
+    awful.key({ modkey,           }, "Return", function () awful.spawn(terminal) end,
+              {description = "open a terminal", group = "launcher"}),
+    awful.key({ modkey, "Control" }, "r", awesome.restart,
+              {description = "reload awesome", group = "awesome"}),
+    awful.key({ modkey, "Shift"   }, "q", awesome.quit,
+              {description = "quit awesome", group = "awesome"}),
+
+    awful.key({ modkey,           }, "l",     function () awful.tag.incmwfact( 0.05)          end,
+              {description = "increase master width factor", group = "layout"}),
+    awful.key({ modkey,           }, "h",     function () awful.tag.incmwfact(-0.05)          end,
+              {description = "decrease master width factor", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "h",     function () awful.tag.incnmaster( 1, nil, true) end,
+              {description = "increase the number of master clients", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "l",     function () awful.tag.incnmaster(-1, nil, true) end,
+              {description = "decrease the number of master clients", group = "layout"}),
+    awful.key({ modkey, "Control" }, "h",     function () awful.tag.incncol( 1, nil, true)    end,
+              {description = "increase the number of columns", group = "layout"}),
+    awful.key({ modkey, "Control" }, "l",     function () awful.tag.incncol(-1, nil, true)    end,
+              {description = "decrease the number of columns", group = "layout"}),
+    awful.key({ modkey,           }, "space", function () awful.layout.inc( 1)                end,
+              {description = "select next", group = "layout"}),
+    awful.key({ modkey, "Shift"   }, "space", function () awful.layout.inc(-1)                end,
+              {description = "select previous", group = "layout"}),
+
+    awful.key({ modkey, "Control" }, "n",
+              function ()
+                  local c = awful.client.restore()
+                  -- Focus restored client
+                  if c then
+                      client.focus = c
+                      c:raise()
+                  end
+              end,
+              {description = "restore minimized", group = "client"}),
+
+    -- Prompt
+    awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
+              {description = "run prompt", group = "launcher"}),
+
+    awful.key({ modkey }, "x",
+              function ()
+                  awful.prompt.run {
+                    prompt       = "Run Lua code: ",
+                    textbox      = awful.screen.focused().mypromptbox.widget,
+                    exe_callback = awful.util.eval,
+                    history_path = awful.util.get_cache_dir() .. "/history_eval"
+                  }
+              end,
+              {description = "lua execute prompt", group = "awesome"}),
+    -- Menubar
+    awful.key({ modkey }, "p", function() menubar.show() end,
+              {description = "show the menubar", group = "launcher"}),
+    -- Lanceurs perso
+    awful.key({ modkey            }, "F1", function () awful.util.spawn("firefox") end),
+    awful.key({ modkey            }, "F2", function () awful.util.spawn("firefox") end),
+--  awful.key({ modkey            }, "F3", function () awful.util.spawn("") end),
+    awful.key({ modkey            }, "F4", function () awful.util.spawn("chromium") end),
+    awful.key({ modkey            }, "F5", function () awful.util.spawn("spacefm") end),
+    awful.key({ modkey            }, "F6", function () awful.util.spawn("vlc") end),
+    awful.key({ modkey            }, "F7", function () awful.util.spawn("claws-mail") end),
+    awful.key({ modkey            }, "F12", function () awful.util.spawn("slock") end),
+    awful.key({ modkey, "Shift"   }, "F1", function () awful.util.spawn("claws-mail") end),
+    awful.key({ modkey, "Shift"   }, "F3", function () awful.util.spawn("pcmanfm") end)
+--  awful.key({ modkey            }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-auto") end),
+--  awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-left") end),
+--  awful.key({ modkey, "Control" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-right") end),
+
+)
+
+clientkeys = awful.util.table.join(
+    awful.key({ modkey,           }, "f",
+        function (c)
+            c.fullscreen = not c.fullscreen
+            c:raise()
+        end,
+        {description = "toggle fullscreen", group = "client"}),
+    awful.key({ modkey, "Shift"   }, "c",      function (c) c:kill()                         end,
+              {description = "close", group = "client"}),
+    awful.key({ modkey, "Control" }, "space",  awful.client.floating.toggle                     ,
+              {description = "toggle floating", group = "client"}),
+    awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end,
+              {description = "move to master", group = "client"}),
+    awful.key({ modkey,           }, "o",      function (c) c:move_to_screen()               end,
+              {description = "move to screen", group = "client"}),
+    awful.key({ modkey,           }, "t",      function (c) c.ontop = not c.ontop            end,
+              {description = "toggle keep on top", group = "client"}),
+    awful.key({ modkey,           }, "n",
+        function (c)
+            -- The client currently has the input focus, so it cannot be
+            -- minimized, since minimized clients can't have the focus.
+            c.minimized = true
+        end ,
+        {description = "minimize", group = "client"}),
+    awful.key({ modkey,           }, "m",
+        function (c)
+            c.maximized = not c.maximized
+            c:raise()
+        end ,
+        {description = "maximize", group = "client"})
+)
+
+-- Bind all key numbers to tags.
+-- Be careful: we use keycodes to make it works on any keyboard layout.
+-- This should map on the top row of your keyboard, usually 1 to 9.
+for i = 1, 9 do
+    globalkeys = awful.util.table.join(globalkeys,
+        -- View tag only.
+        awful.key({ modkey }, "#" .. i + 9,
+                  function ()
+                        local screen = awful.screen.focused()
+                        local tag = screen.tags[i]
+                        if tag then
+                           tag:view_only()
+                        end
+                  end,
+                  {description = "view tag #"..i, group = "tag"}),
+        -- Toggle tag display.
+        awful.key({ modkey, "Control" }, "#" .. i + 9,
+                  function ()
+                      local screen = awful.screen.focused()
+                      local tag = screen.tags[i]
+                      if tag then
+                         awful.tag.viewtoggle(tag)
+                      end
+                  end,
+                  {description = "toggle tag #" .. i, group = "tag"}),
+        -- Move client to tag.
+        awful.key({ modkey, "Shift" }, "#" .. i + 9,
+                  function ()
+                      if client.focus then
+                          local tag = client.focus.screen.tags[i]
+                          if tag then
+                              client.focus:move_to_tag(tag)
+                          end
+                     end
+                  end,
+                  {description = "move focused client to tag #"..i, group = "tag"}),
+        -- Toggle tag on focused client.
+        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
+                  function ()
+                      if client.focus then
+                          local tag = client.focus.screen.tags[i]
+                          if tag then
+                              client.focus:toggle_tag(tag)
+                          end
+                      end
+                  end,
+                  {description = "toggle focused client on tag #" .. i, group = "tag"})
+    )
+end
+
+clientbuttons = awful.util.table.join(
+    awful.button({ }, 1, function (c) client.focus = c; c:raise() end),
+    awful.button({ modkey }, 1, awful.mouse.client.move),
+    awful.button({ modkey }, 3, awful.mouse.client.resize))
+
+-- Set keys
+root.keys(globalkeys)
+-- }}}
+
+-- {{{ Rules
+-- Rules to apply to new clients (through the "manage" signal).
+awful.rules.rules = {
+    -- All clients will match this rule.
+    { rule = { },
+      properties = { border_width = beautiful.border_width,
+                     border_color = beautiful.border_normal,
+                     focus = awful.client.focus.filter,
+                     raise = true,
+                     keys = clientkeys,
+                     buttons = clientbuttons,
+                     screen = awful.screen.preferred,
+                     placement = awful.placement.no_overlap+awful.placement.no_offscreen
+     }
+    },
+
+    -- Floating clients.
+    { rule_any = {
+        instance = {
+          "DTA",  -- Firefox addon DownThemAll.
+          "copyq",  -- Includes session name in class.
+        },
+        class = {
+          "Arandr",
+          "Gpick",
+          "Kruler",
+          "MessageWin",  -- kalarm.
+          "Sxiv",
+          "Wpa_gui",
+          "pinentry",
+          "veromix",
+          "xtightvncviewer"},
+
+        name = {
+          "Event Tester",  -- xev.
+        },
+        role = {
+          "AlarmWindow",  -- Thunderbird's calendar.
+          "pop-up",       -- e.g. Google Chrome's (detached) Developer Tools.
+        }
+      }, properties = { floating = true }},
+
+    -- Add titlebars to normal clients and dialogs
+    { rule_any = {type = { "normal", "dialog" }
+      }, properties = { titlebars_enabled = false }
+    },
+
+    -- Set Firefox to always map on the tag named "2" on screen 1.
+    -- { rule = { class = "Firefox" },
+    --   properties = { screen = 1, tag = "2" } },
+}
+-- }}}
+
+-- {{{ Signals
+-- Signal function to execute when a new client appears.
+client.connect_signal("manage", function (c)
+    -- Set the windows at the slave,
+    -- i.e. put it at the end of others instead of setting it master.
+    -- if not awesome.startup then awful.client.setslave(c) end
+
+    if awesome.startup and
+      not c.size_hints.user_position
+      and not c.size_hints.program_position then
+        -- Prevent clients from being unreachable after screen count changes.
+        awful.placement.no_offscreen(c)
+    end
+end)
+
+-- Add a titlebar if titlebars_enabled is set to true in the rules.
+client.connect_signal("request::titlebars", function(c)
+    -- buttons for the titlebar
+    local buttons = awful.util.table.join(
+        awful.button({ }, 1, function()
+            client.focus = c
+            c:raise()
+            awful.mouse.client.move(c)
+        end),
+        awful.button({ }, 3, function()
+            client.focus = c
+            c:raise()
+            awful.mouse.client.resize(c)
+        end)
+    )
+
+    awful.titlebar(c) : setup {
+        { -- Left
+            awful.titlebar.widget.iconwidget(c),
+            buttons = buttons,
+            layout  = wibox.layout.fixed.horizontal
+        },
+        { -- Middle
+            { -- Title
+                align  = "center",
+                widget = awful.titlebar.widget.titlewidget(c)
+            },
+            buttons = buttons,
+            layout  = wibox.layout.flex.horizontal
+        },
+        { -- Right
+            awful.titlebar.widget.floatingbutton (c),
+            awful.titlebar.widget.maximizedbutton(c),
+            awful.titlebar.widget.stickybutton   (c),
+            awful.titlebar.widget.ontopbutton    (c),
+            awful.titlebar.widget.closebutton    (c),
+            layout = wibox.layout.fixed.horizontal()
+        },
+        layout = wibox.layout.align.horizontal
+    }
+end)
+
+-- Enable sloppy focus, so that focus follows mouse.
+client.connect_signal("mouse::enter", function(c)
+    if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier
+        and awful.client.focus.filter(c) then
+        client.focus = c
+    end
+end)
+
+client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
+client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
+-- }}}
+
+-- Au démarrage
+-- awful.util.spawn_with_shell("/home/taeradan/bin/xrandr-auto")
+-- awful.util.spawn_with_shell("gnome-sound-applet")
+-- awful.util.spawn_with_shell("nm-applet")
--- a/public/environment.nix
+++ b/public/environment.nix
@@ -1,39 +1,55 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+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 = "16.03";
+  system.stateVersion = "16.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;

  # On autorise les paquets non-libres
  nixpkgs.config.allowUnfree = true;

-  # List packages installed in system profile. To search by name, run:
-  # $ nix-env -qaP | grep wget
+  # Lancement de dbus pour les utilisateurs
+  services.dbus.socketActivated = true;
+
+  # NixOS Hardening
+  #security.grsecurity.enable = true;
+
+  # Paquets
  environment = {
    systemPackages = with pkgs; [
      bind          # utilisé pour les utilitaires comme dig
      byobu         # permet de se déconnecter d'un terminal sans l'aréter
-      exfat         # Pour monter les FAT avec Fuse
+      dhcp          # client dhcp
      git gitAndTools.gitSVN gitAndTools.tig gti # outil de gestion de version
      gnumake       # pour décrire les recettes de compilation
      gnupg         # GPG
      gpm           # prise en charge de la souris en console
      htop          # monitoring
+      lsb-release   # pour les scripts qui utilisent cet outil
      #libressl      # librairie pour faire du TLS et les algorithmes de crypto par OpenBSD
      ncdu          # outil pour voir l'espace utilisé
-      nmap          # outil de scan de port réseau
-      mtr           # outil de diagnostic réseau
      par2cmdline   # outil de récupération de fichiers corrompus - .par2
      p7zip         # compression de fichier
      parted        # partitionnement de disque
      pciutils
+      pinentry      # pour taper les mots de passe gpg
+      psmisc        # fournis les utilitaires comme killall, fuser, pstree
      python        # python -- python -m SimpleHTTPServer 8000
      python34Packages.glances # monitoring
      pwgen         # générateur de mot de passe
-      rtorrent      # outil de téléchargement de torrent & magnet
+      rtorrent      # TODO outil de téléchargement de torrent & magnet
      tmux          # nécessaire pour byobu
      tree          # affiche une arborescence de fichiers et dossiers
      usbutils
@@ -43,15 +59,23 @@
    ];
    shellAliases = {
      byobu = "byobu-tmux";
+      gpg = "gpg2";
+      jacques-a-dit = "sudo";
      tree = "tree -C";
      tree1 = "tree -d -L 1";
      tree2 = "tree -d -L 2";
      tree3 = "tree -d -L 3";
+      # https://gist.github.com/amitchhajer/4461043 : Count number of code lines in git repository per user
+      #git-loc = "git ls-files | while read f; do git blame --line-porcelain "${f}" | grep '^author '; done | sort -f | uniq -ic | sort -n";
      grep = "grep --color=auto";
      vi = "vim";
    };
    etc.gitconfig.text = builtins.readFile ./gitconfig;
  };
+  # programmes qui n'ont pas besoin de sudo pour fonctionner
+  security.setuidPrograms = [
+    "mtr"
+  ];
  programs.bash = {
    enableCompletion = true;
    promptInit = builtins.readFile ./bash-prompt.sh;
--- a/public/hardware-scanner.nix
+++ b/public/hardware-scanner.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.scanner {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    simple-scan
+  ];
+
+  # Services
+  hardware.sane.enable = true;
+
+  # Réseau
+  networking.firewall = {
+    allowedTCPPorts = [
+    ];
+    allowedUDPPorts = [
+    ];
+  };
+}
--- a/public/laptop.nix
+++ b/public/laptop.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -19,7 +19,9 @@ mkIf cfg.laptop {

  hardware.bluetooth.enable = true;

+  # Paquets
  environment.systemPackages = with pkgs; [
-    networkmanagerapplet
+    networkmanagerapplet    # gestionnaire réseau graphique + console (nm-applet + nmtui)
+    wirelesstools           # fournis iwconfig
  ];
 }
--- a/public/localisation.nix
+++ b/public/localisation.nix
@@ -1,6 +1,14 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf true {

-{
  # Select internationalisation properties.
  i18n = {
    consoleFont = "Lat2-Terminus16";
--- a/public/network-ipv6.nix
+++ b/public/network-ipv6.nix
@@ -1,6 +1,14 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf true {

-{
  # Utilisation d'adresse IPv6 temporaire
  
  ## https://blog.linitx.com/control-privacy-addressing-ipv6-linux/
@@ -14,5 +22,8 @@
    "net.ipv6.conf.default.temp_prefered_lft" = 3600; # 1 heure
    "net.ipv6.conf.default.temp_valid_lft" = 3600; # 1 heure
    "net.ipv6.conf.default.use_tempaddr" = 2; # activé
-    };
+
+    "net.ipv6.conf.all.forwarding" = true;
+    "net.ipv6.conf.default.forwarding" = true;
+  };
 }
--- a/public/network.nix
+++ b/public/network.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf true {
+
+  # fix: Hostname -s renvoie "Unknown host" alors que hostname renvoie la bonne valeur
+  #      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}                                                                                                                                                                                                                             
+  '';
+
+  boot.kernel.sysctl = {
+    "net.ipv4.conf.all.forwarding" = true;
+    "net.ipv4.conf.default.forwarding" = true;
+  };
+}
--- a/public/print.nix
+++ b/public/print.nix
@@ -1,14 +1,16 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
 in

 mkIf cfg.print {
-  # Enable CUPS to print documents.
+
+  # Services
+  ## Enable CUPS to print documents.
  services.printing = {
    enable = true;
    drivers = [
--- a/public/public.nix
+++ b/public/public.nix
@@ -1,42 +1,61 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
+
+let
+  #inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in

 {
  imports = [
    # installées systématiquement
    ./environment.nix
    ./localisation.nix
+    ./network.nix
    #./network-ipv6.nix
+    ./sudo.nix
    ./service-haveged.nix
    ./service-monitoring.nix
    ./service-ssh.nix
+    ./udev.nix

    # commandées par config-generator
    ## option de configuration spécifique
-    ./app-awesome.nix           # pour les profils awesome
-    ./app-cao.nix               # de conception assisté par ordinateur & modélisation
-    ./app-cartographie.nix      # utilisée pour manipuler les données géographiques & cartes
-    ./app-developpement.nix     # utilisée pour développer des programmes/scripts
-    ./app-docker.nix            # pour activer docker
-    ./app-edition-musique.nix   # pour modifier les fichiers musicaux
-    ./app-edition-photo.nix     # pour modifier les photos & assimilé
-    ./app-edition-video.nix     # pour modifier les vidéos
-    ./app-jeux.nix              # permettant de jouer ;)
-    ./app-virtualbox.nix        # pour exploiter virtualbox
-    ./auto-upgrade.nix          # mise à jour automatique du système
-    ./laptop.nix                # appli & configuration adaptée pour un PC portable
-    ./print.nix                 # configuration de base de cups
-    ./service-laptop.nix        # services spécifiques aux pc portables
-    ./service-locate.nix        # service locate
-    ./swap.nix                  # définition de l'utilisation du swap
+    ./app-awesome.nix               # pour les profils awesome
+    ./app-cao.nix                   # de conception assisté par ordinateur & modélisation
+    ./app-cartographie.nix          # manipuler les données géographiques & cartes
+    ./app-developpement.nix         # développer des programmes/scripts
+    ./app-developpement-haskell.nix # développer en haskell
+    ./app-developpement-java.nix    # développer en java
+    ./app-developpement-jetbrains.nix # outils jetbrains
+    ./app-developpement-rust.nix    # développer en rust
+    ./app-docker.nix                # activer docker
+    ./app-edition-musique.nix       # modifier les fichiers musicaux
+    ./app-edition-photo.nix         # modifier les photos & assimilé
+    ./app-edition-video.nix         # modifier les vidéos
+    ./app-jeux.nix                  # jouer, tout simplement ;)
+    ./app-virtualbox.nix            # activer virtualbox
+    ./auto-upgrade.nix              # mise à jour automatique du système
+    ./laptop.nix                    # appli & configuration adaptée pour un PC portable
+    ./print.nix                     # configuration de base de cups
+    ./service-elasticsearch.nix     # service de stockage et recher de données
+    ./service-hydra-build.nix       # service de construction de paquet. -> la machine compile des paquets
+    ./service-hydra-core.nix        # service pour l'instance d'hydra
+    ./service-kibana.nix            # service de visualisation de données stockées dans elasticsearch
+    ./service-laptop.nix            # services spécifiques aux pc portables
+    ./service-locate.nix            # service locate
+    ./swap.nix                      # définition de l'utilisation du swap

    ## if isDesktop
-    ./app-adminsys.nix          # pour gérer le système dans son ensemble et les services
-    ./app-bureautique.nix       # dédiée à la bureautique (traitement de texte, dessin, ...)
-    ./app-client-internet.nix   # pour accéder & utiliser des ressources par le réseau
-    ./app-multimedia.nix        # pour gérer le son, l'image et la vidéo
-    ./app-network.nix           # de gestion, de diagnostique & surveillance réseau
-    ./app-securite.nix          # relatives à la sécurité (chiffrement, gpg, mots de passe, ...)
-    ./service-pulseaudio.nix    # activation du serveur audio
-    ./service-x11.nix           # activation du serveur graphique X
+    ./app-adminsys.nix              # pour gérer le système dans son ensemble et les services
+    ./app-bureautique.nix           # dédiée à la bureautique (traitement de texte, dessin, ...)
+    ./app-client-internet.nix       # pour accéder & utiliser des ressources par le réseau
+    ./app-multimedia.nix            # pour gérer le son, l'image et la vidéo
+    ./app-network.nix               # de gestion, de diagnostique & surveillance réseau
+    ./app-securite.nix              # relatives à la sécurité (chiffrement, gpg, mots de passe, ...)
+    ./hardware-scanner.nix          # utilisation d'un scanner
+    ./service-pulseaudio.nix        # activation du serveur audio
+    ./service-x11.nix               # activation du serveur graphique X
  ];
 }
--- a/public/service-elasticsearch.nix
+++ b/public/service-elasticsearch.nix
@@ -0,0 +1,34 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.elasticsearch {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+  ];
+
+  # Services
+
+  ## E : http://localhost:9200/_cat/indices?v
+  services.elasticsearch = {
+    enable = true;
+    port = 9200;
+    listenAddress = "127.0.0.1";
+    #listenAddress = "_site_";
+  };
+
+  # Réseau
+  # -> Aucun port n'est ouvert caril est recommandé de mettre un proxy HTTP devant
+  networking.firewall = {
+    allowedTCPPorts = [
+    ];
+    allowedUDPPorts = [
+    ];
+  };
+}
--- a/public/service-haveged.nix
+++ b/public/service-haveged.nix
@@ -1,7 +1,16 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:

-{
-  # Sécurité & Acces distant
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf true {
+
+  # Sécurité & Accès distant
+  # Services

  ## Augmentation de l'entropie du système par un générateur de nombres aléatoires
  ## cat /proc/sys/kernel/random/entropy_avail
--- a/public/service-hydra-build.nix
+++ b/public/service-hydra-build.nix
@@ -0,0 +1,45 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.hydra-builder {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    qemu
+    kvm
+  ];
+
+  # Services
+
+  ## Services de virtualisation utilisé pour les tests hydra
+  virtualisation.docker.enable = true;
+  virtualisation.libvirtd.enable = true;
+  virtualisation.libvirtd.enableKVM = true;
+  #virtualisation.virtualbox.guest.enable = true;
+  virtualisation.virtualbox.host.enable = true;
+  virtualisation.virtualbox.host.headless = true;
+
+  ## Ménage automatique tous les jours
+  nix.gc.automatic = true;
+
+  users.users."hydrabld" = {
+    description = "Execution des jobs hydra";
+    group = "nixbld";
+    extraGroups = [
+      "docker"
+      "nixbld"
+      "vboxusers"
+    ];
+    isNormalUser = true;  # devrait être à false: TODO débugger la conf ssh & users pour que ça marche en user système
+
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGYpjcWJCf8dXpv2LmoIaNVbwZXEC50QUU6Az+lqeD89 hydra radx"
+    ];
+  };
+}
--- a/public/service-hydra-core.nix
+++ b/public/service-hydra-core.nix
@@ -0,0 +1,91 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+
+
+  #### https://github.com/NixOS/hydra/issues/413
+  # Note that we use 'import <nixpkgs> {}' instead of 'pkgs'.
+  # If we use the latter we get an infinite recursion
+  # because we include hydra-src in the module imports below which in turn defines the 'pkgs' value.
+  #hydra-src = (import <nixpkgs> {}).fetchgit {
+  #  url = "https://github.com/NixOS/hydra.git";
+  #  rev = "de55303197d997c4fc5503b52b1321ae9528583d";
+  #  sha256 = "0nimqsbpjxfwha6d5gp6a7jh50i83z1llmx30da4bscsic8z1xly";
+  #};
+
+  #hydra-src-pkg = lib.mkDefault ((import (hydra-src + /release.nix) {}).build.x86_64-linux);
+
+  # information pour l'état de hydra :
+  # hydra-queue-runner --status | json_pp
+in
+mkIf cfg.hydra-core {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+  ];
+
+  # Documentation HYDRA
+
+  ## Installation
+
+  # 1. créer clef SSH :
+  #	ssh-keygen -C "hydra@pedro.dubronetwork.fr" -N "" -f /etc/nixos/id_buildfarm
+  # 2. récupérer la clef publique du serveur ssh + l'ajouter dans les `knownHosts` :
+  #	ssh-keyscan localhost
+  # 3. créer un utilisateur pour gérer hydra
+  #	su - hydra
+  #	hydra-create-user jpierre03 --password xxx --role 'admin'
+  # 4. relancer hydra
+  # 5. ajouter un vhost à nginx
+  # 6. relancer nginx
+  # 7. le service accessible à hydra.<nom de machine>
+
+  ## Tutoriel
+  # * https://github.com/peti/hydra-tutorial
+
+  # Services
+
+  ## Hydra
+
+  services.hydra = {
+    enable = true;
+    hydraURL = "http://hydra.${config.networking.hostName}";
+    notificationSender = "hydra@${config.networking.hostName}";
+    listenHost = "localhost";
+    minimumDiskFree = 50; # Go
+    smtpHost = "localhost";
+    #package = hydra-src-pkg ;
+  };
+
+  #systemd.services.hydra-evaluator = {
+  #  path = [ pkgs.nettools config.services.hydra.package ];
+  #};
+
+  ## Ménage
+  #nix.gc.automatic = true;
+
+  ## Délégation des actions de compilation à la ferme de compilation
+
+  ### Machines connues
+
+  programs.ssh.knownHosts = {
+    "monstre.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBTTrLhq1Cwm0rpnwEIxSLqVrJWZnt+/9dt+SKd8NiIc";
+    "pedro.dubronetwork.fr".publicKey   = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD";
+    "ocean.prunetwork.fr".publicKey     = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINCaRuTl8iCTUE4XInOpkSlwQj5Re4w4Iq+gNIlJe8pA";
+    "radx.prunetwork.fr".publicKey      = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGyoXdTEnxSgZTMfRfVH+bpOGZJtJpydAijcRGsZik7U";
+    "rollo.dubronetwork.fr".publicKey   = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID4lWgS/sVdcZvnAAN+lBSOcCL9ISdAUsjp1kh9lalNu";
+  };
+
+  ### La liste des machines utilisées
+  nix = {
+    distributedBuilds = false;
+    buildMachines = [
+    #      { hostName = "pedro.dubronetwork.fr"; maxJobs = 5; speedFactor = 10; sshKey = "/etc/nixos/id_buildfarm"; sshUser = "root"; system = "x86_64-linux"; }
+    ];
+    extraOptions = "auto-optimise-store = true";
+  };
+}
--- a/public/service-kibana.nix
+++ b/public/service-kibana.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.kibana {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+  ];
+
+  # Services
+
+  # K : http://localhost:8000
+  services.kibana = {
+    enable = true;
+    elasticsearch.url = "http://127.0.0.1:9200";
+    port = 8000;
+  };
+
+  # Réseau
+  # -> Aucun port n'est ouvert caril est recommandé de mettre un proxy HTTP devant
+  networking.firewall = {
+    allowedTCPPorts = [
+    ];
+    allowedUDPPorts = [
+    ];
+  };
+}
--- a/public/service-laptop.nix
+++ b/public/service-laptop.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -11,6 +11,7 @@ mkIf cfg.laptop {

  # Gestion spécifique pour PC portable

+  # Services
  services.xserver.synaptics = {
    enable = true;
    twoFingerScroll = true;
--- a/public/service-locate.nix
+++ b/public/service-locate.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
@@ -9,6 +9,7 @@ in

 mkIf cfg.locate {

+  # Services
  services.locate = {
    enable = true;
    interval = "hourly";
--- a/public/service-monitoring.nix
+++ b/public/service-monitoring.nix
@@ -1,31 +1,45 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:

-{
-  # Monitoring
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in

-  # Noeud de supervision munin = pas de stockage des données locales
+mkIf true {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    mailutils
+  ];
+
+  # Services
+
+  ## Noeud de supervision munin = pas de stockage des données locales
  services.munin-node = {
    enable = true;
  };
+  systemd.services.munin-node.serviceConfig.TimeoutStartSec = "3min";

-  # Munin server -- generate /var/www/munin
+  ## Munin server -- generate /var/www/munin
  services.munin-cron = {
    enable = true;
    hosts = ''
      [${config.networking.hostName}]
-        address localhost
+        address 127.0.0.1
    '';
    extraGlobalConfig = ''
      contact.email.command mail -s "Munin notification for ''${var:host}" root@${config.networking.hostName}
    '';
  };

-  networking.firewall.allowedTCPPorts = [
-    # TODO configurer les bon ports lors de l'ouverture du service
-    8000
-  ];
-
-   ## Documentation
-   # * https://nixos.org/wiki/Create_and_debug_nix_packages
-   # * http://chriswarbo.net/essays/nixos/developing_on_nixos.html
+  # Réseau
+  networking.firewall = {
+    allowedTCPPorts = [
+      #8000
+    ];
+    allowedUDPPorts = [
+    ];
+  };
 }
--- a/public/service-pulseaudio.nix
+++ b/public/service-pulseaudio.nix
@@ -1,15 +1,16 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:

 let
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
-  mkIf = pkgs.lib.mkIf;
 in

-{
+mkIf profiles.isDesktop {
+
  # Pulse Audio
-  hardware.pulseaudio = mkIf profiles.isDesktop {
+  hardware.pulseaudio = {
    enable = true;
    support32Bit = true;
  };
--- a/public/service-ssh.nix
+++ b/public/service-ssh.nix
@@ -1,10 +1,20 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:

-{
-  # OpenSSH daemon
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf true {
+
+  # Services
+  ## OpenSSH daemon
  services.openssh = {
    enable = true;
    # https://wiki.mozilla.org/Security/Guidelines/OpenSSH#Modern_.28OpenSSH_6.7.2B.29
+    # http://www.cyberciti.biz/tips/linux-unix-bsd-openssh-server-best-practices.html
    extraConfig = ''
      KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256
      Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
--- a/public/service-x11.nix
+++ b/public/service-x11.nix
@@ -1,22 +1,22 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:

 let
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
-  mkIf = pkgs.lib.mkIf;
 in

-{
+mkIf profiles.isDesktop {
+
+  # Services
  # Enable the X11 windowing system.
-  services.xserver = mkIf profiles.isDesktop {
-    enable = true;
+  services.xserver = {
+    #enable = true;
    layout = "fr";
    xkbOptions = "eurosign:e";
    displayManager.lightdm.enable = true;
    windowManager.awesome.enable = true;
-    startGnuPGAgent = true;
-    startOpenSSHAgent = false; # pas compatible avec l'agent GnuPG
    inputClassSections = [''
    Identifier  "Marble Mouse"
    MatchProduct "Logitech USB Trackball"
--- a/public/sudo.nix
+++ b/public/sudo.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf true {
+
+  # Authorisation de certaines applications par sudo sans mot de passe
+
+  security.sudo.extraConfig = ''
+  %users ALL = NOPASSWD: ${pkgs.mtr}/bin/mtr
+  %users ALL = NOPASSWD: ${pkgs.slock}/bin/slock
+  '';
+}
--- a/public/swap.nix
+++ b/public/swap.nix
@@ -1,13 +1,14 @@
 { config, lib, pkgs, ... }:

 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkMerge mkThenElse;
  cfg = config.r6d.config-generator;
  computers = config.r6d.computers;
  profiles = config.r6d.profiles;
 in

 mkIf cfg.swap {
+
  # Gestion du swap
  
  # https://en.wikipedia.org/wiki/Swappiness
--- a/public/udev.nix
+++ b/public/udev.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+{
+  # Définition du IO Scheduler pour les SSD
+  services.udev.extraRules = ''
+  # set deadline scheduler for non-rotating disks
+  # according to https://wiki.debian.org/SSDOptimization, deadline is preferred over noop
+  ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline"
+  '';
+
+}
Author	SHA1	Message	Date
Yves Dubromelle	c0832c7ccb	munin: augmentation du lelais de timeout pour le démarrage du daemon	2017-01-22 19:07:16 +01:00
Yves Dubromelle	10a42e4cbd	monstre est un serveur nix	2017-01-22 00:00:38 +01:00
Yves Dubromelle	f0627eb800	nix-serve est disponible uniquement par tinc	2017-01-21 23:57:51 +01:00
Yves Dubromelle	ae4c1edee0	prise en compte du fichier jetbrains	2017-01-21 16:35:22 +01:00
Yves Dubromelle	4fec5f8c05	application de hydra-core sur phenom	2017-01-21 16:16:21 +01:00
Yves Dubromelle	bec65c07c3	variable pour activer une partie de la suite jetbrains	2017-01-21 16:14:35 +01:00
Jean-Pierre PRUNARET	8de39214b6	changement de l'ordre des enregistrements pour awesome	2017-01-20 13:18:16 +01:00
Jean-Pierre PRUNARET	b9b92c5942	monitoring: inutile de conserver le port 8000 ouvert car aucun service n'écoute	2017-01-20 13:17:42 +01:00
Jean-Pierre PRUNARET	aec47a8d1b	monitoring: l'utilisation de localhost posait problème	2017-01-20 13:17:20 +01:00
Jean-Pierre PRUNARET	0fefb7adc8	calws: ajout plugin	2017-01-15 19:49:37 +01:00
Jean-Pierre PRUNARET	6779d58dfb	claws: activation calendrier + correcteur orthographe	2017-01-15 19:26:51 +01:00
Jean-Pierre PRUNARET	54d15c8ed6	Revert "radx: désactivation hydra : ne s'installe pas" -> s'installe sur nixos-unstable This reverts commit `7afafa7863`.	2017-01-15 19:06:29 +01:00
Jean-Pierre PRUNARET	f2ce6751d2	désactivation paquet pour migration nixos-unstable (17.03pre)	2017-01-15 14:54:11 +01:00
Jean-Pierre PRUNARET	996b8e803c	ajout fichier de configuration pour awesome 3 (nixos-16.09)	2017-01-15 14:54:11 +01:00
Jean-Pierre PRUNARET	162bac4af0	fichier de configuration awesome 4 (nixos-17.03)	2017-01-15 14:53:46 +01:00
Jean-Pierre PRUNARET	55da6460d6	remplacement gnome-icon-theme par équivalent gnome3	2017-01-14 23:16:42 +01:00
Jean-Pierre PRUNARET	14bc58c1c2	désactivation ksnapshot	2017-01-14 23:15:17 +01:00
Jean-Pierre PRUNARET	3818122ac9	haskell: ajout de stylish-haskell	2017-01-14 17:26:52 +01:00
Jean-Pierre PRUNARET	7afafa7863	radx: désactivation hydra : ne s'installe pas	2017-01-13 22:03:17 +01:00
Jean-Pierre PRUNARET	cb6676a215	make: cible pour telecharger toutes les sources nécessaires au build	2017-01-13 21:59:47 +01:00
Jean-Pierre PRUNARET	c0c4550af0	masquage config hydra bleeding-edge (casse le nix store)	2017-01-11 14:51:32 +01:00
Jean-Pierre PRUNARET	43fac7495d	ajout client dhcp	2017-01-11 14:50:45 +01:00
Yves Dubromelle	ab32cae7d8	désactivation globale de nix-serve-client pour les desktops (ne marche pas sur monstre)	2017-01-10 21:01:32 +01:00
Yves Dubromelle	5bbb61b05d	monstre: activation murmur (serveur mumble)	2017-01-10 20:58:42 +01:00
Yves Dubromelle	8abd9b1d5d	hydra normal	2017-01-08 00:17:07 +01:00
Jean-Pierre PRUNARET	31692206e0	amélioration hydra + retour au paquet par défaut	2017-01-04 14:26:28 +01:00
Jean-Pierre PRUNARET	fad5a05159	ajout commande de debug	2017-01-03 18:12:15 +01:00
Jean-Pierre PRUNARET	30962288b7	ajout référence ver source	2017-01-03 18:11:34 +01:00
Jean-Pierre PRUNARET	8d28f29c57	MaJ version hydra - manuelle	2017-01-03 18:10:30 +01:00
Jean-Pierre PRUNARET	df05e6101d	prunetwork, & docker	2017-01-01 18:44:13 +01:00
Jean-Pierre PRUNARET	72eaf19f95	déplacement des options de profils dans + spécifique	2017-01-01 18:31:33 +01:00
Jean-Pierre PRUNARET	f632193558	création profil prunetwork && workstation	2017-01-01 18:23:59 +01:00
Jean-Pierre PRUNARET	05b5da4319	suppression option inutilisée (même si interessante)	2017-01-01 18:22:59 +01:00
Jean-Pierre PRUNARET	64d0765e40	xray n'est pas sous nixos	2017-01-01 18:17:25 +01:00
Jean-Pierre PRUNARET	587e91fe61	la config locate est spécique aux domaines	2017-01-01 18:14:35 +01:00
Yves Dubromelle	0f4355d382	désactivation yubikey	2017-01-01 16:15:18 +01:00
Yves Dubromelle	8c18caab2e	déplacement programmes dans fichiers spécifiques	2017-01-01 16:14:41 +01:00
Yves Dubromelle	2bee4131ed	commentaires	2017-01-01 16:14:25 +01:00
Yves Dubromelle	49b86fb898	dev: programmes inutiles	2017-01-01 15:37:14 +01:00
Jean-Pierre PRUNARET	6dd9251f07	activation de locate ...	2016-12-30 17:48:13 +01:00
Jean-Pierre PRUNARET	6ca6c83898	commentaires	2016-12-30 17:20:04 +01:00
Jean-Pierre PRUNARET	d6ff207d22	indentation	2016-12-30 17:18:37 +01:00
Jean-Pierre PRUNARET	2a26db779f	dev: ajout de hahp à l'environement haskell	2016-12-30 17:13:29 +01:00
Jean-Pierre PRUNARET	aecfadea5f	dev: suppression zeal	2016-12-30 17:11:10 +01:00
Jean-Pierre PRUNARET	2e45bfbc05	dev: suppression des applications disponibles dans des fichiers séparés	2016-12-30 17:10:06 +01:00
Jean-Pierre PRUNARET	cd05bec335	utilisation des variables pour activer les environements de dev	2016-12-30 17:09:15 +01:00
Jean-Pierre PRUNARET	3aecc135c0	ajout de profiles pour le développement (haskell java rust)	2016-12-30 17:08:37 +01:00
Jean-Pierre PRUNARET	54b8d6ce7d	commande pour avoir les statistiques d'affectation des lignes de texte d'un dépôt git	2016-12-22 00:01:23 +01:00
Jean-Pierre PRUNARET	4a81f80d8c	déplacement ksnapshot	2016-12-19 18:18:32 +01:00
Jean-Pierre PRUNARET	ec3dc220be	edition-photo: un éditeur de raw n'est pas nécessaire. Il faut un appareil qui produise du raw	2016-12-19 18:16:39 +01:00
Jean-Pierre PRUNARET	4a106a82ef	edition-musique: seules les stations de travail dubronetwork ont l'option activée	2016-12-19 18:14:16 +01:00
Jean-Pierre PRUNARET	4397b892eb	cartographie: désactivation qgis	2016-12-19 18:12:58 +01:00
Jean-Pierre PRUNARET	829aff682e	bureautique: ajout section pour diagrammes	2016-12-19 18:11:32 +01:00
Jean-Pierre PRUNARET	cff0a177d2	désactivation d'applications a priori peu utilisées	2016-12-19 18:10:42 +01:00
Jean-Pierre PRUNARET	de2c645dbe	indentation	2016-12-19 18:07:54 +01:00
Jean-Pierre PRUNARET	0facfef3e9	réorganisation fichier app-dev	2016-12-19 18:07:04 +01:00
Jean-Pierre PRUNARET	94c1485006	ajout commentaire	2016-12-19 18:02:13 +01:00
Jean-Pierre PRUNARET	35322c124c	ajout duplicity	2016-12-16 19:54:01 +01:00
Jean-Pierre PRUNARET	8d9c0d830f	interpreteur .net	2016-12-16 18:38:53 +01:00
Jean-Pierre PRUNARET	bdf5e511f3	commentaires	2016-12-16 18:38:17 +01:00
Jean-Pierre PRUNARET	386ce3b25e	ajout hubicfuse	2016-12-16 18:38:03 +01:00
Jean-Pierre PRUNARET	b9d19017c0	packages pour haskell	2016-12-11 21:27:11 +01:00
Jean-Pierre PRUNARET	f91e72ef50	ajout de pandoc-citeproc	2016-12-09 18:33:08 +01:00
Jean-Pierre PRUNARET	5f089977a2	mnomade tinc: ajout conf neo	2016-11-29 10:37:49 +01:00
Yves Dubromelle	83aa5af2fc	ménage	2016-11-28 22:19:13 +01:00
Jean-Pierre PRUNARET	79d97ca438	ajout en masse de liens vers rollo, ocean, monstre	2016-11-28 21:51:57 +01:00
Jean-Pierre PRUNARET	04869f63f7	tinc: ajouit adresse monstre, rollo, ocean	2016-11-28 20:40:21 +01:00
Jean-Pierre PRUNARET	be47e7c285	make: ajout commandes rapides pour tinc	2016-11-28 20:27:24 +01:00
Jean-Pierre PRUNARET	a2ee566f15	net: activation du forwarding pour IPv4 et IPv6	2016-11-28 19:43:51 +01:00
Jean-Pierre PRUNARET	b51c69d330	tinc: modification plage addresse	2016-11-28 19:30:22 +01:00
Jean-Pierre PRUNARET	a75b126b5a	tnic: radx essaye de se connecter à phenom	2016-11-28 13:03:36 +01:00
Yves Dubromelle	eabe0db746	réduction de la taille des subnets	2016-11-28 12:54:45 +01:00
Jean-Pierre PRUNARET	b2e44a7b75	activation rabbitmq radx	2016-11-22 18:22:14 +01:00
Jean-Pierre PRUNARET	59982b296b	ajout de maven	2016-11-22 15:50:04 +01:00
Jean-Pierre PRUNARET	4b35c7c20a	fix: erreur nom programme	2016-11-22 14:37:38 +01:00
Jean-Pierre PRUNARET	c0509692b4	ajout focuswriter	2016-11-20 19:05:08 +01:00
Jean-Pierre PRUNARET	772ce45d5e	ajout lsb-release	2016-11-20 19:02:13 +01:00
Yves Dubromelle	f38a182c4d	hydra: ajout de qemu	2016-11-15 12:38:20 +01:00
Jean-Pierre PRUNARET	4bb890da7a	règles pour les SSD	2016-11-13 16:10:12 +01:00
Jean-Pierre PRUNARET	ec24734b05	make: utilisation d'un alias pour "git submodule foreach"	2016-11-11 11:26:59 +01:00
Jean-Pierre PRUNARET	ac8e92cfce	l'utilisateur hydra doit utiliser virtualbox	2016-11-10 16:59:07 +01:00
Yves Dubromelle	5ad9c73c03	support basique des scanners (sane + simple-scan)	2016-11-09 00:39:59 +01:00
Yves Dubromelle	faa4be782a	phenom n'est plus un laptop	2016-11-08 23:45:57 +01:00
Yves Dubromelle	ec4aa5ac32	hydra: activation de services de vitualisation sur le builder * certaines expressions nix demandent à être exécutées dans des VM, conatiners et autres. Jusque là, ces builds restaient dans la file d'attente d'hydra. Cela devrait corriger le problème.	2016-11-07 16:23:24 +01:00
Jean-Pierre PRUNARET	7806cd3ad6	users; ajustement groupes	2016-11-03 22:53:23 +01:00
Jean-Pierre PRUNARET	374b2732ad	ajout clef yves@job	2016-11-02 16:54:11 +01:00
Jean-Pierre PRUNARET	6ce50aea40	activation de Es + kibana sur radx	2016-11-01 19:18:21 +01:00
Jean-Pierre PRUNARET	012cc8626c	ajout de variables dans le config generator	2016-11-01 19:18:04 +01:00
Jean-Pierre PRUNARET	bdbf858a11	ajout de services (Elasticsearch & kibana)	2016-11-01 19:17:40 +01:00
Jean-Pierre PRUNARET	a4b166f1f8	readme: commentaire	2016-10-31 14:50:21 +01:00
Jean-Pierre PRUNARET	bb5ee98bc3	hydra: ajout de commentaires	2016-10-31 14:34:22 +01:00
Jean-Pierre PRUNARET	dd9f52b997	import confing hydra de pedro	2016-10-31 14:28:17 +01:00
Jean-Pierre PRUNARET	bb617fbf13	Merge branch 'upgrade-16.09' = les machines sont migrées	2016-10-31 14:17:18 +01:00
Jean-Pierre PRUNARET	021b1d5c26	Revert "lors d'une full-auto, on ne force pas à être sur la branche master" This reverts commit `3a8a728268`.	2016-10-31 14:17:03 +01:00
Yves Dubromelle	31f57965f9	peers -> extraconfig de tinc, pour être plus souple	2016-10-30 01:31:40 +02:00
Yves Dubromelle	0a3d820dd6	variable pour les noeuds auquels tinc doit se connecter	2016-10-30 01:24:27 +02:00
Yves Dubromelle	f0f266cb55	adresse IP du noeud tinc local	2016-10-30 01:19:25 +02:00
Yves Dubromelle	1916d6eb90	désactivation grsecurity	2016-10-28 21:27:00 +02:00
Jean-Pierre PRUNARET	fa32aed569	hydra build: correction du type d'user	2016-10-26 08:32:16 +02:00
Jean-Pierre PRUNARET	9201266575	Revert "fix: variables d'environnement pour gpg (et donc pass)" This reverts commit `2982725e0b`.	2016-10-25 23:07:42 +02:00
Jean-Pierre PRUNARET	756a18b2e8	Merge remote-tracking branch 'origin/upgrade-16.09' into upgrade-16.09	2016-10-25 22:02:37 +02:00
Jean-Pierre PRUNARET	3b04c2edb0	alias gpg -> gpg2	2016-10-25 19:52:45 +02:00
Jean-Pierre PRUNARET	2982725e0b	fix: variables d'environnement pour gpg (et donc pass)	2016-10-25 19:52:10 +02:00
Jean-Pierre PRUNARET	9e8d3b24b3	correction du nom d'utilisateur pour le build	2016-10-22 15:37:50 +02:00
Jean-Pierre PRUNARET	dba3a46ebd	fichier inutile	2016-10-22 15:37:20 +02:00
Jean-Pierre PRUNARET	7d28694819	ocean: activation radicale	2016-10-20 23:56:43 +02:00
Jean-Pierre PRUNARET	ed5420e1b0	ajout option pour radicale	2016-10-20 23:56:29 +02:00
Jean-Pierre PRUNARET	d6bfe1c706	pinentry	2016-10-18 15:23:23 +02:00
Jean-Pierre PRUNARET	7dada8a3e6	fix: erreur de type (string et non array)	2016-10-18 14:03:33 +02:00
Jean-Pierre PRUNARET	bd0076b9d1	MaJ commande ssh	2016-10-18 13:53:50 +02:00
Jean-Pierre PRUNARET	6800de18af	ajout des clef publiques des serveurs	2016-10-18 13:40:30 +02:00
Jean-Pierre PRUNARET	5d831cf7be	Merge branch 'upgrade-16.09' into HEAD	2016-10-18 13:13:43 +02:00
Jean-Pierre PRUNARET	2ffdaf0a53	Revert "suelette de config hydra" This reverts commit `99d5886aff`.	2016-10-18 13:13:30 +02:00
Jean-Pierre PRUNARET	7dbfccf2f4	hydra: désactivation gc car conflit	2016-10-18 13:12:10 +02:00
Jean-Pierre PRUNARET	e2e15cad39	hydra: ajout config core & builder (pas testé)	2016-10-18 13:05:46 +02:00
Jean-Pierre PRUNARET	2d770067b7	hydra: ajout options pour les profils hydra	2016-10-18 13:03:49 +02:00
Jean-Pierre PRUNARET	46e61f0fed	config hydra TMP	2016-10-18 12:59:14 +02:00
Yves Dubromelle	99d5886aff	suelette de config hydra	2016-10-18 12:15:41 +02:00
Yves Dubromelle	21d7c97c76	readme: ajustement sur le bootloader	2016-10-17 12:54:27 +02:00
Yves Dubromelle	3a8a728268	lors d'une full-auto, on ne force pas à être sur la branche master	2016-10-17 11:21:05 +02:00
Jean-Pierre PRUNARET	a5aae179a2	Mettre à jour 'README.md'	2016-10-17 08:25:22 +00:00
Jean-Pierre PRUNARET	95e8687609	précision sur le channel	2016-10-17 10:19:21 +02:00
Jean-Pierre PRUNARET	8e35b38d19	Merge remote-tracking branch 'origin/master' into upgrade-16.09	2016-10-17 10:17:04 +02:00
Jean-Pierre PRUNARET	51dd0b65f4	correction régression sur hostname	2016-10-17 10:06:24 +02:00
Jean-Pierre PRUNARET	04038a7b16	fusion des dichiers README (oups)	2016-10-17 09:46:53 +02:00
Jean-Pierre PRUNARET	4fbf145c78	ajout README	2016-10-17 09:29:47 +02:00
Jean-Pierre PRUNARET	821d46befe	désactivation par défaut de x11 : doit être explicitement appelé	2016-10-17 09:29:21 +02:00
Jean-Pierre PRUNARET	807b1bc2e6	activation dbus	2016-10-16 17:28:48 +02:00
Jean-Pierre PRUNARET	4b5eacda0f	x11: paramètres non nécessaires car les valeurs par défaut sont OK	2016-10-16 01:53:42 +02:00
Jean-Pierre PRUNARET	18f960b879	Revert "x11: paramètres non nécessaires car les valeurs par défaut sont OK" This reverts commit `a8e28e594a`.	2016-10-16 01:52:49 +02:00
Jean-Pierre PRUNARET	a8e28e594a	x11: paramètres non nécessaires car les valeurs par défaut sont OK	2016-10-16 01:39:26 +02:00
Jean-Pierre PRUNARET	758e8ba84a	MaJ des nom de paquets (cf. release note)	2016-10-16 01:08:04 +02:00
Jean-Pierre PRUNARET	1d3f46c2ec	texlive nouvelle archi (2015 ...)	2016-10-16 00:10:12 +02:00
Jean-Pierre PRUNARET	3ccc8678ce	ajout outil wifi pour profil laptop	2016-10-10 22:11:44 +02:00
Yves Dubromelle	215005d927	installation des outils réseaux sur toutes les machines	2016-10-09 18:43:01 +02:00
Yves Dubromelle	9fb124116d	phenom: permet de modifier les photo + profil laptop (pour carte wifi)	2016-10-06 21:47:44 +02:00
Yves Dubromelle	d65ee1bd2c	bonnes pratiques selon nixos	2016-10-05 00:01:33 +02:00
Yves Dubromelle	dce7b12a33	ajout pmisc	2016-10-05 00:01:33 +02:00
Jean-Pierre PRUNARET	826595cb6c	radx peut imprimer	2016-09-27 23:08:04 +02:00
Jean-Pierre PRUNARET	b633d3c794	les machines @home peuvent utiliser le cache sur monstre	2016-09-27 23:07:44 +02:00
Jean-Pierre PRUNARET	5444be4fd2	copie de configuration.nix par nix dans l'environement courant	2016-09-20 15:21:48 +02:00
Jean-Pierre PRUNARET	9b4a4f1b67	ssh: ajout lien best practices	2016-09-15 15:52:15 +02:00
Jean-Pierre PRUNARET	b622554b42	ajout clef mbp pour root (car radx n'est toujours pas en route)	2016-09-15 12:08:25 +02:00
Jean-Pierre PRUNARET	332f40265d	tout le monde peut exécuter mtr sans sudo	2016-09-10 15:27:35 +02:00
Yves Dubromelle	781973228f	parce-que je m'ennuie à l'aéroport :)	2016-09-04 10:21:36 +02:00
Yves Dubromelle	65e1c6ff0e	utilisation de slock sans sudo -> wrapper setuid	2016-08-27 19:39:13 +02:00
Jean-Pierre PRUNARET	b42c8e3080	tout le monde peut faire 'sudo slock'	2016-08-27 18:11:11 +02:00
Jean-Pierre PRUNARET	adaa4eeb61	ajout de la date après un full-auto	2016-08-26 23:48:27 +02:00
Jean-Pierre PRUNARET	56d2c04cd6	app-dev: commentaires + outils git supplémentaire	2016-08-24 12:48:59 +02:00
Jean-Pierre PRUNARET	ebe63ea5e0	organisation fichier	2016-08-24 12:47:23 +02:00
Jean-Pierre PRUNARET	ea69ceba37	ajout de paquets : duff & odpdown	2016-08-24 12:31:07 +02:00
Yves Dubromelle	e8521880e1	bloc commenté pour activer le pack d'extention virtualbox	2016-08-20 09:54:46 +02:00
Yves Dubromelle	313457be31	wrapper setuid pour udevil (montage USB, smb, etc...)	2016-08-20 09:54:46 +02:00
Jean-Pierre PRUNARET	df0951ce65	ajout de commentaires	2016-08-19 19:53:59 +02:00
Jean-Pierre PRUNARET	1323e6dee1	commandes pour gérer un système de fichier temporaire en mémoire	2016-08-19 19:50:13 +02:00
Yves Dubromelle	d16271c61e	fix: monstre est censé servir de résolveur pour le LAN dubronetwork	2016-08-17 09:48:48 +02:00
Jean-Pierre PRUNARET	6c45e0bfa2	autorisation de 'sudo mtr' pour tous les users	2016-08-16 20:05:02 +02:00
Jean-Pierre PRUNARET	c2d3bb8cb4	désactivation de l'envois de mail par fail2ban. Erreur de PATH nixos	2016-08-16 20:03:49 +02:00
Jean-Pierre PRUNARET	d5c79218fa	ajout whois	2016-08-15 17:11:55 +02:00
Jean-Pierre PRUNARET	e7ef51ecbe	il faut configurer un peu plus la règle	2016-08-15 17:07:45 +02:00
Jean-Pierre PRUNARET	6c02c2200c	envois de mails lors d'un ban avec informations whois & lignes	2016-08-15 16:57:07 +02:00
Jean-Pierre PRUNARET	c8592c769e	ajout des valeurs par défaut car remplacées	2016-08-15 16:17:46 +02:00
Jean-Pierre PRUNARET	7b298ac8a3	activation règle ssh-iptable	2016-08-15 16:14:06 +02:00
Jean-Pierre PRUNARET	9190d21a65	il manquait la commande mail pour munin	2016-08-15 14:46:09 +02:00
Yves Dubromelle	b4c960d3d3	fix: quand isDesktop = true, les autres paquets n'étaient plus là	2016-08-15 02:47:53 +02:00
Jean-Pierre PRUNARET	516976ccf9	désactivation de sudo sans mot de passe	2016-08-14 11:25:32 +02:00
Jean-Pierre PRUNARET	634af07219	ajout d'assertion à users.nix	2016-08-14 10:43:41 +02:00
Jean-Pierre PRUNARET	91d414d3e1	ajustement description	2016-08-14 10:42:15 +02:00
Jean-Pierre PRUNARET	ca0171b70e	une partie des outils d'admin sont disponibles en permanence	2016-08-14 10:27:17 +02:00
Jean-Pierre PRUNARET	48361328dd	ajout de rdfind + ajout commentaires	2016-08-14 00:12:14 +02:00
Jean-Pierre PRUNARET	ee34e1a138	lancement de la commande munin (web) par 'make munin'	2016-08-12 13:06:37 +02:00
Jean-Pierre PRUNARET	ea307cc5dc	application du template	2016-08-12 12:46:36 +02:00
Jean-Pierre PRUNARET	1cce1ec034	commande pour faciliter l'application du template	2016-08-12 12:12:47 +02:00
Jean-Pierre PRUNARET	32a05e2124	MaJ template	2016-08-12 11:51:40 +02:00
Yves Dubromelle	23cb4c79a9	désactivation du cache standard pour les machines dubronetwork	2016-08-12 01:35:04 +02:00
Yves Dubromelle	160ec79b0f	désactivation de nix-serve-server sur les serveurs dubronetwork	2016-08-12 01:25:24 +02:00