EXPERIMENTAL: cfg -> flags

2017-04-27 22:06:12 +02:00
parent 7f8563f32b
commit a074cfcfa7
70 changed files with 126 additions and 345 deletions
--- a/services/default.nix
+++ b/services/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

 {
--- a/services/docker.nix
+++ b/services/docker.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.docker {
+mkIf flags.docker {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/elasticsearch.nix
+++ b/services/elasticsearch.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.elasticsearch {
+mkIf flags.elasticsearch {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/haveged.nix
+++ b/services/haveged.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 {
--- a/services/hoogle.nix
+++ b/services/hoogle.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.developpement-haskell {
+mkIf flags.developpement-haskell {

  services.hoogle = {
    enable = true;
--- a/services/hydra-build.nix
+++ b/services/hydra-build.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
 # TODO: ménage
-mkIf cfg.hydra-builder {
+mkIf flags.hydra-builder {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/hydra-core.nix
+++ b/services/hydra-core.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;


  #### https://github.com/NixOS/hydra/issues/413
@@ -25,7 +23,7 @@ let
  # hydra-queue-runner --status | json_pp
 in
 # TODO: passe de ménage
-mkIf cfg.hydra-core {
+mkIf flags.hydra-core {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/kibana.nix
+++ b/services/kibana.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.kibana {
+mkIf flags.kibana {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/locate.nix
+++ b/services/locate.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.locate {
+mkIf flags.locate {

  # Services
  services.locate = {
--- a/services/monitoring-munin.nix
+++ b/services/monitoring-munin.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: ajouter option
--- a/services/print.nix
+++ b/services/print.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.print {
+mkIf flags.print {

  # Services
  ## Enable CUPS to print documents.
--- a/services/pulseaudio.nix
+++ b/services/pulseaudio.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.pulseaudio {
+mkIf flags.pulseaudio {

  # Pulse Audio
  hardware.pulseaudio = {
--- a/services/scanner.nix
+++ b/services/scanner.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.scanner {
+mkIf flags.scanner {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/ssh.nix
+++ b/services/ssh.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 {
--- a/services/virtualbox.nix
+++ b/services/virtualbox.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.virtualbox {
+mkIf flags.virtualbox {

  # Paquets
  environment.systemPackages = with pkgs; [
--- a/services/x11.nix
+++ b/services/x11.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 profiles.isDesktopEnvironment {
+mkIf currentMachine.profiles.isDesktopEnvironment {

  # Services
  # Enable the X11 windowing system.
--- a/services/xmonad/xmonad.nix
+++ b/services/xmonad/xmonad.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.xmonad {
+mkIf flags.xmonad {

  # Paquets
  environment.systemPackages = with pkgs; [