Working on reshuffling

Droidnix/README.org

@@ -999,48 +999,52 @@ This file installs and configures eww
 { lib, pkgs, flakeRoot, ... }:
 
 let
-  # --- Define user locally ---
+  # --- Program-specific variables ---
+  programName = "eww";
   username = "henrov";
 
-  # --- Eww config directory in flake ---
+  # Assets directory in the flake
-  ewwAssetsDir = "${flakeRoot}/assets/system/conf/eww";
+  programAssets = "${flakeRoot}/assets/system/conf/${programName}";
-
+  # Read all files dynamically
-  # --- Read all files in ewwAssetsDir dynamically ---
+  programFiles = builtins.attrNames (builtins.readDir programAssets);
-  ewwFiles = builtins.attrNames (builtins.readDir ewwAssetsDir);
+  # Generate attributes for each file
-
+  files = lib.genAttrs programFiles (name: {
-  # --- Generate xdg.configFile entries for all files ---
+    src = "${programAssets}/${name}";
-  ewwConfigs = lib.genAttrs ewwFiles (name: {
-    text = builtins.readFile "${ewwAssetsDir}/${name}";
   });
 
-  # --- Full config directory path in user's config home ---
+  # Default enable toggle (can be overridden)
-  ewwConfigDir = "/home/${username}/.config/eww";
+  enableProgram = true;
 in
 {
-  flake.nixosModules.eww = { config, pkgs, lib, ... }:
+  # --- Top-level toggle option ---
+  options.enable${lib.str.capitalize programName} =
+    lib.mkEnableOption "Enable ${programName} widgets";
 
-  {
+  # --- Apply configuration only if enabled ---
-    options.mySystem.apps.eww.enable =
+  config = lib.mkIf enableProgram {
-      lib.mkEnableOption "Enable Eww widgets";
+    # Container for all apps/services
-
+    myApps = {
-    config = lib.mkIf (config.mySystem.apps.eww.enable or false) {
+      ${programName} = {
-
-      mySystem = {
-        apps.wallpaper = {
         enable = true;
-          packages = [ "eww" ]; # symbolic, actual package below
+        assetsDir = programAssets;
-        };
+        files = files;
-      };
 
-      # --- Home Manager user config ---
+        # User for home-manager deployment
-      home-manager.users.${username} = {
+        user = "henrov";
+
+        # Packages needed (symbolic reference)
+        packages = [ "eww" ];
+
+        # Home Manager deployment
+        homeManagerUsers = {
+          "${username}" = {
             home.stateVersion = "26.05";
             home.username = username;
             home.homeDirectory = "/home/${username}";
 
-        # Deploy eww configs
+            # Deploy all eww configs recursively
-        home.file."${ewwConfigDir}" = {
+            home.file."${programAssets}" = {
-          source = ewwAssetsDir;
+              source = programAssets;
               recursive = true;
             };
 
@@ -1052,7 +1056,9 @@ in
             # Wayland/Hyprland startup hooks
             wayland.windowManager.hyprland.settings = lib.mkForce {
               exec-once = [ "eww daemon" ];
-          exec = [ "eww open-many ${ewwConfigDir}/widgets" ];
+              exec = [ "eww open-many ${programAssets}/widgets" ];
+            };
+          };
         };
       };
     };

Droidnix/generated/modules/desktop/eww.nix

@@ -1,48 +1,52 @@
 { lib, pkgs, flakeRoot, ... }:
 
 let
-  # --- Define user locally ---
+  # --- Program-specific variables ---
+  programName = "eww";
   username = "henrov";
 
-  # --- Eww config directory in flake ---
+  # Assets directory in the flake
-  ewwAssetsDir = "${flakeRoot}/assets/system/conf/eww";
+  programAssets = "${flakeRoot}/assets/system/conf/${programName}";
-
+  # Read all files dynamically
-  # --- Read all files in ewwAssetsDir dynamically ---
+  programFiles = builtins.attrNames (builtins.readDir programAssets);
-  ewwFiles = builtins.attrNames (builtins.readDir ewwAssetsDir);
+  # Generate attributes for each file
-
+  files = lib.genAttrs programFiles (name: {
-  # --- Generate xdg.configFile entries for all files ---
+    src = "${programAssets}/${name}";
-  ewwConfigs = lib.genAttrs ewwFiles (name: {
-    text = builtins.readFile "${ewwAssetsDir}/${name}";
   });
 
-  # --- Full config directory path in user's config home ---
+  # Default enable toggle (can be overridden)
-  ewwConfigDir = "/home/${username}/.config/eww";
+  enableProgram = true;
 in
 {
-  flake.nixosModules.eww = { config, pkgs, lib, ... }:
+  # --- Top-level toggle option ---
+  options.enable${lib.str.capitalize programName} =
+    lib.mkEnableOption "Enable ${programName} widgets";
 
-  {
+  # --- Apply configuration only if enabled ---
-    options.mySystem.apps.eww.enable =
+  config = lib.mkIf enableProgram {
-      lib.mkEnableOption "Enable Eww widgets";
+    # Container for all apps/services
-
+    myApps = {
-    config = lib.mkIf (config.mySystem.apps.eww.enable or false) {
+      ${programName} = {
-
-      mySystem = {
-        apps.wallpaper = {
         enable = true;
-          packages = [ "eww" ]; # symbolic, actual package below
+        assetsDir = programAssets;
-        };
+        files = files;
-      };
 
-      # --- Home Manager user config ---
+        # User for home-manager deployment
-      home-manager.users.${username} = {
+        user = "henrov";
+
+        # Packages needed (symbolic reference)
+        packages = [ "eww" ];
+
+        # Home Manager deployment
+        homeManagerUsers = {
+          "${username}" = {
             home.stateVersion = "26.05";
             home.username = username;
             home.homeDirectory = "/home/${username}";
 
-        # Deploy eww configs
+            # Deploy all eww configs recursively
-        home.file."${ewwConfigDir}" = {
+            home.file."${programAssets}" = {
-          source = ewwAssetsDir;
+              source = programAssets;
               recursive = true;
             };
 
@@ -54,7 +58,9 @@ in
             # Wayland/Hyprland startup hooks
             wayland.windowManager.hyprland.settings = lib.mkForce {
               exec-once = [ "eww daemon" ];
-          exec = [ "eww open-many ${ewwConfigDir}/widgets" ];
+              exec = [ "eww open-many ${programAssets}/widgets" ];
+            };
+          };
         };
       };
     };