From ac91ce4492100da422c1412a1d9d9bbec7adcfeb Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Wed, 31 May 2017 00:23:10 +0200 Subject: [PATCH] =?UTF-8?q?regroupement=20des=20options=20=C3=A9parses=20e?= =?UTF-8?q?n=20configurationOptions=20et=20renommage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 +- .../graphical/default-applications.nix | 2 +- applications/graphical/default.nix | 2 +- applications/graphical/developpement-elm.nix | 2 +- .../graphical/developpement-haskell.nix | 2 +- applications/graphical/developpement-java.nix | 2 +- .../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 +- .../terminal/default-applications.nix | 2 +- applications/terminal/default.nix | 2 +- applications/terminal/developpement-elm.nix | 2 +- .../terminal/developpement-haskell.nix | 2 +- applications/terminal/developpement-java.nix | 2 +- .../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 +- 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 | 2 +- configuration/network.nix | 2 +- configuration/swap.nix | 2 +- configuration/udev.nix | 2 +- lib.nix | 7 ++--- module-template.nix | 2 +- options.nix | 29 ++++++++++--------- 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 +- services/yubikey.nix | 2 +- 74 files changed, 91 insertions(+), 89 deletions(-) diff --git a/applications/graphical/adminsys.nix b/applications/graphical/adminsys.nix index fd6175f..a94b723 100644 --- a/applications/graphical/adminsys.nix +++ b/applications/graphical/adminsys.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.graphical { diff --git a/applications/graphical/bureau.nix b/applications/graphical/bureau.nix index f0ed91c..252fe10 100644 --- a/applications/graphical/bureau.nix +++ b/applications/graphical/bureau.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf currentMachine.profiles.isDesktopEnvironment { diff --git a/applications/graphical/bureautique.nix b/applications/graphical/bureautique.nix index dd7b7b5..160d6c2 100644 --- a/applications/graphical/bureautique.nix +++ b/applications/graphical/bureautique.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.officeSuite && flags.graphical) { diff --git a/applications/graphical/cao.nix b/applications/graphical/cao.nix index 2945ce0..a3d2a6d 100644 --- a/applications/graphical/cao.nix +++ b/applications/graphical/cao.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.conception-assistee && flags.graphical) { diff --git a/applications/graphical/cartographie.nix b/applications/graphical/cartographie.nix index 0e307b4..4c3d269 100644 --- a/applications/graphical/cartographie.nix +++ b/applications/graphical/cartographie.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.cartographie && flags.graphical) { diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix index a49b6ec..5f9edf1 100644 --- a/applications/graphical/client-internet.nix +++ b/applications/graphical/client-internet.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in # TODO: ménage mkIf (flags.internetSuite && flags.graphical) { diff --git a/applications/graphical/default-applications.nix b/applications/graphical/default-applications.nix index 3833fc8..659131d 100644 --- a/applications/graphical/default-applications.nix +++ b/applications/graphical/default-applications.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (true && flags.graphical) { diff --git a/applications/graphical/default.nix b/applications/graphical/default.nix index 90aae1d..3fa8a5a 100644 --- a/applications/graphical/default.nix +++ b/applications/graphical/default.nix @@ -4,7 +4,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in { diff --git a/applications/graphical/developpement-elm.nix b/applications/graphical/developpement-elm.nix index e3047c0..f37bc7b 100644 --- a/applications/graphical/developpement-elm.nix +++ b/applications/graphical/developpement-elm.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.developpement-elm && flags.graphical) { diff --git a/applications/graphical/developpement-haskell.nix b/applications/graphical/developpement-haskell.nix index ed42d5f..353322b 100644 --- a/applications/graphical/developpement-haskell.nix +++ b/applications/graphical/developpement-haskell.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.developpement-haskell && flags.graphical) { diff --git a/applications/graphical/developpement-java.nix b/applications/graphical/developpement-java.nix index ef2e267..2b830f3 100644 --- a/applications/graphical/developpement-java.nix +++ b/applications/graphical/developpement-java.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.developpement-java && flags.graphical) { diff --git a/applications/graphical/developpement-jetbrains.nix b/applications/graphical/developpement-jetbrains.nix index bb1e250..b42320a 100644 --- a/applications/graphical/developpement-jetbrains.nix +++ b/applications/graphical/developpement-jetbrains.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.jetbrains-licensed && flags.graphical) { diff --git a/applications/graphical/developpement-rust.nix b/applications/graphical/developpement-rust.nix index 9b41f24..0b6f0b4 100644 --- a/applications/graphical/developpement-rust.nix +++ b/applications/graphical/developpement-rust.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.developpement-rust && flags.graphical) { diff --git a/applications/graphical/developpement.nix b/applications/graphical/developpement.nix index 93a7435..1389237 100644 --- a/applications/graphical/developpement.nix +++ b/applications/graphical/developpement.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.developpement && flags.graphical) { diff --git a/applications/graphical/edition-musique.nix b/applications/graphical/edition-musique.nix index 1ccdaf8..2d04441 100644 --- a/applications/graphical/edition-musique.nix +++ b/applications/graphical/edition-musique.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.edition-musique && flags.graphical) { diff --git a/applications/graphical/edition-photo.nix b/applications/graphical/edition-photo.nix index 14646e9..e0573ad 100644 --- a/applications/graphical/edition-photo.nix +++ b/applications/graphical/edition-photo.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.edition-photo && flags.graphical) { diff --git a/applications/graphical/edition-video.nix b/applications/graphical/edition-video.nix index bccbcdb..61f9a2b 100644 --- a/applications/graphical/edition-video.nix +++ b/applications/graphical/edition-video.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.edition-video && flags.graphical) { diff --git a/applications/graphical/jeux.nix b/applications/graphical/jeux.nix index 14d301f..d426081 100644 --- a/applications/graphical/jeux.nix +++ b/applications/graphical/jeux.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.jeux && flags.graphical) { diff --git a/applications/graphical/multimedia.nix b/applications/graphical/multimedia.nix index dedb031..b76387d 100644 --- a/applications/graphical/multimedia.nix +++ b/applications/graphical/multimedia.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in # TODO ranger le spécifique pulseaudio diff --git a/applications/graphical/network.nix b/applications/graphical/network.nix index c16ed6d..15969e0 100644 --- a/applications/graphical/network.nix +++ b/applications/graphical/network.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (true && flags.graphical) { diff --git a/applications/graphical/securite.nix b/applications/graphical/securite.nix index acb7aaf..543c611 100644 --- a/applications/graphical/securite.nix +++ b/applications/graphical/securite.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf (flags.securitySuite && flags.graphical) { diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix index 3dff337..34068b1 100644 --- a/applications/terminal/adminsys.nix +++ b/applications/terminal/adminsys.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf true { diff --git a/applications/terminal/bureau.nix b/applications/terminal/bureau.nix index 1b24332..02337b1 100644 --- a/applications/terminal/bureau.nix +++ b/applications/terminal/bureau.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf true { diff --git a/applications/terminal/bureautique.nix b/applications/terminal/bureautique.nix index ddfdc23..21bc344 100644 --- a/applications/terminal/bureautique.nix +++ b/applications/terminal/bureautique.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.officeSuite { diff --git a/applications/terminal/cao.nix b/applications/terminal/cao.nix index 478d27f..30f33c9 100644 --- a/applications/terminal/cao.nix +++ b/applications/terminal/cao.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.conception-assistee { diff --git a/applications/terminal/cartographie.nix b/applications/terminal/cartographie.nix index 3f7d4c2..f748045 100644 --- a/applications/terminal/cartographie.nix +++ b/applications/terminal/cartographie.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.cartographie { diff --git a/applications/terminal/client-internet.nix b/applications/terminal/client-internet.nix index 694bae2..cd85ecf 100644 --- a/applications/terminal/client-internet.nix +++ b/applications/terminal/client-internet.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in # TODO: ménage mkIf flags.internetSuite { diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix index 5674eba..e0566f0 100644 --- a/applications/terminal/default-applications.nix +++ b/applications/terminal/default-applications.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf true { diff --git a/applications/terminal/default.nix b/applications/terminal/default.nix index 90aae1d..3fa8a5a 100644 --- a/applications/terminal/default.nix +++ b/applications/terminal/default.nix @@ -4,7 +4,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in { diff --git a/applications/terminal/developpement-elm.nix b/applications/terminal/developpement-elm.nix index d5a6bad..01a604b 100644 --- a/applications/terminal/developpement-elm.nix +++ b/applications/terminal/developpement-elm.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.developpement-elm { diff --git a/applications/terminal/developpement-haskell.nix b/applications/terminal/developpement-haskell.nix index 2dd123e..f65e4c8 100644 --- a/applications/terminal/developpement-haskell.nix +++ b/applications/terminal/developpement-haskell.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.developpement-haskell { diff --git a/applications/terminal/developpement-java.nix b/applications/terminal/developpement-java.nix index 8c4a358..354a193 100644 --- a/applications/terminal/developpement-java.nix +++ b/applications/terminal/developpement-java.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.developpement-java { diff --git a/applications/terminal/developpement-jetbrains.nix b/applications/terminal/developpement-jetbrains.nix index 9d6a16c..ff91e67 100644 --- a/applications/terminal/developpement-jetbrains.nix +++ b/applications/terminal/developpement-jetbrains.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.jetbrains-licensed { diff --git a/applications/terminal/developpement-rust.nix b/applications/terminal/developpement-rust.nix index a477b46..40a6750 100644 --- a/applications/terminal/developpement-rust.nix +++ b/applications/terminal/developpement-rust.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.developpement-rust { diff --git a/applications/terminal/developpement.nix b/applications/terminal/developpement.nix index d16838a..e9026bf 100644 --- a/applications/terminal/developpement.nix +++ b/applications/terminal/developpement.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.developpement { diff --git a/applications/terminal/edition-musique.nix b/applications/terminal/edition-musique.nix index be79ce2..cead741 100644 --- a/applications/terminal/edition-musique.nix +++ b/applications/terminal/edition-musique.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.edition-musique { diff --git a/applications/terminal/edition-photo.nix b/applications/terminal/edition-photo.nix index b775242..dc14969 100644 --- a/applications/terminal/edition-photo.nix +++ b/applications/terminal/edition-photo.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.edition-photo { diff --git a/applications/terminal/edition-video.nix b/applications/terminal/edition-video.nix index 76bfc93..19b2bfa 100644 --- a/applications/terminal/edition-video.nix +++ b/applications/terminal/edition-video.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.edition-video { diff --git a/applications/terminal/jeux.nix b/applications/terminal/jeux.nix index 64cc212..2f1aa79 100644 --- a/applications/terminal/jeux.nix +++ b/applications/terminal/jeux.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.jeux { diff --git a/applications/terminal/multimedia.nix b/applications/terminal/multimedia.nix index d257d50..717b9fb 100644 --- a/applications/terminal/multimedia.nix +++ b/applications/terminal/multimedia.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.multimediaSuite { diff --git a/applications/terminal/network.nix b/applications/terminal/network.nix index 88e6ff3..1dc77b7 100644 --- a/applications/terminal/network.nix +++ b/applications/terminal/network.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf true { diff --git a/applications/terminal/securite.nix b/applications/terminal/securite.nix index 9327d32..a03980e 100644 --- a/applications/terminal/securite.nix +++ b/applications/terminal/securite.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.securitySuite { diff --git a/config-generator.nix b/config-generator.nix index 99b1805..c2ab058 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -8,7 +8,7 @@ let host = config.networking.hostName; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in { diff --git a/configuration/auto-upgrade.nix b/configuration/auto-upgrade.nix index 96ae83a..04ff7f5 100644 --- a/configuration/auto-upgrade.nix +++ b/configuration/auto-upgrade.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.auto-upgrade { diff --git a/configuration/awesome.nix b/configuration/awesome.nix index 2eb007f..c6d0a3f 100644 --- a/configuration/awesome.nix +++ b/configuration/awesome.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in # TODO: rc.lua par défaut (système) diff --git a/configuration/default.nix b/configuration/default.nix index be1322e..a9984a1 100644 --- a/configuration/default.nix +++ b/configuration/default.nix @@ -4,7 +4,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in { diff --git a/configuration/environment.nix b/configuration/environment.nix index 90c8191..f29117e 100644 --- a/configuration/environment.nix +++ b/configuration/environment.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in # TODO: ménage diff --git a/configuration/laptop.nix b/configuration/laptop.nix index 1099461..7e69cd3 100644 --- a/configuration/laptop.nix +++ b/configuration/laptop.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.laptop { diff --git a/configuration/localisation.nix b/configuration/localisation.nix index 98d3e85..aa0c60a 100644 --- a/configuration/localisation.nix +++ b/configuration/localisation.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf true { diff --git a/configuration/network-ipv6.nix b/configuration/network-ipv6.nix index 90a151c..36c2425 100644 --- a/configuration/network-ipv6.nix +++ b/configuration/network-ipv6.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf true { diff --git a/configuration/network.nix b/configuration/network.nix index 0e3f5dd..ec84c69 100644 --- a/configuration/network.nix +++ b/configuration/network.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf true { diff --git a/configuration/swap.nix b/configuration/swap.nix index 7e200cc..602fdd5 100644 --- a/configuration/swap.nix +++ b/configuration/swap.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.swap { diff --git a/configuration/udev.nix b/configuration/udev.nix index b473bc0..bbdb94b 100644 --- a/configuration/udev.nix +++ b/configuration/udev.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf false { diff --git a/lib.nix b/lib.nix index 7d907ec..cd96259 100644 --- a/lib.nix +++ b/lib.nix @@ -5,13 +5,13 @@ let isDesktopEnvironment = { awesome = true; internetSuite = true; + graphical = true; multimediaSuite = true; officeSuite = true; pulseaudio = true; securitySuite = true; }; isWorkstation = { - graphical = true; docker = true; }; #isServer = { @@ -27,9 +27,8 @@ with lib; rec{ # Apply the profiles (pre-defined + custom) to a machine applyProfilesToMachine = customProfiles: machineName: machineOptions: - { configuration-flags = lib.recursiveUpdate (generateFlagsSet customProfiles machineOptions.profiles) machineOptions.configuration-flags; - ipAddress = machineOptions.ipAddress; - tinc = machineOptions.tinc; + { configurationFlags = lib.recursiveUpdate (generateFlagsSet customProfiles machineOptions.profiles) machineOptions.configurationFlags; + configurationOptions = machineOptions.configurationOptions; profiles = machineOptions.profiles; }; diff --git a/module-template.nix b/module-template.nix index 8de5a75..4efc539 100644 --- a/module-template.nix +++ b/module-template.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf true { diff --git a/options.nix b/options.nix index 2b7cf0b..ddc011f 100644 --- a/options.nix +++ b/options.nix @@ -6,7 +6,7 @@ let machineOptions = types.submodule { options = { - configuration-flags = { + configurationFlags = { #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."; @@ -57,15 +57,7 @@ let znc = mkEnableOption "Profil pour activer le relais IRC ZNC."; }; - 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."; - }; + configurationOptions = { ipAddress = mkOption { description = "Adresse IP"; @@ -128,11 +120,22 @@ let }; }; }; + + 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."; + }; + }; }; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in { @@ -151,8 +154,8 @@ in */ assertions = [ { - assertion = (currentMachine.profiles.isWorkstation && (currentMachine.profiles.isDesktopEnvironment == true)) - || (!currentMachine.profiles.isWorkstation); + assertion = (currentMachine.profiles.isDesktopEnvironment && (currentMachine.configurationFlags.graphical == true)) + || (!currentMachine.profiles.isDesktopEnvironment); message = "A workstation requires a graphical environement."; } { diff --git a/services/default.nix b/services/default.nix index 1caa947..6de2f9e 100644 --- a/services/default.nix +++ b/services/default.nix @@ -4,7 +4,7 @@ let #inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in { diff --git a/services/docker.nix b/services/docker.nix index 76c9531..b6607cd 100644 --- a/services/docker.nix +++ b/services/docker.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.docker { diff --git a/services/elasticsearch.nix b/services/elasticsearch.nix index 7c69723..f3f4974 100644 --- a/services/elasticsearch.nix +++ b/services/elasticsearch.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.elasticsearch { diff --git a/services/haveged.nix b/services/haveged.nix index 01d3f3a..35a272c 100644 --- a/services/haveged.nix +++ b/services/haveged.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf true { diff --git a/services/hoogle.nix b/services/hoogle.nix index b38dcf3..cb8760f 100644 --- a/services/hoogle.nix +++ b/services/hoogle.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.developpement-haskell { diff --git a/services/hydra-build.nix b/services/hydra-build.nix index 43ccdce..066242a 100644 --- a/services/hydra-build.nix +++ b/services/hydra-build.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in # TODO: ménage mkIf flags.hydra-builder { diff --git a/services/hydra-core.nix b/services/hydra-core.nix index bdc38f2..b59e242 100644 --- a/services/hydra-core.nix +++ b/services/hydra-core.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; #### https://github.com/NixOS/hydra/issues/413 diff --git a/services/kibana.nix b/services/kibana.nix index 04a16ff..b002ef3 100644 --- a/services/kibana.nix +++ b/services/kibana.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.kibana { diff --git a/services/locate.nix b/services/locate.nix index 27a3ad9..adac879 100644 --- a/services/locate.nix +++ b/services/locate.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.locate { diff --git a/services/monitoring-munin.nix b/services/monitoring-munin.nix index 74b5cbd..4063376 100644 --- a/services/monitoring-munin.nix +++ b/services/monitoring-munin.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in # TODO: changer adresse mail diff --git a/services/print.nix b/services/print.nix index df6c7fd..1362bac 100644 --- a/services/print.nix +++ b/services/print.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.print { diff --git a/services/pulseaudio.nix b/services/pulseaudio.nix index c69ac5a..e0c7e9c 100644 --- a/services/pulseaudio.nix +++ b/services/pulseaudio.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.pulseaudio { diff --git a/services/scanner.nix b/services/scanner.nix index 89ba84f..e78ec55 100644 --- a/services/scanner.nix +++ b/services/scanner.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.scanner { diff --git a/services/ssh.nix b/services/ssh.nix index 94b049f..8c13f95 100644 --- a/services/ssh.nix +++ b/services/ssh.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf true { diff --git a/services/virtualbox.nix b/services/virtualbox.nix index 6a91607..8d5e874 100644 --- a/services/virtualbox.nix +++ b/services/virtualbox.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.virtualbox { diff --git a/services/x11.nix b/services/x11.nix index b2acd10..acf108d 100644 --- a/services/x11.nix +++ b/services/x11.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in /** diff --git a/services/xmonad/xmonad.nix b/services/xmonad/xmonad.nix index 49f306e..2f1768c 100644 --- a/services/xmonad/xmonad.nix +++ b/services/xmonad/xmonad.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf flags.xmonad { diff --git a/services/yubikey.nix b/services/yubikey.nix index 916893f..2f786d7 100644 --- a/services/yubikey.nix +++ b/services/yubikey.nix @@ -4,7 +4,7 @@ let inherit (lib) mkIf mkMerge mkThenElse; annuaire = config.r6d.machines; currentMachine = annuaire."${config.networking.hostName}"; - flags = currentMachine.configuration-flags; + flags = currentMachine.configurationFlags; in mkIf true {