Working on reshuffling

Droidnix/README.org

@@ -777,23 +777,24 @@ This will import all packages listed in ./assets/system/apps/flatpaks.conf
 { lib, pkgs, config, ... }:
 
 let
-  moduleName = "flatpaks";
+  moduleName      = "flatpaks";
-  username = config.defaultUser or "henrov";
+  username        = config.defaultUser or "henrov";
   flatpakConfPath = ./assets/system/apps/flatpaks.conf;
 
   enableProgram = config.enableFlatpaks or false;
 in
 {
-  # Top-level toggle for this program
+  # Top-level toggle for this module
   options.enableFlatpaks = lib.mkEnableOption "Enable automatic Flatpak installation";
 
-  # Define myApps top-level option if it doesn't exist yet
+  # Define myApps container safely
   options.myApps = lib.mkOption {
-    type = lib.types.attrsOf lib.types.value;
+    type = lib.types.attrsOf (lib.types.attrsOf lib.types.str);
     default = {};
     description = "Top-level container for custom apps";
   };
 
+  # Wrap all configuration safely
   config = lib.mkIf enableProgram {
 
     # myApps container
@@ -806,7 +807,7 @@ in
       };
     };
 
-    # Deploy conf file
+    # Deploy the conf file
     environment.etc."flatpak/flatpaks.conf".source = flatpakConfPath;
 
     # Enable flatpak service

Droidnix/generated/modules/apps/flatpaks.nix

@@ -1,23 +1,24 @@
 { lib, pkgs, config, ... }:
 
 let
-  moduleName = "flatpaks";
+  moduleName      = "flatpaks";
-  username = config.defaultUser or "henrov";
+  username        = config.defaultUser or "henrov";
   flatpakConfPath = ./assets/system/apps/flatpaks.conf;
 
   enableProgram = config.enableFlatpaks or false;
 in
 {
-  # Top-level toggle for this program
+  # Top-level toggle for this module
   options.enableFlatpaks = lib.mkEnableOption "Enable automatic Flatpak installation";
 
-  # Define myApps top-level option if it doesn't exist yet
+  # Define myApps container safely
   options.myApps = lib.mkOption {
-    type = lib.types.attrsOf lib.types.value;
+    type = lib.types.attrsOf (lib.types.attrsOf lib.types.str);
     default = {};
     description = "Top-level container for custom apps";
   };
 
+  # Wrap all configuration safely
   config = lib.mkIf enableProgram {
 
     # myApps container
@@ -30,7 +31,7 @@ in
       };
     };
 
-    # Deploy conf file
+    # Deploy the conf file
     environment.etc."flatpak/flatpaks.conf".source = flatpakConfPath;
 
     # Enable flatpak service