annuaire: ajout variables dans template & application

Makefile

@@ -41,6 +41,9 @@ 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$$'))
 
+build-iso:
+	nix-build '<nixpkgs/nixos>' -A config.system.build.isoImage -I nixos-config=/etc/nixos/base/iso-image/livecd-minimal.nix
+
 ##--------- Commandes spécifiques pour GIT
 
 push: submodules-push

applications/graphical/adminsys.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.graphical {
@@ -12,7 +14,7 @@ mkIf cfg.graphical {
   # Paquets
   environment.systemPackages = with pkgs; [
      # Gestion de FS
-     parted       # Gestion graphique de partitions
+     gparted       # Gestion graphique de partitions
      unetbootin    # création de clefs USB bootables
   ];
 }

applications/graphical/bureau.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf profiles.isDesktopEnvironment {

applications/graphical/bureautique.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.officeSuite && cfg.graphical) {

applications/graphical/cao.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.conception-assistee && cfg.graphical) {

applications/graphical/cartographie.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.cartographie && cfg.graphical) {

applications/graphical/client-internet.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 # TODO: ménage
 mkIf (cfg.internetSuite && cfg.graphical) {

applications/graphical/default-applications.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (true && cfg.graphical) {

applications/graphical/default.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 {

applications/graphical/developpement-elm.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.developpement-elm && cfg.graphical) {

applications/graphical/developpement-haskell.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.developpement-haskell && cfg.graphical) {

applications/graphical/developpement-java.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.developpement-java && cfg.graphical) {

applications/graphical/developpement-jetbrains.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.jetbrains-licensed && cfg.graphical) {

applications/graphical/developpement-rust.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.developpement-rust && cfg.graphical) {

applications/graphical/developpement.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.developpement && cfg.graphical) {

applications/graphical/edition-musique.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.edition-musique && cfg.graphical) {

applications/graphical/edition-photo.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.edition-photo && cfg.graphical) {

applications/graphical/edition-video.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.edition-video && cfg.graphical) {

applications/graphical/jeux.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.jeux && cfg.graphical) {

applications/graphical/multimedia.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 # TODO ranger le spécifique pulseaudio

applications/graphical/network.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (true && cfg.graphical) {

applications/graphical/securite.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf (cfg.securitySuite && cfg.graphical) {

applications/terminal/adminsys.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf true {

applications/terminal/bureau.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf true {

applications/terminal/bureautique.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.officeSuite {

applications/terminal/cao.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.conception-assistee {

applications/terminal/cartographie.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.cartographie {

applications/terminal/client-internet.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 # TODO: ménage
 mkIf cfg.internetSuite {
@@ -20,5 +22,8 @@ environment.systemPackages = with pkgs; [
 
     ## Mail & Discussion (texte, audio)
     mutt
+
+    ## Sauvegarde nuagique (cloud storage)
+    rclone
   ];
 }

applications/terminal/default-applications.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf true {

applications/terminal/default.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 {

applications/terminal/developpement-elm.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.developpement-elm {

applications/terminal/developpement-haskell.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.developpement-haskell {

applications/terminal/developpement-java.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.developpement-java {

applications/terminal/developpement-jetbrains.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.jetbrains-licensed {

applications/terminal/developpement-rust.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.developpement-rust {

applications/terminal/developpement.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.developpement {

applications/terminal/edition-musique.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.edition-musique {

applications/terminal/edition-photo.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.edition-photo {

applications/terminal/edition-video.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.edition-video {

applications/terminal/jeux.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.jeux {

applications/terminal/multimedia.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.multimediaSuite {

applications/terminal/network.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf true {

applications/terminal/securite.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.securitySuite {

base.nix

@@ -5,12 +5,15 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 {
   imports = [
     # moulinette de configuration
     ./config-generator.nix
+    ./options.nix
 
     # subfolders
     ./applications/graphical/default.nix

config-generator.nix

@@ -6,6 +6,8 @@ let
   pfl = config.r6d.profiles;
   comp = config.r6d.computers;
   host = config.networking.hostName;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 {
@@ -16,7 +18,6 @@ in
   ###### interface
 
   options = {
-
     #* Utilisé pour afecter des capacités aux machines
     r6d.profiles  = {
       # Domaine
@@ -266,7 +267,7 @@ in
         kibana = true;
         nix-serve-client = true;
         nix-serve-server = true;
-        rabbitmq = true;
+        #rabbitmq = true;
         tincAddress = "192.168.12.3/24";
         tincExtraConfig = ''
           ConnectTo = monstre_dubronetwork_fr

configuration/auto-upgrade.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.auto-upgrade {

configuration/awesome.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 # TODO: rc.lua par défaut (système)

configuration/default.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 {

configuration/environment.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 # TODO: ménage

configuration/laptop.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.laptop {

configuration/localisation.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf true {

configuration/network-ipv6.nix

@@ -5,12 +5,14 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf true {
 
   # Utilisation d'adresse IPv6 temporaire
-  
+
   ## https://blog.linitx.com/control-privacy-addressing-ipv6-linux/
   ## http://www.tldp.org/HOWTO/Linux+IPv6-HOWTO/x1092.html
 

configuration/network.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf true {

configuration/udev.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf false {

iso-image/Makefile.installation

@@ -0,0 +1,7 @@
+all:
+	nixos-generate-config --root /mnt
+	git config --global user.email "nixos-live@example.org"
+	git config --global user.name "NixOS Live"
+	cd /mnt/etc/nixos && git init . && git add . && git commit -m "initial commit"
+	cd /mnt/etc/nixos && git submodule add http://gogs.prunetwork.fr:80/nixos-config/nixos-template-base.git base
+	cd /mnt/etc/nixos && git submodule add https://gogs.prunetwork.fr/Capgemini-CDS-Arkea/template-nixos.git capgemini-cmb

iso-image/configuration.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    capgemini-cmb/default.nix
+    /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+    nixos-template-base/base.nix
+  ];
+  # Custom name
+  isoImage.isoName = pkgs.lib.mkForce "${config.isoImage.isoBaseName}-capgemini-${config.system.nixosLabel}-${pkgs.stdenv.system}.iso";
+  # Avoid having the terminal flooded by kernel audit messages
+  boot.kernelParams = [ "audit=0" ];
+
+  # Files to copy to the liveCD
+  isoImage.contents = [
+    {
+      source = ./Makefile.installation;
+      target = "/custom/Makefile";
+    }
+  ];
+  environment.shellAliases = { nixos-generate-custom-config = "cd /iso/custom/ && make";};
+  networking.hostName = "nixos-livecd.corp.capgemini.com";
+}

module-template.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf true {

options.nix

@@ -0,0 +1,78 @@
+{ config, lib, pkgs, r6d, ... }:
+let
+  inherit (lib) mkEnableOption mkTextOption mkIf mkMerge mkOption singleton types;
+
+  # TODO: Anglish :)
+  machineOptions = types.submodule {
+    options = {
+
+      configuration-flags = types.submodule r6d.config-generator;
+      profiles = types.submodule r6d.profiles;
+
+      ipAddress = mkOption {
+        description = "Adresse IP";
+        type = lib.types.string;
+      };
+      nix-serve-server = mkEnableOption "nix-serve server";
+      nix-serve-client = mkEnableOption "nix-serve client";
+
+      tinc = {
+        enable = mkEnableOption "Enable tinc service";
+        connectToAddress = mkOption {
+          default = "";
+          example = "192.168.1.1";
+          description = "External address to connect from another node.";
+          type = lib.types.string;
+        };
+        vpnAddress = mkOption {
+          example = "192.168.69.69/24";
+          description = "VPN local node IP address.";
+          type = lib.types.string;
+        };
+        vpnCidrLength = mkOption {
+          default = 24;
+          example = 24;
+          description = "VPN netmask length.";
+          type = lib.types.int;
+        };
+        extraConfig = mkOption {
+          default = "";
+          example = ''
+              Mode = router
+              ConnecTo = bar
+          '';
+          description = "Configuration supplémentaire pour tinc";
+          type = lib.types.string;
+        };
+      };
+
+      windowsBoot = {
+        enable = mkEnableOption "Activation du démarrage de Windows par Grub";
+        drive = mkOption {
+          description = "Lecteur sur lequel est présent le système Windows (au format GRUB)";
+          type = lib.types.string;
+          default = "hd0,1";
+        };
+      };
+      windowsMount ={
+        enable = mkEnableOption "Montage de la partition data Windows";
+        device = mkOption {
+          description = "Lecteur sur lequel est présent le disque de data Windows";
+          type = lib.types.string;
+          default = "/dev/sda2";
+        };
+      };
+    };
+  };
+in
+
+{
+  options = {
+    r6d.machines = mkOption {
+      type = types.attrsOf machineOptions;
+      description = ''
+          Machines directory.
+      '';
+    };
+  };
+}

public/config-awesome-4-rc.lua

@@ -341,11 +341,12 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey            }, "F5", function () awful.util.spawn("spacefm") end),
     awful.key({ modkey            }, "F6", function () awful.util.spawn("vlc") end),
     awful.key({ modkey            }, "F7", function () awful.util.spawn("claws-mail") end),
+    awful.key({ modkey            }, "F11", function () awful.util.spawn("xrandr-auto") end),
     awful.key({ modkey            }, "F12", function () awful.util.spawn("slock") end),
     awful.key({ modkey, "Shift"   }, "F1", function () awful.util.spawn("claws-mail") end),
     awful.key({ modkey, "Shift"   }, "F3", function () awful.util.spawn("pcmanfm") end),
-    awful.key({ modkey            }, "F10", function () awful.util.spawn("xrandr-auto-2") end),
+    awful.key({ modkey, "Shift"   }, "F6", function () awful.util.spawn("clementine") end),
-    awful.key({ modkey            }, "F11", function () awful.util.spawn("xrandr-auto") end)
+    awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("xrandr-auto-2") end)
 --  awful.key({ modkey, "Shift"   }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-left") end),
 --  awful.key({ modkey, "Control" }, "F11", function () awful.util.spawn("/home/taeradan/bin/xrandr-right") end),
 

services/default.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 {

services/docker.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.docker {

services/elasticsearch.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.elasticsearch {

services/haveged.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf true {

services/hoogle.nix

@@ -5,12 +5,14 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.developpement-haskell {
 
   services.hoogle = {
     enable = true;
-    # port 8080
+    port = 10080;
   };
 }

services/hydra-build.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 # TODO: ménage
 mkIf cfg.hydra-builder {

services/hydra-core.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 
 
   #### https://github.com/NixOS/hydra/issues/413

services/kibana.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.kibana {

services/locate.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.locate {

services/monitoring-munin.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 # TODO: ajouter option
@@ -27,6 +29,12 @@ mkIf true {
     path = with pkgs; [ munin lm_sensors ];
     serviceConfig.TimeoutStartSec = "3min";
   };
+  users.extraUsers.munin = {
+    #extraGroups = [ "postfix" "root" ];
+    extraGroups = [ "postfix" ];
+  };
+
+  # chmod a+rX -Rv /var/lib/postfix/queue/
 
   ## Munin server -- generate /var/www/munin
   services.munin-cron = {
@@ -36,7 +44,7 @@ mkIf true {
         address 127.0.0.1
     '';
     extraGlobalConfig = ''
-      contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/public/services/munin-muttrc -s "Munin notification for ''${var:host}" jean-pierre@ocean.prunetwork.fr
+      contact.email.command ${pkgs.mutt}/bin/mutt -F /etc/nixos/base/public/services/munin-muttrc -s "Munin notification for ''${var:host}" root@prunetwork.fr
     '';
   };
 

services/print.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.print {

services/pulseaudio.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.pulseaudio {

services/scanner.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.scanner {

services/ssh.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf true {

services/virtualbox.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.virtualbox {

services/x11.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf profiles.isDesktopEnvironment {

services/xmonad/xmonad.nix

@@ -5,6 +5,8 @@ let
   cfg = config.r6d.config-generator;
   computers = config.r6d.computers;
   profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
 in
 
 mkIf cfg.xmonad {