From ddac52530badd3363d8cfe5bc5f86066492dee6a Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 24 Apr 2017 23:22:11 +0200 Subject: [PATCH] annuaire: ajout variables dans template & application --- applications/graphical/adminsys.nix | 2 ++ applications/graphical/bureau.nix | 2 ++ applications/graphical/bureautique.nix | 2 ++ applications/graphical/cao.nix | 2 ++ applications/graphical/cartographie.nix | 2 ++ applications/graphical/client-internet.nix | 2 ++ applications/graphical/default-applications.nix | 2 ++ applications/graphical/default.nix | 2 ++ applications/graphical/developpement-elm.nix | 2 ++ applications/graphical/developpement-haskell.nix | 2 ++ applications/graphical/developpement-java.nix | 2 ++ applications/graphical/developpement-jetbrains.nix | 2 ++ applications/graphical/developpement-rust.nix | 2 ++ applications/graphical/developpement.nix | 2 ++ applications/graphical/edition-musique.nix | 2 ++ applications/graphical/edition-photo.nix | 2 ++ applications/graphical/edition-video.nix | 2 ++ applications/graphical/jeux.nix | 2 ++ applications/graphical/multimedia.nix | 2 ++ applications/graphical/network.nix | 2 ++ applications/graphical/securite.nix | 2 ++ applications/terminal/adminsys.nix | 2 ++ applications/terminal/bureau.nix | 2 ++ applications/terminal/bureautique.nix | 2 ++ applications/terminal/cao.nix | 2 ++ applications/terminal/cartographie.nix | 2 ++ applications/terminal/client-internet.nix | 2 ++ applications/terminal/default-applications.nix | 2 ++ applications/terminal/default.nix | 2 ++ applications/terminal/developpement-elm.nix | 2 ++ applications/terminal/developpement-haskell.nix | 2 ++ applications/terminal/developpement-java.nix | 2 ++ applications/terminal/developpement-jetbrains.nix | 2 ++ applications/terminal/developpement-rust.nix | 2 ++ applications/terminal/developpement.nix | 2 ++ applications/terminal/edition-musique.nix | 2 ++ applications/terminal/edition-photo.nix | 2 ++ applications/terminal/edition-video.nix | 2 ++ applications/terminal/jeux.nix | 2 ++ applications/terminal/multimedia.nix | 2 ++ applications/terminal/network.nix | 2 ++ applications/terminal/securite.nix | 2 ++ base.nix | 2 ++ config-generator.nix | 2 ++ configuration/auto-upgrade.nix | 2 ++ configuration/awesome.nix | 2 ++ configuration/default.nix | 2 ++ configuration/environment.nix | 2 ++ configuration/laptop.nix | 2 ++ configuration/localisation.nix | 2 ++ configuration/network-ipv6.nix | 4 +++- configuration/network.nix | 2 ++ configuration/udev.nix | 2 ++ module-template.nix | 2 ++ services/default.nix | 2 ++ services/docker.nix | 2 ++ services/elasticsearch.nix | 2 ++ services/haveged.nix | 2 ++ services/hoogle.nix | 2 ++ services/hydra-build.nix | 2 ++ services/hydra-core.nix | 2 ++ services/kibana.nix | 2 ++ services/locate.nix | 2 ++ services/monitoring-munin.nix | 2 ++ services/print.nix | 2 ++ services/pulseaudio.nix | 2 ++ services/scanner.nix | 2 ++ services/ssh.nix | 2 ++ services/virtualbox.nix | 2 ++ services/x11.nix | 2 ++ services/xmonad/xmonad.nix | 2 ++ 71 files changed, 143 insertions(+), 1 deletion(-) diff --git a/applications/graphical/adminsys.nix b/applications/graphical/adminsys.nix index 6dd53b3..976efee 100644 --- a/applications/graphical/adminsys.nix +++ b/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 { diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix index 934d172..cd65fdf 100644 --- a/applications/graphical/bureau.nix +++ b/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 { diff --git a/applications/graphical/bureautique.nix b/applications/graphical/bureautique.nix index a826720..d7356cb 100644 --- a/applications/graphical/bureautique.nix +++ b/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) { diff --git a/applications/graphical/cao.nix b/applications/graphical/cao.nix index 3be3ed7..a0247fb 100644 --- a/applications/graphical/cao.nix +++ b/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) { diff --git a/applications/graphical/cartographie.nix b/applications/graphical/cartographie.nix index c2c91b9..4b6777f 100644 --- a/applications/graphical/cartographie.nix +++ b/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) { diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix index e6711eb..f21f33a 100644 --- a/applications/graphical/client-internet.nix +++ b/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) { diff --git a/applications/graphical/default-applications.nix b/applications/graphical/default-applications.nix index 34478cb..835474d 100644 --- a/applications/graphical/default-applications.nix +++ b/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) { diff --git a/applications/graphical/default.nix b/applications/graphical/default.nix index 315933b..2b7b2ec 100644 --- a/applications/graphical/default.nix +++ b/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 { diff --git a/applications/graphical/developpement-elm.nix b/applications/graphical/developpement-elm.nix index ab11ef5..c8cfb10 100644 --- a/applications/graphical/developpement-elm.nix +++ b/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) { diff --git a/applications/graphical/developpement-haskell.nix b/applications/graphical/developpement-haskell.nix index f118036..f7c9869 100644 --- a/applications/graphical/developpement-haskell.nix +++ b/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) { diff --git a/applications/graphical/developpement-java.nix b/applications/graphical/developpement-java.nix index 6e91238..db3664c 100644 --- a/applications/graphical/developpement-java.nix +++ b/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) { diff --git a/applications/graphical/developpement-jetbrains.nix b/applications/graphical/developpement-jetbrains.nix index 3901bb3..4962dcb 100644 --- a/applications/graphical/developpement-jetbrains.nix +++ b/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) { diff --git a/applications/graphical/developpement-rust.nix b/applications/graphical/developpement-rust.nix index 5a64ba1..05c5a3c 100644 --- a/applications/graphical/developpement-rust.nix +++ b/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) { diff --git a/applications/graphical/developpement.nix b/applications/graphical/developpement.nix index 2a07dd5..a0f5915 100644 --- a/applications/graphical/developpement.nix +++ b/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) { diff --git a/applications/graphical/edition-musique.nix b/applications/graphical/edition-musique.nix index 5f692f7..d93649f 100644 --- a/applications/graphical/edition-musique.nix +++ b/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) { diff --git a/applications/graphical/edition-photo.nix b/applications/graphical/edition-photo.nix index cdda5de..21229a8 100644 --- a/applications/graphical/edition-photo.nix +++ b/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) { diff --git a/applications/graphical/edition-video.nix b/applications/graphical/edition-video.nix index 3314453..f9e2e0d 100644 --- a/applications/graphical/edition-video.nix +++ b/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) { diff --git a/applications/graphical/jeux.nix b/applications/graphical/jeux.nix index 8ecb8da..95f869e 100644 --- a/applications/graphical/jeux.nix +++ b/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) { diff --git a/applications/graphical/multimedia.nix b/applications/graphical/multimedia.nix index 1124636..24724f0 100644 --- a/applications/graphical/multimedia.nix +++ b/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 diff --git a/applications/graphical/network.nix b/applications/graphical/network.nix index 93809df..903df52 100644 --- a/applications/graphical/network.nix +++ b/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) { diff --git a/applications/graphical/securite.nix b/applications/graphical/securite.nix index 461e836..d277b98 100644 --- a/applications/graphical/securite.nix +++ b/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) { diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix index 723cfc5..195fd5c 100644 --- a/applications/terminal/adminsys.nix +++ b/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 { diff --git a/applications/terminal/bureau.nix b/applications/terminal/bureau.nix index b72fbec..36512fc 100644 --- a/applications/terminal/bureau.nix +++ b/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 { diff --git a/applications/terminal/bureautique.nix b/applications/terminal/bureautique.nix index bb2e5f4..afbe1ae 100644 --- a/applications/terminal/bureautique.nix +++ b/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 { diff --git a/applications/terminal/cao.nix b/applications/terminal/cao.nix index ac5da71..7b9c91d 100644 --- a/applications/terminal/cao.nix +++ b/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 { diff --git a/applications/terminal/cartographie.nix b/applications/terminal/cartographie.nix index b7c80c7..16fb9e7 100644 --- a/applications/terminal/cartographie.nix +++ b/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 { diff --git a/applications/terminal/client-internet.nix b/applications/terminal/client-internet.nix index 064b6e2..ecf8926 100644 --- a/applications/terminal/client-internet.nix +++ b/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 { diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index 598975e..078c8ed 100644 --- a/applications/terminal/default-applications.nix +++ b/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 { diff --git a/applications/terminal/default.nix b/applications/terminal/default.nix index 315933b..2b7b2ec 100644 --- a/applications/terminal/default.nix +++ b/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 { diff --git a/applications/terminal/developpement-elm.nix b/applications/terminal/developpement-elm.nix index 3bfeab0..beeec39 100644 --- a/applications/terminal/developpement-elm.nix +++ b/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 { diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix index a402bf8..9f0c5ab 100644 --- a/applications/terminal/developpement-haskell.nix +++ b/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 { diff --git a/applications/terminal/developpement-java.nix b/applications/terminal/developpement-java.nix index 880d0e5..9c0e84e 100644 --- a/applications/terminal/developpement-java.nix +++ b/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 { diff --git a/applications/terminal/developpement-jetbrains.nix b/applications/terminal/developpement-jetbrains.nix index de3149e..c2c2cf6 100644 --- a/applications/terminal/developpement-jetbrains.nix +++ b/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 { diff --git a/applications/terminal/developpement-rust.nix b/applications/terminal/developpement-rust.nix index 0ff6ea1..773045d 100644 --- a/applications/terminal/developpement-rust.nix +++ b/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 { diff --git a/applications/terminal/developpement.nix b/applications/terminal/developpement.nix index 495df93..eb2ea7c 100644 --- a/applications/terminal/developpement.nix +++ b/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 { diff --git a/applications/terminal/edition-musique.nix b/applications/terminal/edition-musique.nix index f875da7..b15d8a1 100644 --- a/applications/terminal/edition-musique.nix +++ b/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 { diff --git a/applications/terminal/edition-photo.nix b/applications/terminal/edition-photo.nix index bc923df..bd63588 100644 --- a/applications/terminal/edition-photo.nix +++ b/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 { diff --git a/applications/terminal/edition-video.nix b/applications/terminal/edition-video.nix index c3ae81c..52fab1f 100644 --- a/applications/terminal/edition-video.nix +++ b/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 { diff --git a/applications/terminal/jeux.nix b/applications/terminal/jeux.nix index ae00806..c1f73a5 100644 --- a/applications/terminal/jeux.nix +++ b/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 { diff --git a/applications/terminal/multimedia.nix b/applications/terminal/multimedia.nix index 847ffe2..b0cdb10 100644 --- a/applications/terminal/multimedia.nix +++ b/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 { diff --git a/applications/terminal/network.nix b/applications/terminal/network.nix index 5432452..b40401c 100644 --- a/applications/terminal/network.nix +++ b/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 { diff --git a/applications/terminal/securite.nix b/applications/terminal/securite.nix index 20b4dcf..ad8f76b 100644 --- a/applications/terminal/securite.nix +++ b/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 { diff --git a/base.nix b/base.nix index dbfb1fb..ce874f4 100644 --- a/base.nix +++ b/base.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 { diff --git a/config-generator.nix b/config-generator.nix index dab91fb..6a1605d 100644 --- a/config-generator.nix +++ b/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 { diff --git a/configuration/auto-upgrade.nix b/configuration/auto-upgrade.nix index 48539a8..8982737 100644 --- a/configuration/auto-upgrade.nix +++ b/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 { diff --git a/configuration/awesome.nix b/configuration/awesome.nix index a6acd7e..e56d05e 100644 --- a/configuration/awesome.nix +++ b/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) diff --git a/configuration/default.nix b/configuration/default.nix index e58bd01..9db4895 100644 --- a/configuration/default.nix +++ b/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 { diff --git a/configuration/environment.nix b/configuration/environment.nix index 3b47c47..2433c8d 100644 --- a/configuration/environment.nix +++ b/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 diff --git a/configuration/laptop.nix b/configuration/laptop.nix index e9a47fb..0220193 100644 --- a/configuration/laptop.nix +++ b/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 { diff --git a/configuration/localisation.nix b/configuration/localisation.nix index 6b773b7..64eaf47 100644 --- a/configuration/localisation.nix +++ b/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 { diff --git a/configuration/network-ipv6.nix b/configuration/network-ipv6.nix index d3f9f0d..a8911d6 100644 --- a/configuration/network-ipv6.nix +++ b/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 diff --git a/configuration/network.nix b/configuration/network.nix index ed45a70..e898257 100644 --- a/configuration/network.nix +++ b/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 { diff --git a/configuration/udev.nix b/configuration/udev.nix index bc14cf9..a405d56 100644 --- a/configuration/udev.nix +++ b/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 { diff --git a/module-template.nix b/module-template.nix index c729d46..6dea158 100644 --- a/module-template.nix +++ b/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 { diff --git a/services/default.nix b/services/default.nix index c2eb2f3..9d549e8 100644 --- a/services/default.nix +++ b/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 { diff --git a/services/docker.nix b/services/docker.nix index b9594ac..56edc79 100644 --- a/services/docker.nix +++ b/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 { diff --git a/services/elasticsearch.nix b/services/elasticsearch.nix index f0718dc..1b8bb83 100644 --- a/services/elasticsearch.nix +++ b/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 { diff --git a/services/haveged.nix b/services/haveged.nix index 851b125..97a9185 100644 --- a/services/haveged.nix +++ b/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 { diff --git a/services/hoogle.nix b/services/hoogle.nix index 2442a84..8dbe1dd 100644 --- a/services/hoogle.nix +++ b/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 { diff --git a/services/hydra-build.nix b/services/hydra-build.nix index 3233fb6..d63d106 100644 --- a/services/hydra-build.nix +++ b/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 { diff --git a/services/hydra-core.nix b/services/hydra-core.nix index a145991..8a2124e 100644 --- a/services/hydra-core.nix +++ b/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 diff --git a/services/kibana.nix b/services/kibana.nix index 5b8d300..8cf4cc3 100644 --- a/services/kibana.nix +++ b/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 { diff --git a/services/locate.nix b/services/locate.nix index 73f43f3..6b3d6ef 100644 --- a/services/locate.nix +++ b/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 { diff --git a/services/monitoring-munin.nix b/services/monitoring-munin.nix index 7721e2f..499fc59 100644 --- a/services/monitoring-munin.nix +++ b/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 diff --git a/services/print.nix b/services/print.nix index de71ef2..650a7ad 100644 --- a/services/print.nix +++ b/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 { diff --git a/services/pulseaudio.nix b/services/pulseaudio.nix index cec8b10..9bfcd60 100644 --- a/services/pulseaudio.nix +++ b/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 { diff --git a/services/scanner.nix b/services/scanner.nix index 36c2713..c55b2d8 100644 --- a/services/scanner.nix +++ b/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 { diff --git a/services/ssh.nix b/services/ssh.nix index f332370..bc754bb 100644 --- a/services/ssh.nix +++ b/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 { diff --git a/services/virtualbox.nix b/services/virtualbox.nix index 5b1064c..dbacc29 100644 --- a/services/virtualbox.nix +++ b/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 { diff --git a/services/x11.nix b/services/x11.nix index 32f352e..ec29314 100644 --- a/services/x11.nix +++ b/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 { diff --git a/services/xmonad/xmonad.nix b/services/xmonad/xmonad.nix index d55f5f7..7e32dab 100644 --- a/services/xmonad/xmonad.nix +++ b/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 {