EXPERIMENTAL: cfg -> flags

configuration/auto-upgrade.nix

@@ -2,14 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.auto-upgrade {
+mkIf flags.auto-upgrade {
 
   # Automatic update & automatic clean
 

configuration/awesome.nix

@@ -2,15 +2,13 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 # TODO: rc.lua par défaut (système)
-mkIf cfg.awesome {
+mkIf flags.awesome {
 
   environment.variables = {
     # Export the current path for the awesome derivation, useful for users rc.lua

configuration/default.nix

@@ -2,11 +2,9 @@
 
 let
   #inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 {

configuration/environment.nix

@@ -2,11 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 # TODO: ménage

configuration/laptop.nix

@@ -2,14 +2,12 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.laptop {
+mkIf flags.laptop {
 
   # Gestion spécifique pour PC portable
 

configuration/localisation.nix

@@ -2,11 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {

configuration/network-ipv6.nix

@@ -2,11 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {

configuration/network.nix

@@ -2,11 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf true {
@@ -14,8 +12,8 @@ mkIf true {
   # fix: Hostname -s renvoie "Unknown host" alors que hostname renvoie la bonne valeur
   #      Il s'avère que hostname vérifie la validité du FQDN et du reverse.
   #      Fixer ces paramètres dans les hosts permet de faire tomber en marche
-  networking.extraHosts = ''                                                                                                                                                                                                                                                 
-    127.0.0.1   ${config.networking.hostName}                                                                                                                                                                                                                             
+  networking.extraHosts = ''
+    127.0.0.1   ${config.networking.hostName}
   '';
 
   boot.kernel.sysctl = {

configuration/swap.nix

@@ -2,15 +2,15 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
+  annuaire = config.r6d.machines;
+  currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
-mkIf cfg.swap {
+mkIf flags.swap {
 
   # Gestion du swap
-  
+
   # https://en.wikipedia.org/wiki/Swappiness
   boot.kernel.sysctl = {
     # le swap est activé (!= 0)

configuration/udev.nix

@@ -2,11 +2,9 @@
 
 let
   inherit (lib) mkIf mkMerge mkThenElse;
-  cfg = config.r6d.config-generator;
-  computers = config.r6d.computers;
-  profiles = config.r6d.profiles;
   annuaire = config.r6d.machines;
   currentMachine = annuaire."${config.networking.hostName}";
+  flags = currentMachine.configuration-flags;
 in
 
 mkIf false {