Working on reshuffling

Droidnix/README.org

@@ -1000,68 +1000,62 @@ This file installs and configures eww
 
 let
   programName = "eww";
-
-  # --- Path to the program's assets in the flake ---
   programAssets = "${flakeRoot}/assets/system/conf/${programName}";
-
-  # --- Read all files in the asset directory ---
   programFiles = builtins.readDir programAssets;
-
-  # --- Generate attrset of file contents ---
   files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    text = builtins.readFile "${programAssets}/${name}";
+    src = "${programAssets}/${name}";
   });
 in
 {
-  # --- Top-level toggle for this module ---
+  # Top-level toggle for this program
-  options.enableEww =
+  options.myApps.${programName}.enable =
-    lib.mkEnableOption "Enable eww widgets";
+    lib.mkEnableOption "Enable Eww widgets";
 
-  # --- Configuration only applied if enabled ---
+  # Wrap everything in config if enabled
-  config = let
+  config = { config, ... }: let
-    # Assign enableProgram inside config to match the toggle option
+    enableProgram = config.myApps.${programName}.enable or false;
-    enableProgram = config.enableEww or false;
 
-    # Determine user safely after config exists
+    # Determine username safely inside config.mkIf
-    username = config.defaultUser or "henrov";
+    username = enableProgram then (config.defaultUser or "henrov") else null;
 
-    # User's XDG config path for eww
+    # Full config directory path in user's home
-    configDir = "/home/${username}/.config/${programName}";
+    ewwConfigDir = enableProgram then "/home/${username}/.config/${programName}" else null;
   in lib.mkIf enableProgram {
-    # --- Top-level container for all apps ---
     myApps = {
-      eww = {
+      ${programName} = {
         enable = true;
         assetsDir = programAssets;
         files = files;
+
+        # Assign user after config exists
         user = username;
 
-        # Symbolic package reference; actual package should be assigned elsewhere
+        # Add more program-specific options below
-        package = "eww";
+        # e.g., theme = "catppuccin-mocha";
       };
     };
 
-    # --- Home Manager deployment ---
+    # Home Manager user configuration
     home-manager.users.${username} = {
       home.stateVersion = "26.05";
       home.username = username;
       home.homeDirectory = "/home/${username}";
 
-      # Deploy all config files recursively
+      # Deploy Eww configs
-      home.file."${configDir}" = {
+      home.file."${ewwConfigDir}" = {
         source = programAssets;
         recursive = true;
       };
 
-      # Session variables for the program
+      # Session variables
       home.sessionVariables = {
-        EWW_BIN = "${programName}";
+        EWW_BIN = "${config.pkgs.eww}/bin/eww";
       };
 
       # Wayland/Hyprland startup hooks
       wayland.windowManager.hyprland.settings = lib.mkForce {
-        exec-once = [ "${programName} daemon" ];
+        exec-once = [ "eww daemon" ];
-        exec = [ "${programName} open-many ${configDir}/widgets" ];
+        exec = [ "eww open-many ${ewwConfigDir}/widgets" ];
       };
     };
   };

Droidnix/generated/modules/desktop/eww.nix

@@ -2,68 +2,62 @@
 
 let
   programName = "eww";
-
-  # --- Path to the program's assets in the flake ---
   programAssets = "${flakeRoot}/assets/system/conf/${programName}";
-
-  # --- Read all files in the asset directory ---
   programFiles = builtins.readDir programAssets;
-
-  # --- Generate attrset of file contents ---
   files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    text = builtins.readFile "${programAssets}/${name}";
+    src = "${programAssets}/${name}";
   });
 in
 {
-  # --- Top-level toggle for this module ---
+  # Top-level toggle for this program
-  options.enableEww =
+  options.myApps.${programName}.enable =
-    lib.mkEnableOption "Enable eww widgets";
+    lib.mkEnableOption "Enable Eww widgets";
 
-  # --- Configuration only applied if enabled ---
+  # Wrap everything in config if enabled
-  config = let
+  config = { config, ... }: let
-    # Assign enableProgram inside config to match the toggle option
+    enableProgram = config.myApps.${programName}.enable or false;
-    enableProgram = config.enableEww or false;
 
-    # Determine user safely after config exists
+    # Determine username safely inside config.mkIf
-    username = config.defaultUser or "henrov";
+    username = enableProgram then (config.defaultUser or "henrov") else null;
 
-    # User's XDG config path for eww
+    # Full config directory path in user's home
-    configDir = "/home/${username}/.config/${programName}";
+    ewwConfigDir = enableProgram then "/home/${username}/.config/${programName}" else null;
   in lib.mkIf enableProgram {
-    # --- Top-level container for all apps ---
     myApps = {
-      eww = {
+      ${programName} = {
         enable = true;
         assetsDir = programAssets;
         files = files;
+
+        # Assign user after config exists
         user = username;
 
-        # Symbolic package reference; actual package should be assigned elsewhere
+        # Add more program-specific options below
-        package = "eww";
+        # e.g., theme = "catppuccin-mocha";
       };
     };
 
-    # --- Home Manager deployment ---
+    # Home Manager user configuration
     home-manager.users.${username} = {
       home.stateVersion = "26.05";
       home.username = username;
       home.homeDirectory = "/home/${username}";
 
-      # Deploy all config files recursively
+      # Deploy Eww configs
-      home.file."${configDir}" = {
+      home.file."${ewwConfigDir}" = {
         source = programAssets;
         recursive = true;
       };
 
-      # Session variables for the program
+      # Session variables
       home.sessionVariables = {
-        EWW_BIN = "${programName}";
+        EWW_BIN = "${config.pkgs.eww}/bin/eww";
       };
 
       # Wayland/Hyprland startup hooks
       wayland.windowManager.hyprland.settings = lib.mkForce {
-        exec-once = [ "${programName} daemon" ];
+        exec-once = [ "eww daemon" ];
-        exec = [ "${programName} open-many ${configDir}/widgets" ];
+        exec = [ "eww open-many ${ewwConfigDir}/widgets" ];
       };
     };
   };