ajout hindent

This reverts commit 7afafa7863.

Makefile

@@ -1 +0,0 @@
-base/Makefile

Makefile

@@ -0,0 +1,85 @@
+GSF=git submodule foreach
+
+all: rebuild-switch
+	date
+##--------- Commandes spécifiques pour NixOS
+
+clean:
+	nix-collect-garbage -d --delete-older-than 15d
+
+clean-aggressive:
+	nix-collect-garbage -d --delete-older-than 1d
+
+clean-total:
+	nix-collect-garbage -d
+
+clean-log:
+	journalctl --vacuum-size=1G
+
+full-auto: submodules-update upgrade clean optimise
+	@date
+
+optimise:
+	nix-store --optimise
+
+rebuild-switch:
+	nixos-rebuild switch --fallback  --show-trace
+
+show-roots:
+	nix-store --gc --print-roots
+
+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
+	#$(GSF) git co master
+	$(GSF) git ff
+	$(GSF) git gc --auto
+
+submodules-push:
+	$(GSF) git push --all
+	$(GSF) git push --tags
+
+submodules-tag:
+	$(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)"
+
+##--------- 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
+

README

@@ -1,5 +0,0 @@
-
-# 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

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
+

base.nix

@@ -1,10 +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
 
 {
   imports = [
     # recettes
     ./base/base.nix
     ./desktop/desktop.nix
+    ./public/public.nix
 
     # moulinette de configuration
     ./config-generator.nix

base/Makefile

@@ -1,48 +0,0 @@
-all: rebuild-switch
-	date
-
-clean:
-	nix-collect-garbage -d --delete-older-than 15d
-
-clean-aggressive:
-	nix-collect-garbage -d --delete-older-than 1d
-
-clean-total:
-	nix-collect-garbage -d
-
-clean-log:
-	journalctl --vacuum-size=1G
-
-full-auto: submodules-update upgrade clean optimise
-
-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
-
-submodules-update:
-	#git submodule update --remote
-	git submodule foreach git co master
-	git submodule foreach git ff
-
-submodules-push:
-	git submodule foreach git push --all
-	git submodule foreach git push --tags
-
-submodules-tag:
-	git submodule foreach git tag -f "$$(date +%F)-$$(hostname -s)"
-
-tag: submodules-tag
-	git tag -f "$$(date +%F)-$$(hostname -s)"
-
-upgrade:
-	nixos-rebuild switch --upgrade --fallback --show-trace
-

base/Makefile

@@ -0,0 +1 @@
+/etc/nixos/base/Makefile

base/activation-manuelle/auto-upgrade.nix

@@ -1,12 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-  cfg = config.r6d.config-generator;
-in {
-  # Automatic update & automatic clean
-
-  system.autoUpgrade.enable = cfg.auto-upgrade;
-  nix.gc.automatic = cfg.auto-upgrade;
-}

base/activation-manuelle/fail2ban.nix

@@ -1,37 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-  cfg = config.r6d.config-generator;
-in {
-  # Gestion de fail2ban
-  
-  services = mkIf cfg.fail2ban {
-    fail2ban = {
-      enable = true;
-      jails = {
-        DEFAULT = ''
-          # "ignoreip" can be an IP address, a CIDR mask or a DNS host
-          ignoreip = 127.0.0.1/8 pedro.dubronetwork.fr cube.dubronetwork.fr voyage.prunetwork.fr xray.prunetwork.fr 192.168.0.0/16 172.16.0.0/16
-
-          # 1 jour
-          # bantime  = 86400
-          # 5 jours 
-          bantime  = 432000
-          maxretry = 3
-
-          #
-          # Destination email address used solely for the interpolations in
-          # jail.{conf,local} configuration files.
-          destemail = admins@dubronetwork.fr
-        '';
-        ssh-route = ''
-          filter   = sshd
-          action   = route[blocktype=blackhole]
-          maxretry = 3
-        '';
-      };
-    };
-  };
-}

base/activation-manuelle/laptop.nix

@@ -1,10 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-  cfg = config.r6d.config-generator;
-in {
-  # Gestion spécifique pour PC portable
-  powerManagement.cpuFreqGovernor = mkIf cfg.laptop "powersave";
-}

base/activation-manuelle/locate.nix

@@ -1,15 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-  cfg = config.r6d.config-generator;
-in {
-  imports = [
-  ];
-
-  services.locate = {
-    enable = cfg.locate;
-    interval = "hourly";
-  };
-}

base/activation-manuelle/nix-serve-client.nix

@@ -1,24 +1,25 @@
 { config, lib, pkgs, ... }:
 
 let
-  inherit (lib) mkIf mkMerge;
+  inherit (lib) mkIf mkMerge mkThenElse;
-  profiles = config.r6d.profiles;
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
-in {
+  profiles = config.r6d.profiles;
-  nix = mkIf config.r6d.config-generator.nix-serve-client {
+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.isMonstre)) "http://192.168.10.169:5000")
-      (mkIf profiles.isDubronetwork "http://192.168.10.252:5000")
 
-      (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
+    connect-timeout = 5
     '';
-    };
+  };
-
+}
-  }

base/activation-manuelle/nix-serve-server.nix

@@ -1,12 +1,31 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
-
-with pkgs.lib;
 
 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;
+  # Services
-  networking.firewall.allowedTCPPorts = mkIf cfg.nix-serve-server [ 5000 ];
+  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
+    '';
+  };
 }

base/activation-manuelle/service-fail2ban.nix

@@ -0,0 +1,64 @@
+{ 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 {
+
+  # Gestion de fail2ban
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    mailutils
+    whois
+  ];
+
+
+  # Services
+  services = {
+    fail2ban = {
+      enable = true;
+      jails = {
+        DEFAULT = ''
+          # "ignoreip" can be an IP address, a CIDR mask or a DNS host
+          ignoreip = 127.0.0.1/8 ${ignoreip}
+
+          # 1 jour
+          # bantime  = 86400
+          # 5 jours 
+          bantime  = 432000
+
+          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]
+        '';
+        # 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";
+}

base/base.nix

@@ -1,22 +1,20 @@
-{ 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 = [
-    ./environment.nix
+    ./network-dns.nix
-    ./localisation.nix
-    ./monitoring.nix
-    ./networking.nix
-    ./services.nix
 
     # inclusion conditionnelle
-    ./activation-manuelle/auto-upgrade.nix
+    ./activation-manuelle/service-fail2ban.nix
-    ./activation-manuelle/laptop.nix
-    ./activation-manuelle/locate.nix
-    ./activation-manuelle/fail2ban.nix
     ./activation-manuelle/nix-serve-client.nix
     ./activation-manuelle/nix-serve-server.nix
-    ./activation-manuelle/print.nix
-    ./activation-manuelle/swap.nix
     ./activation-manuelle/users.nix
   ];
 }

base/monitoring.nix

@@ -1,28 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
-{
-  ## Munin server -- generate /var/www/munin
-  services.munin-cron = {
-    enable = true;
-    hosts = ''
-      [${config.networking.hostName}]
-        address localhost
-    '';
-    extraGlobalConfig = ''
-      contact.email.command mail -s "Munin notification for ''${var:host}" hostmaster@prunetwork.fr
-    '';
-  };
-
-  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
-}

base/network-dns.nix

@@ -0,0 +1,22 @@
+{ 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 = [
+      "dubronetwork.fr"
+      "prunetwork.fr"
+      "teleragno.fr"
+      "teleragno.net"
+    ];
+    dnsExtensionMechanism = true;
+  };
+}

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,51 +16,84 @@ in
       #* Utilisé pour afecter des capacités aux machines
       r6d.profiles  = {
         # Domaine
-        isDubronetwork  = mkEnableOption "Pour distinguer les machines dubronetwork.";
+        isDubronetwork        = mkEnableOption "Pour distinguer les machines dubronetwork.";
-        isPrunetwork    = mkEnableOption "Pour distinguer les machines prunetwork.";
+        isPrunetwork          = mkEnableOption "Pour distinguer les machines prunetwork.";
         # Utilisation machine
-        isDesktop       = mkEnableOption "Pour indiquer une machine avec interface graphique.";
+        isDesktop             = mkEnableOption "Pour indiquer une machine avec interface graphique.";
-        isHome          = mkEnableOption "Pour indiquer que la machine sert à la maison (divertissement & autre).";
+        isHome                = mkEnableOption "Pour indiquer que la machine sert à la maison (divertissement & autre).";
-        isServer        = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur.";
+        isServer              = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur.";
-        isWorkstation   = mkEnableOption "Pour indiquer que la machine sert à travailler.";
+        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.";
+        enable                = mkEnableOption "Génération de la configuration d'une machine.";
-        awesome         = mkEnableOption "Profil pour activer le gestionnaire de fenêtre awesome.";
+        awesome               = mkEnableOption "Profil pour activer le gestionnaire de fenêtre awesome.";
-        auto-upgrade    = mkEnableOption "Profil pour activer les mises à jour automatiques.";
+        auto-upgrade          = mkEnableOption "Profil pour activer les mises à jour automatiques.";
-        conception-assistee = mkEnableOption "Profil pour activer les outils de conception électronique & modélisation 3D";
+        cartographie          = mkEnableOption "Profil pour activer les outils de gestion de données géographiques.";
-        database_postgres=mkEnableOption "Profil pour activer le SGBD PostgreSQL.";
+        conception-assistee   = mkEnableOption "Profil pour activer les outils de conception électronique & modélisation 3D";
-        developpement   = mkEnableOption "Profil pour activer les outils de développement";
+        database_postgres     = mkEnableOption "Profil pour activer le SGBD PostgreSQL.";
-        docker          = mkEnableOption "Profil pour l'utilisation de Docker.";
+        developpement         = mkEnableOption "Profil pour activer les outils de développement";
-        dns_autorite    = mkEnableOption "Profil pour servir les fichiers de zone DNS.";
+        developpement-haskell = mkEnableOption "Profil pour activer les outils de développement Haskell";
-        dns_resolveur   = mkEnableOption "Profil pour activer un résolveur DNS local.";
+        developpement-java    = mkEnableOption "Profil pour activer les outils de développement Java";
-        fail2ban        = mkEnableOption "Profil pour activer Fail2ban.";
+        developpement-rust    = mkEnableOption "Profil pour activer les outils de développement Rust";
-        jeux            = mkEnableOption "Profil pour les jeux vidéos.";
+        docker                = mkEnableOption "Profil pour l'utilisation de Docker.";
-        laptop          = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables..";
+        dovecot               = mkEnableOption "Profil pour activer le serveur Dovecot.";
-        locate          = mkEnableOption "Profil pour activer la fonction locate.";
+        dns_autorite          = mkEnableOption "Profil pour servir les fichiers de zone DNS.";
-        murmur          = mkEnableOption "Profil pour activer un serveur Mumble (murmur)";
+        dns_resolveur         = mkEnableOption "Profil pour activer un résolveur DNS local.";
-        nix-serve-client= mkEnableOption "Profil pour que la machine soit un client de cache nix.";
+        edition-musique       = mkEnableOption "Profil pour la création/édition de musique.";
-        nix-serve-server= mkEnableOption "Profil pour que la machine soit un serveur de cache nix.";
+        edition-photo         = mkEnableOption "Profil pour la création/édition de photos.";
-        online-ipv6     = mkEnableOption "Profil pour activer l'IPv6 de online.net";
+        edition-video         = mkEnableOption "Profil pour la création/édition de video.";
-        print           = mkEnableOption "Profil pour activer cups & pouvoir imprimer.";
+        elasticsearch         = mkEnableOption "Profil pour activer le service elasticsearch.";
-        rabbitmq        = mkEnableOption "Profil pour activer le service de messagerie AMQP.";
+        fail2ban              = mkEnableOption "Profil pour activer Fail2ban.";
-        swap            = mkEnableOption "Profil pour que le swap soit activé.";
+        hydra-builder         = mkEnableOption "Profil pour une machine qui compile pour hydra.";
-        virtualbox      = mkEnableOption "Profil pour l'utilisation de VirtualBox.";
+        hydra-core            = mkEnableOption "Profil pour un serveur hydra.";
-        xmonad          = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad.";
+        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.";
+        isLatitude  = mkEnableOption "Identification du nom de machine.";
-        isMonstre       = mkEnableOption "Identification du nom de machine.";
+        isMonstre   = mkEnableOption "Identification du nom de machine.";
-        isNeoNomade     = mkEnableOption "Identification du nom de machine.";
+        isNeoNomade = mkEnableOption "Identification du nom de machine.";
-        isNomade        = mkEnableOption "Identification du nom de machine.";
+        isNomade    = mkEnableOption "Identification du nom de machine.";
-        isOcean         = mkEnableOption "Identification du nom de machine.";
+        isOcean     = mkEnableOption "Identification du nom de machine.";
-        isPhenom        = mkEnableOption "Identification du nom de machine.";
+        isPedro     = mkEnableOption "Identification du nom de machine.";
-        isRadx          = mkEnableOption "Identification du nom de machine.";
+        isPhenom    = mkEnableOption "Identification du nom de machine.";
-        isRollo         = mkEnableOption "Identification du nom de machine.";
+        isRadx      = mkEnableOption "Identification du nom de machine.";
-        isXray          = mkEnableOption "Identification du nom de machine.";
+        isRollo     = mkEnableOption "Identification du nom de machine.";
       };
     };
 
@@ -78,10 +110,10 @@ in
         isNeoNomade = host == "neo-nomade.dubronetwork.fr";
         isNomade    = host == "nomade.dubronetwork.fr";
         isOcean     = host == "ocean.prunetwork.fr";
+        isPedro     = host == "pedro.dubronetwork.fr";
         isPhenom    = host == "phenom.dubronetwork.fr";
         isRadx      = host == "radx.prunetwork.fr";
         isRollo     = host == "rollo.dubronetwork.fr";
-        isXray      = host == "xray.prunetwork.fr";
       };
     }
 
@@ -91,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;
@@ -109,7 +142,7 @@ in
       };
     })
     # /!\ PAS un serveur
-    (mkIf (!pfl.isServer) {
+    (mkIf (!pfl.isServer || comp.isMonstre) {
       r6d.config-generator = {
         dns_resolveur = true;
       };
@@ -118,7 +151,6 @@ in
       r6d.profiles.isDesktop = true;
 
       r6d.config-generator = {
-        developpement = true;
         docker = true;
       };
     })
@@ -127,18 +159,22 @@ in
     (mkIf pfl.isDubronetwork {
       r6d.config-generator = {
         auto-upgrade = true;
+        locate = true;
         print = true;
       };
     })
-    (mkIf (pfl.isDubronetwork && pfl.isHome) {
-      r6d.config-generator.jeux = 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;
       };
@@ -148,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
@@ -163,25 +215,32 @@ in
 
       r6d.config-generator = {
         docker = true;
+        radicale = true;
+        tincAddress = "192.168.12.6/24";
+        tincExtraConfig = ''
+          ConnectTo = rollo_dubronetwork_fr
+          '';
       };
     })
     (mkIf comp.isRadx {
       r6d.profiles = {
         isHome = true;
         isPrunetwork = true;
-        isServer = true;
         isWorkstation = true;
       };
 
       r6d.config-generator = {
-        nix-serve-server = true;
+        elasticsearch = true;
-        virtualbox = true;
+        hydra-builder = true;
-      };
+        hydra-core = true;
-    })
+        kibana = true;
-    (mkIf comp.isXray {
+        rabbitmq = true;
-      r6d.profiles = {
+        tincAddress = "192.168.12.3/24";
-        isPrunetwork = true;
+        tincExtraConfig = ''
-        isServer = true;
+          ConnectTo = monstre_dubronetwork_fr
+          ConnectTo = rollo_dubronetwork_fr
+          ConnectTo = ocean_prunetwork_fr
+          '';
       };
     })
 
@@ -193,7 +252,15 @@ 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
+          '';
+        nix-serve-server = true;
       };
     })
     (mkIf comp.isMonstre {
@@ -202,7 +269,18 @@ in
         isServer = true;
       };
 
-      r6d.config-generator.fail2ban = true;
+      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{
       r6d.profiles = {
@@ -212,6 +290,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{
@@ -221,6 +305,16 @@ in
         laptop = true;
       };
     })
+    (mkIf comp.isPedro {
+      r6d.profiles = {
+        isDubronetwork = true;
+        isServer = true;
+      };
+
+      r6d.config-generator = {
+        fail2ban = true;
+      };
+    })
     (mkIf comp.isPhenom {
       r6d.profiles = {
         isDubronetwork = true;
@@ -229,7 +323,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 {
@@ -239,9 +342,15 @@ in
       };
 
       r6d.config-generator = {
+        dovecot = true;
         fail2ban = true;
+        mailboxes = true;
         murmur = true;
-        online-ipv6 = true;
+        tincAddress = "192.168.12.5/24";
+        tincExtraConfig = ''
+          ConnectTo = ocean_prunetwork_fr
+          '';
+        znc = true;
       };
     })
   ];

desktop/activation-manuelle/app-developpement.nix

@@ -1,44 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
-in
-
-mkIf cfg.developpement {
-
-  environment.systemPackages = with pkgs; [
-    # Base de données
-    pgadmin
-    sqlitebrowser
-
-    # Développement
-    cloc
-    idea.idea-community
-    gcc           # pour les appels depuis les scripts
-
-    # Documentation
-    zeal
-
-    ## Gestion des sources
-    # git       # déjà présent dans "base"
-    git-cola
-    mercurial
-    subversion
-
-    ## Haskell
-    ghc
-    stack
-
-    ## Rust
-    cargo       # récupération des dépendances + compilation projet rust
-    rustPlatform.rustc
-
-    ## Visualisation & outils de diff
-    gource
-    meld
-    vbindiff    # diff de fichier hexadecimaux avec vim
-  ];
-}

desktop/activation-manuelle/laptop.nix

@@ -1,25 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
-
-in mkIf cfg.laptop {
-  # Paquets spécifiques pour un ordinateur portable
-
-  ## Activation d'un gestionnaire de réseau
-  networking.networkmanager.enable = true;
-
-  hardware.bluetooth.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    networkmanagerapplet
-  ];
-
-  services.xserver.synaptics = {
-    enable = true;
-    twoFingerScroll = true;
-  };
-}

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 {
+mkIf cfg.xmonad {
-  # Paquets spécifiques pour xmonad
 
-  environment.systemPackages = with pkgs;[
+  # Paquets
+  environment.systemPackages = with pkgs; [
     dmenu
     haskellPackages.xmobar
   ];
 
+  # Services
   services.xserver.windowManager.xmonad = {
     enable = true;
     enableContribAndExtras = true;

desktop/app-adminsys.nix

@@ -1,43 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
-in
-
-mkIf profiles.isDesktop {
-
-  environment.systemPackages = with pkgs; [
-    # Adminsys
-    iotop
-    lm_sensors
-    lshw
-    lsof
-    ntp
-    powerline-fonts
-    powertop
-    python27Packages.ansible2
-    python27Packages.glances
-    usbutils
-
-    # DNS
-    unbound
-
-    # Compression
-    lz4
-    lzop
-
-    # Système de fichier
-    curlftpfs
-    gparted
-    inotify-tools
-    nfs-utils
-    ntfs3g
-    sshfsFuse
-
-    #
-    unetbootin    # création de clefs USB bootables
-  ];
-}

desktop/app-multimedia.nix

@@ -1,42 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
-in
-
-mkIf profiles.isDesktop {
-
-  environment.systemPackages = with pkgs; [
-    # Multimedia
-
-    ## Audio
-    audacity      # montage audio
-    beep
-    cmus          # lecteur audio console
-    easytag       # gestion des métadonnées des fichiers musicaux
-    picard        # gestion des métadonnées des fichiers musicaux
-    espeak        # synthèse vocale
-    paprefs       # préferences pulseaudio
-    pavucontrol   # mixer pulseaudio
-    vorbis-tools  # codec
-
-    ## Video
-    smplayer      # lecteur vidéo
-    vlc           # lecteur vidéo
-
-    ## Photo & Dessin vectoriel
-    exif
-    exiftags
-    gimp          # logiciel d'édition/montage/retouche photo
-    inkscape      # édition d'image vectorielle (svg & autre)
-    imagemagick   # modification image en CLI
-    kde4.ksnapshot
-    rawtherapee   # développemen de photos en RAW
-
-    ### TEST d'outil de gestion de catalogue de photos
-    kde4.digikam  # gestionnaire de bibliothèque de photo
-  ];
-}

desktop/desktop.nix

@@ -1,107 +1,67 @@
-{ 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
 
 {
   imports = [                   # applications :
     # commandées par config-generator
-    ./activation-manuelle/app-awesome.nix # pour les profils awesome
-    ./activation-manuelle/app-cao.nix     # de conception assisté par ordinateur & modélisation
-    ./activation-manuelle/app-developpement.nix # utilisée pour développer des programmes/scripts
-    ./activation-manuelle/app-docker.nix  # pour activer docker
-    ./activation-manuelle/app-jeux.nix    # permettant de jouer ;)
-    ./activation-manuelle/app-virtualbox.nix # pour exploiter virtualbox
-    ./activation-manuelle/laptop.nix      # appli & configuration adaptée pour un PC portable$
     ./activation-manuelle/xmonad/xmonad.nix      # gestionnaire de fenêtres xmonad
-    # installées systématiquement
-    ./desktop-minimal.nix
-    ./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, ...)
-    # A ajouter dans config-generator & revoir le contenu pour le mettre si nécessaire dans minimal
-    ./app-cartographie.nix      # utilisée pour manipuler les données géographiques & cartes
-    ./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, ...)
   ];
 
+  # Paquets
   environment.systemPackages = with pkgs; mkIf profiles.isDesktop [
     # Environement de bureau
-    wmname        # pour définir le nom du gestionnaire de fenêtre (utile pour java)
+    arandr          # interface graphique pour xrandr
-    kde4.ksnapshot# capture d'écran
+    wmname          # pour définir le nom du gestionnaire de fenêtre (utile pour java)
+    #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'
+    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
+    pcmanfm         # gestionnaire de fichiers graphique
-    spaceFM       # gestionnaire de fichiers graphique
+    spaceFM         # gestionnaire de fichiers graphique
-    vifm          # gestionnaire de fichiers basé sur VIM (console)
+    vifm            # gestionnaire de fichiers basé sur VIM (console)
 
     ## Terminal
-    sakura        # terminal
+    sakura          # terminal
 
     # A trier
     cowsay
-    fgallery      # générateur de gallerie statique http://www.thregr.org/~wavexx/software/fgallery/
+    fgallery        # générateur de gallerie statique http://www.thregr.org/~wavexx/software/fgallery/
     samba
-    taskwarrior   # gestionnaire de tâches en console
+    taskwarrior     # gestionnaire de tâches en console
-    udevil        # pour le montage des media amovibles
+    udevil          # pour le montage des media amovibles
-    xclip         # manipulation du clipboard X depuis la console
+    xclip           # manipulation du clipboard X depuis la console
+  ];
+
+  # Polices supplémentaires
+  fonts.fonts = with pkgs; mkIf profiles.isDesktop [
+    fira            # police créée pour Firefox
+    fira-code       # idem fira-mono + ligatures pour la programmation
+    fira-mono       # dérivée de fira en monospace
+    hack-font       # police monospace créée explicitement pour coder
   ];
 
   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; };
   };
 
-  # Enable the X11 windowing system.
+  security.setuidPrograms = [ "udevil" ];
-  services.xserver = mkIf profiles.isDesktop {
-    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"
-    MatchIsPointer "on"
-    MatchDevicePath "/dev/input/event*"
-    Driver "evdev"
-    # Physical button #s:     A b D - - - - B C    b = A & D simultaneously;   - = no button
-    #Option "ButtonMapping" "1 8 3 4 5 6 7 2 2"   #  For right-hand placement
-    #Option "ButtonMapping" "3 8 1 4 5 6 7 2 2"   #  For left-hand placement
-
-    # EmulateWheel refers to emulating a mouse wheel using Marble Mouse trackball.
-    Option "EmulateWheel" "true"
-    Option "EmulateWheelButton" "8"   # Factory default; use "9" for left-side placement.
-
-    # EmulateWheelInertia specifies how far (in pixels) the pointer must move to
-    # generate button press/release events in wheel emulation mode.
-    Option "EmulateWheelInertia" "10" # Factory default: 50
-
-    Option "ZAxisMapping" "4 5"
-    Option "XAxisMapping" "6 7"       # Disable this for vertical-only scrolling.
-    # Emulate3Buttons refers to the act of pressing buttons A and D
-    # simultaneously to emulate a middle-click or wheel click.
-    Option "Emulate3Buttons" "true"   # Factory default.
-    ''];
-  };
-  
-  # Pulse Audio
-  hardware.pulseaudio = mkIf profiles.isDesktop {
-    enable = true;
-    support32Bit = true;
-  };
-  environment.etc."pulse/daemon.conf".text = "flat-volumes = no";
 }

module-template.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 true {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+  ];
+
+  # Services
+
+  # Réseau
+  networking.firewall = {
+    allowedTCPPorts = [
+    ];
+    allowedUDPPorts = [
+    ];
+  };
+}

public/app-adminsys.nix

@@ -0,0 +1,57 @@
+{ 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 {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    # Adminsys
+    iotop
+    lm_sensors
+    lshw
+    lsof
+    ntp
+    powerline-fonts
+    powertop
+    python27Packages.ansible2
+    python27Packages.glances
+    usbutils
+
+    # Backup
+    duplicity     # création de sauvegarde chiffrées (GPG)
+
+    # Compression
+    lz4
+    lzop
+
+    # Système de fichier
+    ## Montage de filesystem
+    curlftpfs     # ftp
+    exfat         # Pour monter les FAT avec Fuse
+    hubicfuse     # montage hubic
+    ntfs3g        # ntfs
+    sshfsFuse     # ssh
+
+    ## 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
+    )
+  ];
+}

public/app-awesome.nix

@@ -1,11 +1,13 @@
 { 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.awesome {
+in
+
+mkIf cfg.awesome {
 
   environment.variables = {
     # Export the current path for the awesome derivation, useful for users rc.lua

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
+    aspell aspellDicts.fr # correction d'ortographe
-    dia
+    gnumeric      # tableur
-    gnumeric
+    #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

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

public/app-cartographie.nix

@@ -1,20 +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
 
-mkIf profiles.isDesktop {
+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
   ];
 }

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,17 +9,23 @@ in
 
 mkIf profiles.isDesktop {
 
+# Paquets
 environment.systemPackages = with pkgs; [
     # Clients Internet
 
-    ## Navigateur & Réseaux sociaux
+    ## Navigateur
     chromium
     firefox
-    python27Packages.turses # client twitter en ncurse
+
+    ## Réseaux sociaux
+    #python27Packages.turses           # client twitter en ncurse
+    python27Packages.rainbowstream    # client twitter en console
+    rtv                               # client reddit en console
 
     ## Mail & Discussion (texte, audio)
     clawsMail
-    kde5.quasselClient
+    hexchat
+    quasselClient
     mumble
     mutt
     pidgin

public/app-developpement-haskell.nix

@@ -0,0 +1,26 @@
+{ 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
+    haskellPackages.hindent
+
+    # Application perso
+    haskellPackages.hahp
+  ];
+}

public/app-developpement-java.nix

@@ -1,15 +1,20 @@
 { 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 cfg.developpement-java {
 
+  # Paquets
   environment.systemPackages = with pkgs; [
+    # IDE
+    idea.idea-community # IntelliJ IDEA
 
+    # Java
+    maven
   ];
 }

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

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

public/app-developpement.nix

@@ -0,0 +1,42 @@
+{ 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 {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    # Base de données
+    pgadmin             # interface d'administration de postgres
+    sqlitebrowser       # interface d'administration de sqlite
+
+    # C / C++
+    gcc                 # pour les appels depuis les scripts
+
+    # Documentation
+    #zeal                # consulter la documentation hors ligne
+
+    # 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
+
+    # Mono
+    #mono46              # interpréteur .NET
+
+    ## Visualisation & outils de diff
+    #gource              # visualisation en mouvement de l'historique git
+    meld                # outil de comparaison graphique
+    #vbindiff           # diff de fichier hexadecimaux avec vim
+  ];
+}

public/app-docker.nix

@@ -1,13 +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
 
-in mkIf cfg.docker {
+mkIf cfg.docker {
 
+  # Paquets
   environment.systemPackages = with pkgs; [
     # Ecosystème Docker
     docker

public/app-edition-musique.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.edition-musique {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    #
+    audacity      # montage audio
+    easytag       # gestion des métadonnées des fichiers musicaux
+    picard        # gestion des métadonnées des fichiers musicaux
+  ];
+}

public/app-edition-photo.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.edition-photo {
+
+  # Paquets
+environment.systemPackages = with pkgs; [
+    # Méta données
+    exif
+    exiftags
+
+    # Retouche, modification & dessin vectoriel
+    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
+
+    # TEST d'outil de gestion de catalogue de photos
+    #kde4.digikam  # gestionnaire de bibliothèque de photo
+  ];
+}

public/app-edition-video.nix

@@ -1,18 +1,18 @@
 { 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.virtualbox {
+mkIf cfg.edition-video {
 
+  # Paquets
   environment.systemPackages = with pkgs; [
-    linuxPackages.virtualbox
+    # Vidéo
-    linuxPackages.virtualboxGuestAdditions
+    #cinelerra     # editeur video
+    pitivi        # montage vidéo
   ];
-
-  virtualisation.virtualbox.host.enable = true;
 }
-

public/app-jeux.nix

@@ -1,13 +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
 
-in mkIf cfg.jeux {
+mkIf cfg.jeux {
 
+  # Paquets
   environment.systemPackages = with pkgs; [
     # Jeux
     urbanterror

public/app-multimedia.nix

@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf profiles.isDesktop {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    # Multimedia
+
+    ## Audio
+    beep
+    cmus          # lecteur audio console
+    espeak        # synthèse vocale
+    paprefs       # préferences pulseaudio
+    pavucontrol   # mixer pulseaudio
+    vorbis-tools  # codec
+
+    ## Video
+    smplayer      # lecteur vidéo
+    vlc           # lecteur vidéo
+  ];
+}

public/app-network.nix

@@ -7,31 +7,31 @@ 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
     iptraf-ng     # outil de mesure de la qualité du réseau
     nload         # affichage de statisques d'utilisation instantannées du réseau
     telnet
-    #vsftpd       # serveur FTP
 
     ## Diagnostic
     arp-scan
-    wireshark
+    nmap          # outil de scan de port réseau
+    mtr           # outil de diagnostic réseau
+    #wireshark
     whois
-
-    ## Routage
-    quagga        # daemon de routage
-
-    ## Tunnel
-    # openvpn
-    tinc
   ];
 
   networking.firewall = {
-    allowedTCPPorts = [5201]; # iperf
+    allowedTCPPorts = [
-    allowedUDPPorts = [5201]; # iperf
+      5201 # iperf
+    ];
+    allowedUDPPorts = [
+      5201 # iperf
+    ];
   };
 }

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

public/app-virtualbox.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.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;
+}

public/auto-upgrade.nix

@@ -0,0 +1,16 @@
+{ 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.auto-upgrade {
+
+  # Automatic update & automatic clean
+
+  system.autoUpgrade.enable = true;
+  nix.gc.automatic = true;
+}

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

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

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:
+  # Lancement de dbus pour les utilisateurs
-  # $ nix-env -qaP | grep wget
+  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;

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 = [
+    ];
+  };
+}

public/laptop.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.laptop {
+
+  # Gestion spécifique pour PC portable
+
+  ## Gestion de l'énergie
+  powerManagement.cpuFreqGovernor = "powersave";
+
+  ## Activation d'un gestionnaire de réseau
+  networking.networkmanager.enable = true;
+
+  hardware.bluetooth.enable = true;
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    networkmanagerapplet    # gestionnaire réseau graphique + console (nm-applet + nmtui)
+    wirelesstools           # fournis iwconfig
+  ];
+}

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

public/network-ipv6.nix

@@ -1,16 +1,13 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
-  # Définition des domaines utilisés lorsque un identifiant non-FQDN est donné (ping, nslookup)
+  inherit (lib) mkIf mkMerge mkThenElse;
-  networking = {
+  cfg = config.r6d.config-generator;
-    search = [
+  computers = config.r6d.computers;
-      "dubronetwork.fr"
+  profiles = config.r6d.profiles;
-      "prunetwork.fr"
+in
-      "teleragno.fr"
+
-      "teleragno.net"
+mkIf true {
-    ];
-    dnsExtensionMechanism = true;
-  };
 
   # Utilisation d'adresse IPv6 temporaire
   
@@ -25,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;
+  };
 }

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;
+  };
+}

public/print.nix

@@ -1,12 +1,17 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
-
-with pkgs.lib;
 
 let
+  inherit (lib) mkIf mkMerge mkThenElse;
   cfg = config.r6d.config-generator;
-in {
+  computers = config.r6d.computers;
-  # Enable CUPS to print documents.
+  profiles = config.r6d.profiles;
-  services.printing = mkIf cfg.print {
+in
+
+mkIf cfg.print {
+
+  # Services
+  ## Enable CUPS to print documents.
+  services.printing = {
     enable = true;
     drivers = [
       pkgs.samsung-unified-linux-driver

public/public.nix

@@ -0,0 +1,61 @@
+{ 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          # 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, ...)
+    ./hardware-scanner.nix          # utilisation d'un scanner
+    ./service-pulseaudio.nix        # activation du serveur audio
+    ./service-x11.nix               # activation du serveur graphique X
+  ];
+}

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 = [
+    ];
+  };
+}

public/service-haveged.nix

@@ -0,0 +1,21 @@
+{ 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 {
+
+  # 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
+  services.haveged = {
+    enable = true;
+    refill_threshold = 2048;
+  };
+}

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"
+    ];
+  };
+}

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";
+  };
+}

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 = [
+    ];
+  };
+}

public/service-laptop.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.laptop {
+
+  # Gestion spécifique pour PC portable
+
+  # Services
+  services.xserver.synaptics = {
+    enable = true;
+    twoFingerScroll = true;
+  };
+}

public/service-locate.nix

@@ -0,0 +1,17 @@
+{ 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.locate {
+
+  # Services
+  services.locate = {
+    enable = true;
+    interval = "hourly";
+  };
+}

public/service-monitoring.nix

@@ -0,0 +1,46 @@
+{ 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 {
+
+  # Paquets
+  environment.systemPackages = with pkgs; [
+    bc
+    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
+  services.munin-cron = {
+    enable = true;
+    hosts = ''
+      [${config.networking.hostName}]
+        address 127.0.0.1
+    '';
+    extraGlobalConfig = ''
+      contact.email.command mail -s "Munin notification for ''${var:host}" root@${config.networking.hostName}
+    '';
+  };
+
+  # Réseau
+  networking.firewall = {
+    allowedTCPPorts = [
+      #8000
+    ];
+    allowedUDPPorts = [
+    ];
+  };
+}

public/service-pulseaudio.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 profiles.isDesktop {
+
+  # Pulse Audio
+  hardware.pulseaudio = {
+    enable = true;
+    support32Bit = true;
+  };
+  environment.etc."pulse/daemon.conf".text = "flat-volumes = no";
+}

public/service-ssh.nix

@@ -1,19 +1,20 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
-  # Sécurité & Acces distant
+  inherit (lib) mkIf mkMerge mkThenElse;
+  cfg = config.r6d.config-generator;
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
 
-  ## Augmentation de l'entropie du système par un générateur de nombres aléatoires
+mkIf true {
-  ## cat /proc/sys/kernel/random/entropy_avail
-  services.haveged = {
-    enable = true;
-    refill_threshold = 2048;
-  };
 
+  # 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
@@ -27,12 +28,4 @@
       UsePrivilegeSeparation sandbox
     '';
   };
-
-  # Monitoring
-
-  ## Noeud de supervision munin = pas de stockage des données locales
-
-  services.munin-node = {
-    enable = true;
-  };
 }

public/service-x11.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 profiles.isDesktop {
+
+  # Services
+  # Enable the X11 windowing system.
+  services.xserver = {
+    #enable = true;
+    layout = "fr";
+    xkbOptions = "eurosign:e";
+    displayManager.lightdm.enable = true;
+    windowManager.awesome.enable = true;
+    inputClassSections = [''
+    Identifier  "Marble Mouse"
+    MatchProduct "Logitech USB Trackball"
+    MatchIsPointer "on"
+    MatchDevicePath "/dev/input/event*"
+    Driver "evdev"
+    # Physical button #s:     A b D - - - - B C    b = A & D simultaneously;   - = no button
+    #Option "ButtonMapping" "1 8 3 4 5 6 7 2 2"   #  For right-hand placement
+    #Option "ButtonMapping" "3 8 1 4 5 6 7 2 2"   #  For left-hand placement
+
+    # EmulateWheel refers to emulating a mouse wheel using Marble Mouse trackball.
+    Option "EmulateWheel" "true"
+    Option "EmulateWheelButton" "8"   # Factory default; use "9" for left-side placement.
+
+    # EmulateWheelInertia specifies how far (in pixels) the pointer must move to
+    # generate button press/release events in wheel emulation mode.
+    Option "EmulateWheelInertia" "10" # Factory default: 50
+
+    Option "ZAxisMapping" "4 5"
+    Option "XAxisMapping" "6 7"       # Disable this for vertical-only scrolling.
+    # Emulate3Buttons refers to the act of pressing buttons A and D
+    # simultaneously to emulate a middle-click or wheel click.
+    Option "Emulate3Buttons" "true"   # Factory default.
+    ''];
+  };
+}

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
+  '';
+}

public/swap.nix

@@ -1,14 +1,18 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
-
-with pkgs.lib;
 
 let
+  inherit (lib) mkIf mkMerge mkThenElse;
   cfg = config.r6d.config-generator;
-in {
+  computers = config.r6d.computers;
+  profiles = config.r6d.profiles;
+in
+
+mkIf cfg.swap {
+
   # Gestion du swap
   
   # https://en.wikipedia.org/wiki/Swappiness
-  boot.kernel.sysctl = mkIf cfg.swap {
+  boot.kernel.sysctl = {
     # le swap est activé (!= 0)
     # le swap est utilisé lorsque (100 - x) % de la mémoire est déja allouée
     "vm.swappiness" = 10;

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"
+  '';
+
+}