Working on reshuffling

Droidnix/README.org

@@ -1003,46 +1003,42 @@ let
   programName = "eww";
   username = "henrov";
 
-  # Assets directory in the flake
+  # Directory with all your eww assets inside the flake
   programAssets = "${flakeRoot}/assets/system/conf/${programName}";
-  # Read all files dynamically
+
+  # Read all files in the assets directory
   programFiles = builtins.attrNames (builtins.readDir programAssets);
-  # Generate attributes for each file
+
+  # Generate Nix-friendly attributes for each file
   files = lib.genAttrs programFiles (name: {
     src = "${programAssets}/${name}";
   });
 
-  # Default enable toggle (can be overridden)
-  enableProgram = true;
 in
 {
-  # --- Top-level toggle option ---
+  # --- Top-level toggle for enabling eww ---
-  options.enable${lib.str.capitalize programName} =
+  options.enableEww =
-    lib.mkEnableOption "Enable ${programName} widgets";
+    lib.mkEnableOption "Enable eww widgets";
 
   # --- Apply configuration only if enabled ---
-  config = lib.mkIf enableProgram {
+  config = lib.mkIf (config.enableEww or false) {
-    # Container for all apps/services
+    # Top-level container for apps
     myApps = {
-      ${programName} = {
+      eww = {
         enable = true;
         assetsDir = programAssets;
         files = files;
-
+        user = username;
-        # User for home-manager deployment
-        user = "henrov";
-
-        # Packages needed (symbolic reference)
         packages = [ "eww" ];
 
-        # Home Manager deployment
+        # --- Home Manager user config ---
         homeManagerUsers = {
           "${username}" = {
             home.stateVersion = "26.05";
             home.username = username;
             home.homeDirectory = "/home/${username}";
 
-            # Deploy all eww configs recursively
+            # Deploy eww configs
             home.file."${programAssets}" = {
               source = programAssets;
               recursive = true;

Droidnix/generated/modules/desktop/eww.nix

@@ -5,46 +5,42 @@ let
   programName = "eww";
   username = "henrov";
 
-  # Assets directory in the flake
+  # Directory with all your eww assets inside the flake
   programAssets = "${flakeRoot}/assets/system/conf/${programName}";
-  # Read all files dynamically
+
+  # Read all files in the assets directory
   programFiles = builtins.attrNames (builtins.readDir programAssets);
-  # Generate attributes for each file
+
+  # Generate Nix-friendly attributes for each file
   files = lib.genAttrs programFiles (name: {
     src = "${programAssets}/${name}";
   });
 
-  # Default enable toggle (can be overridden)
-  enableProgram = true;
 in
 {
-  # --- Top-level toggle option ---
+  # --- Top-level toggle for enabling eww ---
-  options.enable${lib.str.capitalize programName} =
+  options.enableEww =
-    lib.mkEnableOption "Enable ${programName} widgets";
+    lib.mkEnableOption "Enable eww widgets";
 
   # --- Apply configuration only if enabled ---
-  config = lib.mkIf enableProgram {
+  config = lib.mkIf (config.enableEww or false) {
-    # Container for all apps/services
+    # Top-level container for apps
     myApps = {
-      ${programName} = {
+      eww = {
         enable = true;
         assetsDir = programAssets;
         files = files;
-
+        user = username;
-        # User for home-manager deployment
-        user = "henrov";
-
-        # Packages needed (symbolic reference)
         packages = [ "eww" ];
 
-        # Home Manager deployment
+        # --- Home Manager user config ---
         homeManagerUsers = {
           "${username}" = {
             home.stateVersion = "26.05";
             home.username = username;
             home.homeDirectory = "/home/${username}";
 
-            # Deploy all eww configs recursively
+            # Deploy eww configs
             home.file."${programAssets}" = {
               source = programAssets;
               recursive = true;