EXPERIMENTAL: cfg -> flags

This commit is contained in:
2017-04-27 22:06:12 +02:00
parent 7f8563f32b
commit a074cfcfa7
70 changed files with 126 additions and 345 deletions

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

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

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

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

View File

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

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

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

View File

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

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

@@ -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; [

View File

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

View File

@@ -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; [