Compare commits

...

2 Commits

Author SHA1 Message Date
henrov 9309590fb8 Working on reshuffling 2026-03-19 12:56:06 +00:00
henrov b2218ace96 deleted generated files 2026-03-19 12:56:05 +00:00
2 changed files with 26 additions and 16 deletions
+13 -8
View File
@@ -996,7 +996,7 @@ This file installs and configures fonts
** =generated/modules/desktop/eww.nix= ** =generated/modules/desktop/eww.nix=
This file installs and configures eww This file installs and configures eww
#+BEGIN_SRC nix :tangle generated/modules/desktop/eww.nix :noweb tangle :mkdirp yes :eval never-html #+BEGIN_SRC nix :tangle generated/modules/desktop/eww.nix :noweb tangle :mkdirp yes :eval never-html
{ lib, flakeRoot, pkgs, ... }: { lib, flakeRoot, ... }:
let let
programName = "eww"; programName = "eww";
@@ -1005,25 +1005,30 @@ let
files = lib.genAttrs (builtins.attrNames programFiles) (name: { files = lib.genAttrs (builtins.attrNames programFiles) (name: {
src = "${programAssets}/${name}"; src = "${programAssets}/${name}";
}); });
in { in
{
# 1. Top-level enable toggle (never reference config here)
options.myApps.${programName}.enable = options.myApps.${programName}.enable =
lib.mkEnableOption "Enable Eww widgets"; lib.mkEnableOption "Enable Eww widgets";
config = lib.mkIf (config.myApps.${programName}.enable or false) (let # 2. Config is a function — config argument exists here!
# Determine username safely after config exists config = { config, pkgs, ... }: let
# Determine username safely inside the function
username = config.defaultUser or "henrov"; username = config.defaultUser or "henrov";
ewwConfigDir = "/home/${username}/.config/${programName}"; ewwConfigDir = "/home/${username}/.config/${programName}";
enableProgram = true; # already gated by mkIf enableProgram = config.myApps.${programName}.enable or false;
in { in lib.mkIf enableProgram {
# Top-level container for programs
myApps = { myApps = {
${programName} = { ${programName} = {
enable = enableProgram; enable = true;
assetsDir = programAssets; assetsDir = programAssets;
files = files; files = files;
user = username; user = username;
}; };
}; };
# Home Manager user config
home-manager.users.${username} = { home-manager.users.${username} = {
home.stateVersion = "26.05"; home.stateVersion = "26.05";
home.username = username; home.username = username;
@@ -1043,7 +1048,7 @@ in {
exec = [ "eww open-many ${ewwConfigDir}/widgets" ]; exec = [ "eww open-many ${ewwConfigDir}/widgets" ];
}; };
}; };
}); };
} }
#+END_SRC #+END_SRC
+13 -8
View File
@@ -1,4 +1,4 @@
{ lib, flakeRoot, pkgs, ... }: { lib, flakeRoot, ... }:
let let
programName = "eww"; programName = "eww";
@@ -7,25 +7,30 @@ let
files = lib.genAttrs (builtins.attrNames programFiles) (name: { files = lib.genAttrs (builtins.attrNames programFiles) (name: {
src = "${programAssets}/${name}"; src = "${programAssets}/${name}";
}); });
in { in
{
# 1. Top-level enable toggle (never reference config here)
options.myApps.${programName}.enable = options.myApps.${programName}.enable =
lib.mkEnableOption "Enable Eww widgets"; lib.mkEnableOption "Enable Eww widgets";
config = lib.mkIf (config.myApps.${programName}.enable or false) (let # 2. Config is a function — config argument exists here!
# Determine username safely after config exists config = { config, pkgs, ... }: let
# Determine username safely inside the function
username = config.defaultUser or "henrov"; username = config.defaultUser or "henrov";
ewwConfigDir = "/home/${username}/.config/${programName}"; ewwConfigDir = "/home/${username}/.config/${programName}";
enableProgram = true; # already gated by mkIf enableProgram = config.myApps.${programName}.enable or false;
in { in lib.mkIf enableProgram {
# Top-level container for programs
myApps = { myApps = {
${programName} = { ${programName} = {
enable = enableProgram; enable = true;
assetsDir = programAssets; assetsDir = programAssets;
files = files; files = files;
user = username; user = username;
}; };
}; };
# Home Manager user config
home-manager.users.${username} = { home-manager.users.${username} = {
home.stateVersion = "26.05"; home.stateVersion = "26.05";
home.username = username; home.username = username;
@@ -45,5 +50,5 @@ in {
exec = [ "eww open-many ${ewwConfigDir}/widgets" ]; exec = [ "eww open-many ${ewwConfigDir}/widgets" ];
}; };
}; };
}); };
} }