annuaire: ajout variables dans template & application

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 {

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 {

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

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,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.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 {

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

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

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

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 {