Working on reshuffling

Droidnix/README.org

@@ -996,7 +996,7 @@ 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, flakeRoot, ... }:
+{ lib, flakeRoot, pkgs, ... }:
 
 let
   programName = "eww";
@@ -1005,57 +1005,45 @@ let
   files = lib.genAttrs (builtins.attrNames programFiles) (name: {
     src = "${programAssets}/${name}";
   });
-in
-{
-  # Top-level toggle for this program
+in {
   options.myApps.${programName}.enable =
     lib.mkEnableOption "Enable Eww widgets";
 
-  # Wrap everything in config if enabled
-  config = { config, ... }: let
-    enableProgram = config.myApps.${programName}.enable or false;
-
-    # Determine username safely inside config.mkIf
-    username = if enableProgram then (config.defaultUser or "henrov") else null;
-
-    # Full config directory path in user's home
-    ewwConfigDir = if enableProgram then "/home/${username}/.config/${programName}" else null;
-  in lib.mkIf enableProgram {
+  config = lib.mkIf (config.myApps.${programName}.enable or false) (let
+    # Determine username safely after config exists
+    username = config.defaultUser or "henrov";
+    ewwConfigDir = "/home/${username}/.config/${programName}";
+    enableProgram = true; # already gated by mkIf
+  in {
     myApps = {
       ${programName} = {
-        enable = true;
+        enable = enableProgram;
         assetsDir = programAssets;
         files = files;
-
-        # Assign user after config exists
         user = username;
       };
     };
 
-    # Home Manager user configuration
     home-manager.users.${username} = {
       home.stateVersion = "26.05";
       home.username = username;
       home.homeDirectory = "/home/${username}";
 
-      # Deploy Eww configs
       home.file."${ewwConfigDir}" = {
         source = programAssets;
         recursive = true;
       };
 
-      # Session variables
       home.sessionVariables = {
-        EWW_BIN = "${config.pkgs.eww}/bin/eww";
+        EWW_BIN = "${pkgs.eww}/bin/eww";
       };
 
-      # Wayland/Hyprland startup hooks
       wayland.windowManager.hyprland.settings = lib.mkForce {
         exec-once = [ "eww daemon" ];
         exec = [ "eww open-many ${ewwConfigDir}/widgets" ];
       };
     };
-  };
+  });
 }
 #+END_SRC
 

Droidnix/generated/modules/desktop/eww.nix

@@ -1,4 +1,4 @@
-{ lib, flakeRoot, ... }:
+{ lib, flakeRoot, pkgs, ... }:
 
 let
   programName = "eww";
@@ -7,55 +7,43 @@ let
   files = lib.genAttrs (builtins.attrNames programFiles) (name: {
     src = "${programAssets}/${name}";
   });
-in
-{
-  # Top-level toggle for this program
+in {
   options.myApps.${programName}.enable =
     lib.mkEnableOption "Enable Eww widgets";
 
-  # Wrap everything in config if enabled
-  config = { config, ... }: let
-    enableProgram = config.myApps.${programName}.enable or false;
-
-    # Determine username safely inside config.mkIf
-    username = if enableProgram then (config.defaultUser or "henrov") else null;
-
-    # Full config directory path in user's home
-    ewwConfigDir = if enableProgram then "/home/${username}/.config/${programName}" else null;
-  in lib.mkIf enableProgram {
+  config = lib.mkIf (config.myApps.${programName}.enable or false) (let
+    # Determine username safely after config exists
+    username = config.defaultUser or "henrov";
+    ewwConfigDir = "/home/${username}/.config/${programName}";
+    enableProgram = true; # already gated by mkIf
+  in {
     myApps = {
       ${programName} = {
-        enable = true;
+        enable = enableProgram;
         assetsDir = programAssets;
         files = files;
-
-        # Assign user after config exists
         user = username;
       };
     };
 
-    # Home Manager user configuration
     home-manager.users.${username} = {
       home.stateVersion = "26.05";
       home.username = username;
       home.homeDirectory = "/home/${username}";
 
-      # Deploy Eww configs
       home.file."${ewwConfigDir}" = {
         source = programAssets;
         recursive = true;
       };
 
-      # Session variables
       home.sessionVariables = {
-        EWW_BIN = "${config.pkgs.eww}/bin/eww";
+        EWW_BIN = "${pkgs.eww}/bin/eww";
       };
 
-      # Wayland/Hyprland startup hooks
       wayland.windowManager.hyprland.settings = lib.mkForce {
         exec-once = [ "eww daemon" ];
         exec = [ "eww open-many ${ewwConfigDir}/widgets" ];
       };
     };
-  };
+  });
 }