annuaire: ajout variables dans template & application

2017-04-24 23:22:11 +02:00
parent fe6f3136f7
commit ddac52530b
71 changed files with 143 additions and 1 deletions
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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

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