From a074cfcfa7e589ac3058ae4631b0db27eb8f1b4e Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Thu, 27 Apr 2017 22:06:12 +0200 Subject: [PATCH] EXPERIMENTAL: cfg -> flags --- applications/graphical/adminsys.nix | 6 +- applications/graphical/bureau.nix | 6 +- applications/graphical/bureautique.nix | 6 +- applications/graphical/cartographie.nix | 6 +- applications/graphical/client-internet.nix | 6 +- .../graphical/default-applications.nix | 6 +- applications/graphical/default.nix | 4 +- applications/graphical/developpement-elm.nix | 6 +- .../graphical/developpement-haskell.nix | 6 +- applications/graphical/developpement-java.nix | 6 +- .../graphical/developpement-jetbrains.nix | 6 +- applications/graphical/developpement-rust.nix | 6 +- applications/graphical/developpement.nix | 6 +- applications/graphical/edition-musique.nix | 6 +- applications/graphical/edition-photo.nix | 6 +- applications/graphical/edition-video.nix | 6 +- applications/graphical/jeux.nix | 6 +- applications/graphical/multimedia.nix | 6 +- applications/graphical/network.nix | 6 +- applications/graphical/securite.nix | 6 +- applications/terminal/adminsys.nix | 4 +- applications/terminal/bureau.nix | 4 +- applications/terminal/bureautique.nix | 6 +- applications/terminal/cao.nix | 6 +- applications/terminal/cartographie.nix | 6 +- applications/terminal/client-internet.nix | 6 +- .../terminal/default-applications.nix | 4 +- applications/terminal/default.nix | 4 +- applications/terminal/developpement-elm.nix | 6 +- .../terminal/developpement-haskell.nix | 6 +- applications/terminal/developpement-java.nix | 6 +- .../terminal/developpement-jetbrains.nix | 6 +- applications/terminal/developpement-rust.nix | 6 +- applications/terminal/developpement.nix | 6 +- applications/terminal/edition-photo.nix | 6 +- applications/terminal/edition-video.nix | 6 +- applications/terminal/jeux.nix | 6 +- applications/terminal/multimedia.nix | 6 +- applications/terminal/network.nix | 4 +- applications/terminal/securite.nix | 6 +- base.nix | 9 --- config-generator.nix | 78 +------------------ configuration/auto-upgrade.nix | 6 +- configuration/awesome.nix | 6 +- configuration/default.nix | 4 +- configuration/environment.nix | 4 +- configuration/laptop.nix | 6 +- configuration/localisation.nix | 4 +- configuration/network-ipv6.nix | 4 +- configuration/network.nix | 8 +- configuration/swap.nix | 10 +-- configuration/udev.nix | 4 +- module-template.nix | 6 +- services/default.nix | 4 +- services/docker.nix | 6 +- services/elasticsearch.nix | 6 +- services/haveged.nix | 4 +- services/hoogle.nix | 6 +- services/hydra-build.nix | 6 +- services/hydra-core.nix | 6 +- services/kibana.nix | 6 +- services/locate.nix | 6 +- services/monitoring-munin.nix | 4 +- services/print.nix | 6 +- services/pulseaudio.nix | 6 +- services/scanner.nix | 6 +- services/ssh.nix | 4 +- services/virtualbox.nix | 6 +- services/x11.nix | 6 +- services/xmonad/xmonad.nix | 6 +- 70 files changed, 126 insertions(+), 345 deletions(-) diff --git a/applications/graphical/adminsys.nix b/applications/graphical/adminsys.nix index 976efee..fd6175f 100644 --- a/applications/graphical/adminsys.nix +++ b/applications/graphical/adminsys.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.graphical { +mkIf flags.graphical { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix index cd65fdf..f0ed91c 100644 --- a/applications/graphical/bureau.nix +++ b/applications/graphical/bureau.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 { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/bureautique.nix b/applications/graphical/bureautique.nix index d7356cb..dd7b7b5 100644 --- a/applications/graphical/bureautique.nix +++ b/applications/graphical/bureautique.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.officeSuite && cfg.graphical) { +mkIf (flags.officeSuite && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/cartographie.nix b/applications/graphical/cartographie.nix index 4b6777f..0e307b4 100644 --- a/applications/graphical/cartographie.nix +++ b/applications/graphical/cartographie.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.cartographie && cfg.graphical) { +mkIf (flags.cartographie && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix index f21f33a..7883c5f 100644 --- a/applications/graphical/client-internet.nix +++ b/applications/graphical/client-internet.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.internetSuite && cfg.graphical) { +mkIf (flags.internetSuite && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/default-applications.nix b/applications/graphical/default-applications.nix index 835474d..3833fc8 100644 --- a/applications/graphical/default-applications.nix +++ b/applications/graphical/default-applications.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 (true && cfg.graphical) { +mkIf (true && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/default.nix b/applications/graphical/default.nix index 2b7b2ec..90aae1d 100644 --- a/applications/graphical/default.nix +++ b/applications/graphical/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 { diff --git a/applications/graphical/developpement-elm.nix b/applications/graphical/developpement-elm.nix index c8cfb10..e3047c0 100644 --- a/applications/graphical/developpement-elm.nix +++ b/applications/graphical/developpement-elm.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-elm && cfg.graphical) { +mkIf (flags.developpement-elm && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/developpement-haskell.nix b/applications/graphical/developpement-haskell.nix index f7c9869..ed42d5f 100644 --- a/applications/graphical/developpement-haskell.nix +++ b/applications/graphical/developpement-haskell.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 && cfg.graphical) { +mkIf (flags.developpement-haskell && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/developpement-java.nix b/applications/graphical/developpement-java.nix index db3664c..ef2e267 100644 --- a/applications/graphical/developpement-java.nix +++ b/applications/graphical/developpement-java.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-java && cfg.graphical) { +mkIf (flags.developpement-java && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/developpement-jetbrains.nix b/applications/graphical/developpement-jetbrains.nix index 4962dcb..bb1e250 100644 --- a/applications/graphical/developpement-jetbrains.nix +++ b/applications/graphical/developpement-jetbrains.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.jetbrains-licensed && cfg.graphical) { +mkIf (flags.jetbrains-licensed && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/developpement-rust.nix b/applications/graphical/developpement-rust.nix index 05c5a3c..9b41f24 100644 --- a/applications/graphical/developpement-rust.nix +++ b/applications/graphical/developpement-rust.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-rust && cfg.graphical) { +mkIf (flags.developpement-rust && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/developpement.nix b/applications/graphical/developpement.nix index a0f5915..30ea54f 100644 --- a/applications/graphical/developpement.nix +++ b/applications/graphical/developpement.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 && cfg.graphical) { +mkIf (flags.developpement && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/edition-musique.nix b/applications/graphical/edition-musique.nix index d93649f..1ccdaf8 100644 --- a/applications/graphical/edition-musique.nix +++ b/applications/graphical/edition-musique.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.edition-musique && cfg.graphical) { +mkIf (flags.edition-musique && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/edition-photo.nix b/applications/graphical/edition-photo.nix index 21229a8..14646e9 100644 --- a/applications/graphical/edition-photo.nix +++ b/applications/graphical/edition-photo.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.edition-photo && cfg.graphical) { +mkIf (flags.edition-photo && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/edition-video.nix b/applications/graphical/edition-video.nix index f9e2e0d..bccbcdb 100644 --- a/applications/graphical/edition-video.nix +++ b/applications/graphical/edition-video.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.edition-video && cfg.graphical) { +mkIf (flags.edition-video && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/jeux.nix b/applications/graphical/jeux.nix index 95f869e..14d301f 100644 --- a/applications/graphical/jeux.nix +++ b/applications/graphical/jeux.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.jeux && cfg.graphical) { +mkIf (flags.jeux && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/multimedia.nix b/applications/graphical/multimedia.nix index 24724f0..dedb031 100644 --- a/applications/graphical/multimedia.nix +++ b/applications/graphical/multimedia.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 ranger le spécifique pulseaudio -mkIf (cfg.multimediaSuite && cfg.graphical) { +mkIf (flags.multimediaSuite && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/network.nix b/applications/graphical/network.nix index 903df52..c16ed6d 100644 --- a/applications/graphical/network.nix +++ b/applications/graphical/network.nix @@ -2,14 +2,12 @@ let inherit (lib) mkIf; - 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 && cfg.graphical) { +mkIf (true && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/graphical/securite.nix b/applications/graphical/securite.nix index d277b98..acb7aaf 100644 --- a/applications/graphical/securite.nix +++ b/applications/graphical/securite.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.securitySuite && cfg.graphical) { +mkIf (flags.securitySuite && flags.graphical) { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix index 195fd5c..3dff337 100644 --- a/applications/terminal/adminsys.nix +++ b/applications/terminal/adminsys.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 { diff --git a/applications/terminal/bureau.nix b/applications/terminal/bureau.nix index 36512fc..1b24332 100644 --- a/applications/terminal/bureau.nix +++ b/applications/terminal/bureau.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 { diff --git a/applications/terminal/bureautique.nix b/applications/terminal/bureautique.nix index afbe1ae..ddfdc23 100644 --- a/applications/terminal/bureautique.nix +++ b/applications/terminal/bureautique.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.officeSuite { +mkIf flags.officeSuite { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/cao.nix b/applications/terminal/cao.nix index 7b9c91d..478d27f 100644 --- a/applications/terminal/cao.nix +++ b/applications/terminal/cao.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.conception-assistee { +mkIf flags.conception-assistee { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/cartographie.nix b/applications/terminal/cartographie.nix index 16fb9e7..3f7d4c2 100644 --- a/applications/terminal/cartographie.nix +++ b/applications/terminal/cartographie.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.cartographie { +mkIf flags.cartographie { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/client-internet.nix b/applications/terminal/client-internet.nix index ecf8926..694bae2 100644 --- a/applications/terminal/client-internet.nix +++ b/applications/terminal/client-internet.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.internetSuite { +mkIf flags.internetSuite { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index 078c8ed..efd1baf 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.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 { diff --git a/applications/terminal/default.nix b/applications/terminal/default.nix index 2b7b2ec..90aae1d 100644 --- a/applications/terminal/default.nix +++ b/applications/terminal/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 { diff --git a/applications/terminal/developpement-elm.nix b/applications/terminal/developpement-elm.nix index beeec39..d5a6bad 100644 --- a/applications/terminal/developpement-elm.nix +++ b/applications/terminal/developpement-elm.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-elm { +mkIf flags.developpement-elm { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix index 9f0c5ab..da8ac0a 100644 --- a/applications/terminal/developpement-haskell.nix +++ b/applications/terminal/developpement-haskell.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 { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/developpement-java.nix b/applications/terminal/developpement-java.nix index 9c0e84e..8c4a358 100644 --- a/applications/terminal/developpement-java.nix +++ b/applications/terminal/developpement-java.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-java { +mkIf flags.developpement-java { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/developpement-jetbrains.nix b/applications/terminal/developpement-jetbrains.nix index c2c2cf6..9d6a16c 100644 --- a/applications/terminal/developpement-jetbrains.nix +++ b/applications/terminal/developpement-jetbrains.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.jetbrains-licensed { +mkIf flags.jetbrains-licensed { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/developpement-rust.nix b/applications/terminal/developpement-rust.nix index 773045d..a477b46 100644 --- a/applications/terminal/developpement-rust.nix +++ b/applications/terminal/developpement-rust.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-rust { +mkIf flags.developpement-rust { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/developpement.nix b/applications/terminal/developpement.nix index eb2ea7c..d16838a 100644 --- a/applications/terminal/developpement.nix +++ b/applications/terminal/developpement.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 { +mkIf flags.developpement { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/edition-photo.nix b/applications/terminal/edition-photo.nix index bd63588..b775242 100644 --- a/applications/terminal/edition-photo.nix +++ b/applications/terminal/edition-photo.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.edition-photo { +mkIf flags.edition-photo { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/edition-video.nix b/applications/terminal/edition-video.nix index 52fab1f..dab9e00 100644 --- a/applications/terminal/edition-video.nix +++ b/applications/terminal/edition-video.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.edition-video { +mkIf flags.edition-video { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/jeux.nix b/applications/terminal/jeux.nix index c1f73a5..64cc212 100644 --- a/applications/terminal/jeux.nix +++ b/applications/terminal/jeux.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.jeux { +mkIf flags.jeux { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/multimedia.nix b/applications/terminal/multimedia.nix index b0cdb10..d257d50 100644 --- a/applications/terminal/multimedia.nix +++ b/applications/terminal/multimedia.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.multimediaSuite { +mkIf flags.multimediaSuite { # Paquets environment.systemPackages = with pkgs; [ diff --git a/applications/terminal/network.nix b/applications/terminal/network.nix index b40401c..88e6ff3 100644 --- a/applications/terminal/network.nix +++ b/applications/terminal/network.nix @@ -2,11 +2,9 @@ let inherit (lib) mkIf; - 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 { diff --git a/applications/terminal/securite.nix b/applications/terminal/securite.nix index ad8f76b..9327d32 100644 --- a/applications/terminal/securite.nix +++ b/applications/terminal/securite.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.securitySuite { +mkIf flags.securitySuite { # Paquets environment.systemPackages = with pkgs; [ diff --git a/base.nix b/base.nix index ce874f4..dca968c 100644 --- a/base.nix +++ b/base.nix @@ -1,14 +1,5 @@ { config, lib, pkgs, ... }: -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}"; -in - { imports = [ # moulinette de configuration diff --git a/config-generator.nix b/config-generator.nix index 6a1605d..327e29f 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -8,6 +8,7 @@ let host = config.networking.hostName; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; + flags = currentMachine.configuration-flags; in { @@ -18,83 +19,6 @@ in ###### interface options = { - #* Utilisé pour afecter des capacités aux machines - r6d.profiles = { - # Domaine - isDubronetwork = mkEnableOption "Pour distinguer les machines dubronetwork."; - isPrunetwork = mkEnableOption "Pour distinguer les machines prunetwork."; - # Utilisation machine - isDesktopEnvironment = mkEnableOption "Pour indiquer une machine avec interface graphique."; - isServer = mkEnableOption "Pour indiquer qu'il s'agit d'un serveur."; - isWorkstation = mkEnableOption "Pour indiquer que la machine sert à travailler."; - }; - - #* Utilisé dans les fichiers .nix - r6d.config-generator = { - #enable = mkEnableOption "Génération de la configuration d'une machine."; - awesome = mkEnableOption "Profil pour activer le gestionnaire de fenêtre awesome."; - auto-upgrade = mkEnableOption "Profil pour activer les mises à jour automatiques."; - cartographie = mkEnableOption "Profil pour activer les outils de gestion de données géographiques."; - conception-assistee = mkEnableOption "Profil pour activer les outils de conception électronique & modélisation 3D"; - database_postgres = mkEnableOption "Profil pour activer le SGBD PostgreSQL."; - developpement = mkEnableOption "Profil pour activer les outils de développement"; - developpement-elm = mkEnableOption "Profil pour activer les outils de développement Elm"; - developpement-haskell = mkEnableOption "Profil pour activer les outils de développement Haskell"; - developpement-java = mkEnableOption "Profil pour activer les outils de développement Java"; - developpement-rust = mkEnableOption "Profil pour activer les outils de développement Rust"; - docker = mkEnableOption "Profil pour l'utilisation de Docker."; - dovecot = mkEnableOption "Profil pour activer le serveur Dovecot."; - dns_autorite = mkEnableOption "Profil pour servir les fichiers de zone DNS."; - dns_resolveur = mkEnableOption "Profil pour activer un résolveur DNS local."; - edition-musique = mkEnableOption "Profil pour la création/édition de musique."; - edition-photo = mkEnableOption "Profil pour la création/édition de photos."; - edition-video = mkEnableOption "Profil pour la création/édition de video."; - elasticsearch = mkEnableOption "Profil pour activer le service elasticsearch."; - fail2ban = mkEnableOption "Profil pour activer Fail2ban."; - graphical = mkEnableOption "Profil pour activer les applications graphgiques."; - hydra-builder = mkEnableOption "Profil pour une machine qui compile pour hydra."; - hydra-core = mkEnableOption "Profil pour un serveur hydra."; - kibana = mkEnableOption "Profil pour activer le service kibana."; - internetSuite = mkEnableOption "Profil pour la suite de logiciels pour Internet."; - jetbrains-licensed = mkEnableOption "Profil pour la suite de développement Jetbrains payante (sous-ensemble)."; - jeux = mkEnableOption "Profil pour les jeux vidéos."; - laptop = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables."; - locate = mkEnableOption "Profil pour activer la fonction locate."; - mailboxes = mkEnableOption "Profil pour stocker les mails dans des boîtes aux lettres."; - multimediaSuite = mkEnableOption "Profil pour la suite multimédia."; - murmur = mkEnableOption "Profil pour activer un serveur Mumble (murmur)"; - nix-serve-client = mkEnableOption "Profil pour que la machine soit un client de cache nix."; - nix-serve-server = mkEnableOption "Profil pour que la machine soit un serveur de cache nix."; - nixStoreProxyCache = mkEnableOption "Profil pour activer le proxy cahce nginx pour le nix store"; - officeSuite = mkEnableOption "Profil pour la suite bureautique"; - print = mkEnableOption "Profil pour activer cups & pouvoir imprimer."; - pulseaudio = mkEnableOption "Profil pour activer pulseaudio."; - rabbitmq = mkEnableOption "Profil pour activer le service de messagerie AMQP."; - radicale = mkEnableOption "Profil pour activer le service d'hébergement de calendrier + tâches & contacts."; - scanner = mkEnableOption "Profil pour que les scanners soient utilisable."; - securitySuite = mkEnableOption "Profil pour la suite de logiciels de sécurité."; - smokeping = mkEnableOption "Profil pour activer le monitoring réseau par smokeping."; - swap = mkEnableOption "Profil pour que le swap soit activé."; - virtualbox = mkEnableOption "Profil pour l'utilisation de VirtualBox."; - xmonad = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad."; - znc = mkEnableOption "Profil pour activer le relais IRC ZNC."; - - tincAddress = mkOption { - default = ""; - example = "192.168.1.1"; - description = "Adresse du noeud tinc local"; - type = lib.types.string; - }; - tincExtraConfig = mkOption { - default = ""; - example = '' - Mode = router - ConnecTo = bar - ''; - description = "Configuration supplémentaire pour tinc"; - type = lib.types.string; - }; - }; #* Utilisé pour avoir des raccourcis de machine r6d.computers = { isHydra = mkEnableOption "Identification du nom de machine."; diff --git a/configuration/auto-upgrade.nix b/configuration/auto-upgrade.nix index 8982737..96ae83a 100644 --- a/configuration/auto-upgrade.nix +++ b/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 diff --git a/configuration/awesome.nix b/configuration/awesome.nix index e56d05e..2eb007f 100644 --- a/configuration/awesome.nix +++ b/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 diff --git a/configuration/default.nix b/configuration/default.nix index 9db4895..be1322e 100644 --- a/configuration/default.nix +++ b/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 { diff --git a/configuration/environment.nix b/configuration/environment.nix index 2433c8d..90c8191 100644 --- a/configuration/environment.nix +++ b/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 diff --git a/configuration/laptop.nix b/configuration/laptop.nix index 0220193..1099461 100644 --- a/configuration/laptop.nix +++ b/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 diff --git a/configuration/localisation.nix b/configuration/localisation.nix index 64eaf47..98d3e85 100644 --- a/configuration/localisation.nix +++ b/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 { diff --git a/configuration/network-ipv6.nix b/configuration/network-ipv6.nix index a8911d6..90a151c 100644 --- a/configuration/network-ipv6.nix +++ b/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 { diff --git a/configuration/network.nix b/configuration/network.nix index e898257..0e3f5dd 100644 --- a/configuration/network.nix +++ b/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 = { diff --git a/configuration/swap.nix b/configuration/swap.nix index 44cdfd0..7e200cc 100644 --- a/configuration/swap.nix +++ b/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) diff --git a/configuration/udev.nix b/configuration/udev.nix index a405d56..b473bc0 100644 --- a/configuration/udev.nix +++ b/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 { diff --git a/module-template.nix b/module-template.nix index 6dea158..0353644 100644 --- a/module-template.nix +++ b/module-template.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; + cannuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; + flags = currentMachine.configuration-flags; in mkIf true { diff --git a/services/default.nix b/services/default.nix index 9d549e8..0d72833 100644 --- 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 { diff --git a/services/docker.nix b/services/docker.nix index 56edc79..76c9531 100644 --- 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; [ diff --git a/services/elasticsearch.nix b/services/elasticsearch.nix index 1b8bb83..7c69723 100644 --- 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; [ diff --git a/services/haveged.nix b/services/haveged.nix index 97a9185..01d3f3a 100644 --- 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 { diff --git a/services/hoogle.nix b/services/hoogle.nix index 8dbe1dd..b38dcf3 100644 --- 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; diff --git a/services/hydra-build.nix b/services/hydra-build.nix index d63d106..add6631 100644 --- 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; [ diff --git a/services/hydra-core.nix b/services/hydra-core.nix index 8a2124e..bdc38f2 100644 --- 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; [ diff --git a/services/kibana.nix b/services/kibana.nix index 8cf4cc3..04a16ff 100644 --- 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; [ diff --git a/services/locate.nix b/services/locate.nix index 6b3d6ef..27a3ad9 100644 --- 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 = { diff --git a/services/monitoring-munin.nix b/services/monitoring-munin.nix index 499fc59..10c2ec7 100644 --- 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 diff --git a/services/print.nix b/services/print.nix index 650a7ad..df6c7fd 100644 --- 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. diff --git a/services/pulseaudio.nix b/services/pulseaudio.nix index 9bfcd60..c69ac5a 100644 --- 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 = { diff --git a/services/scanner.nix b/services/scanner.nix index c55b2d8..89ba84f 100644 --- 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; [ diff --git a/services/ssh.nix b/services/ssh.nix index bc754bb..94b049f 100644 --- 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 { diff --git a/services/virtualbox.nix b/services/virtualbox.nix index dbacc29..6a91607 100644 --- 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; [ diff --git a/services/x11.nix b/services/x11.nix index ec29314..e7b4870 100644 --- 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. diff --git a/services/xmonad/xmonad.nix b/services/xmonad/xmonad.nix index 7e32dab..49f306e 100644 --- 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; [