utilisation de blocs pour éviter de répeter le préfixe

config-generator.nix

@@ -91,8 +91,10 @@ in
 
     ## Définition des profils génériques
     (mkIf pfl.isDesktop {
-      r6d.config-generator.awesome = true;
+      r6d.config-generator = {
-      r6d.config-generator.nix-serve-client = true;
+        awesome = true;
+        nix-serve-client = true;
+      };
     })
     (mkIf pfl.isHome {
       r6d.profiles.isDesktop = true;
@@ -108,9 +110,11 @@ in
 
     ## Profils liés à Dubronetwork
     (mkIf pfl.isDubronetwork {
-      r6d.config-generator.auto-upgrade = true;
+      r6d.config-generator = {
-      r6d.config-generator.nix-serve-client = true;
+        auto-upgrade = true;
-      r6d.config-generator.print = true;
+        nix-serve-client = true;
+        print = true;
+      };
     })
     (mkIf (pfl.isDubronetwork && pfl.isHome) {
       r6d.config-generator.jeux = true;
@@ -124,36 +128,46 @@ in
 
     ## Profils liés à Prunetwork
     (mkIf pfl.isPrunetwork {
-      r6d.config-generator.auto-upgrade = true;
+      r6d.config-generator = {
-      r6d.config-generator.fail2ban = true;
+        auto-upgrade = true;
-      r6d.config-generator.swap = true;
+        fail2ban = true;
+        swap = true;
+      };
     })
 
 
     ## Affectation des profils aux machines
     (mkIf comp.isOcean {
-      r6d.profiles.isPrunetwork = true;
+      r6d.profiles = {
-      r6d.profiles.isServer = true;
+        isPrunetwork = true;
+        isServer = true;
+      };
     })
     (mkIf comp.isRadx {
-      r6d.profiles.isHome = true;
+      r6d.profiles = {
-      r6d.profiles.isPrunetwork = true;
+        isHome = true;
-      r6d.profiles.isServer = true;
+        isPrunetwork = true;
-      r6d.profiles.isWorkstation = true;
+        isServer = true;
+        isWorkstation = true;
+      };
 
       r6d.config-generator = {
         virtualbox = true;
       };
     })
     (mkIf comp.isXray {
-      r6d.profiles.isPrunetwork = true;
+      r6d.profiles = {
-      r6d.profiles.isServer = true;
+        isPrunetwork = true;
+        isServer = true;
+      };
     })
 
     (mkIf comp.isLatitude {
-      r6d.profiles.isDubronetwork = true;
+      r6d.profiles = {
-      r6d.profiles.isHome = true;
+        isDubronetwork = true;
-      r6d.profiles.isWorkstation = true;
+        isHome = true;
+        isWorkstation = true;
+      };
 
       r6d.config-generator = {
         laptop = true;
@@ -161,14 +175,18 @@ in
       };
     })
     (mkIf comp.isMonstre {
-      r6d.profiles.isDubronetwork = true;
+      r6d.profiles = {
-      r6d.profiles.isServer = true;
+        isDubronetwork = true;
+        isServer = true;
+      };
 
       r6d.config-generator.fail2ban = true;
     })
     (mkIf comp.isNeoNomade{
-      r6d.profiles.isDubronetwork = true;
+      r6d.profiles = {
-      r6d.profiles.isHome = true;
+        isDubronetwork = true;
+        isHome = true;
+      };
 
       r6d.config-generator = {
         laptop = true;
@@ -182,12 +200,16 @@ in
       };
     })
     (mkIf comp.isPhenom {
-      r6d.profiles.isDubronetwork = true;
+      r6d.profiles = {
-      r6d.profiles.isHome = true;
+        isDubronetwork = true;
-      r6d.profiles.isWorkstation = true;
+        isHome = true;
+        isWorkstation = true;
+      };
 
-      r6d.config-generator.nix-serve-server = true;
+      r6d.config-generator = {
-      r6d.config-generator.xmonad = true;
+        nix-serve-server = true;
+        xmonad = true;
+      };
     })
   ];
 }