Working on reshuffling

Droidnix/README.org

@@ -996,67 +996,72 @@ This file installs and configures fonts
 ** =generated/modules/desktop/eww.nix=
 This file installs and configures eww
 #+BEGIN_SRC nix :tangle generated/modules/desktop/eww.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, pkgs, flakeRoot, ... }:
+{ lib, flakeRoot, ... }:
-
-{ config, ... }:
 
 let
-  # --- Program-specific variables ---
   programName = "eww";
-  username = config.defaultUser or "henrov";
 
-  # Directory with all your eww assets inside the flake
+  # --- Path to the program's assets in the flake ---
   programAssets = "${flakeRoot}/assets/system/conf/${programName}";
 
-  # Read all files in the assets directory
+  # --- Read all files in the asset directory ---
-  programFiles = builtins.attrNames (builtins.readDir programAssets);
+  programFiles = builtins.readDir programAssets;
 
-  # Generate Nix-friendly attributes for each file
+  # --- Generate attrset of file contents ---
-  files = lib.genAttrs programFiles (name: {
+  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${programAssets}/${name}";
+    text = builtins.readFile "${programAssets}/${name}";
   });
 in
 {
-  # --- Top-level toggle for enabling eww ---
+  # --- Top-level toggle for this module ---
   options.enableEww =
     lib.mkEnableOption "Enable eww widgets";
 
-  # --- Apply configuration only if enabled ---
+  # --- Configuration only applied if enabled ---
-  config = lib.mkIf (config.enableEww or false) {
+  config = let
-    # Top-level container for apps
+    # Assign enableProgram inside config to match the toggle option
+    enableProgram = config.enableEww or false;
+
+    # Determine user safely after config exists
+    username = config.defaultUser or "henrov";
+
+    # User's XDG config path for eww
+    configDir = "/home/${username}/.config/${programName}";
+  in lib.mkIf enableProgram {
+    # --- Top-level container for all apps ---
     myApps = {
       eww = {
         enable = true;
         assetsDir = programAssets;
         files = files;
         user = username;
-        packages = [ "eww" ];
 
-        # --- Home Manager user config ---
+        # Symbolic package reference; actual package should be assigned elsewhere
-        homeManagerUsers = {
+        package = "eww";
-          "${username}" = {
+      };
-            home.stateVersion = "26.05";
+    };
-            home.username = username;
-            home.homeDirectory = "/home/${username}";
 
-            # Deploy eww configs
+    # --- Home Manager deployment ---
-            home.file."${programAssets}" = {
+    home-manager.users.${username} = {
-              source = programAssets;
+      home.stateVersion = "26.05";
-              recursive = true;
+      home.username = username;
-            };
+      home.homeDirectory = "/home/${username}";
 
-            # Session variables
+      # Deploy all config files recursively
-            home.sessionVariables = {
+      home.file."${configDir}" = {
-              EWW_BIN = "${pkgs.eww}/bin/eww";
+        source = programAssets;
-            };
+        recursive = true;
+      };
 
-            # Wayland/Hyprland startup hooks
+      # Session variables for the program
-            wayland.windowManager.hyprland.settings = lib.mkForce {
+      home.sessionVariables = {
-              exec-once = [ "eww daemon" ];
+        EWW_BIN = "${programName}";
-              exec = [ "eww open-many ${programAssets}/widgets" ];
+      };
-            };
+
-          };
+      # Wayland/Hyprland startup hooks
-        };
+      wayland.windowManager.hyprland.settings = lib.mkForce {
+        exec-once = [ "${programName} daemon" ];
+        exec = [ "${programName} open-many ${configDir}/widgets" ];
       };
     };
   };

Droidnix/generated/modules/desktop/eww.nix

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