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";
@@ -1007,28 +1007,25 @@ let
   });
 in
 {
-  # 1. Top-level enable toggle (never reference config here)
+  # 1. Top-level toggle (no config usage!)
   options.myApps.${programName}.enable =
     lib.mkEnableOption "Enable Eww widgets";
 
-  # 2. Config is a function — config argument exists here!
+  # 2. Configuration block (only use config inside lib.mkIf)
-  config = { config, pkgs, ... }: let
+  config = lib.mkIf (lib.getOption config "myApps.${programName}.enable" or false) (let
-    # Determine username safely inside the function
     username = config.defaultUser or "henrov";
     ewwConfigDir = "/home/${username}/.config/${programName}";
-    enableProgram = config.myApps.${programName}.enable or false;
+    enableProgram = true; # already gated by mkIf
-  in lib.mkIf enableProgram {
+  in {
-    # Top-level container for programs
     myApps = {
       ${programName} = {
-        enable = true;
+        enable = enableProgram;
         assetsDir = programAssets;
         files = files;
         user = username;
       };
     };
 
-    # Home Manager user config
     home-manager.users.${username} = {
       home.stateVersion = "26.05";
       home.username = username;
@@ -1048,7 +1045,7 @@ in
         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";
@@ -9,28 +9,25 @@ let
   });
 in
 {
-  # 1. Top-level enable toggle (never reference config here)
+  # 1. Top-level toggle (no config usage!)
   options.myApps.${programName}.enable =
     lib.mkEnableOption "Enable Eww widgets";
 
-  # 2. Config is a function — config argument exists here!
+  # 2. Configuration block (only use config inside lib.mkIf)
-  config = { config, pkgs, ... }: let
+  config = lib.mkIf (lib.getOption config "myApps.${programName}.enable" or false) (let
-    # Determine username safely inside the function
     username = config.defaultUser or "henrov";
     ewwConfigDir = "/home/${username}/.config/${programName}";
-    enableProgram = config.myApps.${programName}.enable or false;
+    enableProgram = true; # already gated by mkIf
-  in lib.mkIf enableProgram {
+  in {
-    # Top-level container for programs
     myApps = {
       ${programName} = {
-        enable = true;
+        enable = enableProgram;
         assetsDir = programAssets;
         files = files;
         user = username;
       };
     };
 
-    # Home Manager user config
     home-manager.users.${username} = {
       home.stateVersion = "26.05";
       home.username = username;
@@ -50,5 +47,5 @@ in
         exec = [ "eww open-many ${ewwConfigDir}/widgets" ];
       };
     };
-  };
+  });
 }