Compare commits

...

2 Commits

Author SHA1 Message Date
henrov e58d33c25b Working on reshuffling 2026-03-19 12:45:06 +00:00
henrov 55d247fe84 deleted generated files 2026-03-19 12:45:05 +00:00
2 changed files with 94 additions and 82 deletions
+47 -41
View File
@@ -999,60 +999,66 @@ This file installs and configures eww
{ lib, pkgs, flakeRoot, ... }: { lib, pkgs, flakeRoot, ... }:
let let
# --- Define user locally --- # --- Program-specific variables ---
programName = "eww";
username = "henrov"; username = "henrov";
# --- Eww config directory in flake --- # Assets directory in the flake
ewwAssetsDir = "${flakeRoot}/assets/system/conf/eww"; programAssets = "${flakeRoot}/assets/system/conf/${programName}";
# Read all files dynamically
# --- Read all files in ewwAssetsDir dynamically --- programFiles = builtins.attrNames (builtins.readDir programAssets);
ewwFiles = builtins.attrNames (builtins.readDir ewwAssetsDir); # Generate attributes for each file
files = lib.genAttrs programFiles (name: {
# --- Generate xdg.configFile entries for all files --- src = "${programAssets}/${name}";
ewwConfigs = lib.genAttrs ewwFiles (name: {
text = builtins.readFile "${ewwAssetsDir}/${name}";
}); });
# --- Full config directory path in user's config home --- # Default enable toggle (can be overridden)
ewwConfigDir = "/home/${username}/.config/eww"; enableProgram = true;
in in
{ {
flake.nixosModules.eww = { config, pkgs, lib, ... }: # --- Top-level toggle option ---
options.enable${lib.str.capitalize programName} =
lib.mkEnableOption "Enable ${programName} widgets";
{ # --- Apply configuration only if enabled ---
options.mySystem.apps.eww.enable = config = lib.mkIf enableProgram {
lib.mkEnableOption "Enable Eww widgets"; # Container for all apps/services
myApps = {
${programName} = {
enable = true;
assetsDir = programAssets;
files = files;
config = lib.mkIf (config.mySystem.apps.eww.enable or false) { # User for home-manager deployment
user = "henrov";
mySystem = { # Packages needed (symbolic reference)
apps.wallpaper = { packages = [ "eww" ];
enable = true;
packages = [ "eww" ]; # symbolic, actual package below
};
};
# --- Home Manager user config --- # Home Manager deployment
home-manager.users.${username} = { homeManagerUsers = {
home.stateVersion = "26.05"; "${username}" = {
home.username = username; home.stateVersion = "26.05";
home.homeDirectory = "/home/${username}"; home.username = username;
home.homeDirectory = "/home/${username}";
# Deploy eww configs # Deploy all eww configs recursively
home.file."${ewwConfigDir}" = { home.file."${programAssets}" = {
source = ewwAssetsDir; source = programAssets;
recursive = true; recursive = true;
}; };
# Session variables # Session variables
home.sessionVariables = { home.sessionVariables = {
EWW_BIN = "${pkgs.eww}/bin/eww"; EWW_BIN = "${pkgs.eww}/bin/eww";
}; };
# Wayland/Hyprland startup hooks # Wayland/Hyprland startup hooks
wayland.windowManager.hyprland.settings = lib.mkForce { wayland.windowManager.hyprland.settings = lib.mkForce {
exec-once = [ "eww daemon" ]; exec-once = [ "eww daemon" ];
exec = [ "eww open-many ${ewwConfigDir}/widgets" ]; exec = [ "eww open-many ${programAssets}/widgets" ];
};
};
}; };
}; };
}; };
+47 -41
View File
@@ -1,60 +1,66 @@
{ lib, pkgs, flakeRoot, ... }: { lib, pkgs, flakeRoot, ... }:
let let
# --- Define user locally --- # --- Program-specific variables ---
programName = "eww";
username = "henrov"; username = "henrov";
# --- Eww config directory in flake --- # Assets directory in the flake
ewwAssetsDir = "${flakeRoot}/assets/system/conf/eww"; programAssets = "${flakeRoot}/assets/system/conf/${programName}";
# Read all files dynamically
# --- Read all files in ewwAssetsDir dynamically --- programFiles = builtins.attrNames (builtins.readDir programAssets);
ewwFiles = builtins.attrNames (builtins.readDir ewwAssetsDir); # Generate attributes for each file
files = lib.genAttrs programFiles (name: {
# --- Generate xdg.configFile entries for all files --- src = "${programAssets}/${name}";
ewwConfigs = lib.genAttrs ewwFiles (name: {
text = builtins.readFile "${ewwAssetsDir}/${name}";
}); });
# --- Full config directory path in user's config home --- # Default enable toggle (can be overridden)
ewwConfigDir = "/home/${username}/.config/eww"; enableProgram = true;
in in
{ {
flake.nixosModules.eww = { config, pkgs, lib, ... }: # --- Top-level toggle option ---
options.enable${lib.str.capitalize programName} =
lib.mkEnableOption "Enable ${programName} widgets";
{ # --- Apply configuration only if enabled ---
options.mySystem.apps.eww.enable = config = lib.mkIf enableProgram {
lib.mkEnableOption "Enable Eww widgets"; # Container for all apps/services
myApps = {
${programName} = {
enable = true;
assetsDir = programAssets;
files = files;
config = lib.mkIf (config.mySystem.apps.eww.enable or false) { # User for home-manager deployment
user = "henrov";
mySystem = { # Packages needed (symbolic reference)
apps.wallpaper = { packages = [ "eww" ];
enable = true;
packages = [ "eww" ]; # symbolic, actual package below
};
};
# --- Home Manager user config --- # Home Manager deployment
home-manager.users.${username} = { homeManagerUsers = {
home.stateVersion = "26.05"; "${username}" = {
home.username = username; home.stateVersion = "26.05";
home.homeDirectory = "/home/${username}"; home.username = username;
home.homeDirectory = "/home/${username}";
# Deploy eww configs # Deploy all eww configs recursively
home.file."${ewwConfigDir}" = { home.file."${programAssets}" = {
source = ewwAssetsDir; source = programAssets;
recursive = true; recursive = true;
}; };
# Session variables # Session variables
home.sessionVariables = { home.sessionVariables = {
EWW_BIN = "${pkgs.eww}/bin/eww"; EWW_BIN = "${pkgs.eww}/bin/eww";
}; };
# Wayland/Hyprland startup hooks # Wayland/Hyprland startup hooks
wayland.windowManager.hyprland.settings = lib.mkForce { wayland.windowManager.hyprland.settings = lib.mkForce {
exec-once = [ "eww daemon" ]; exec-once = [ "eww daemon" ];
exec = [ "eww open-many ${ewwConfigDir}/widgets" ]; exec = [ "eww open-many ${programAssets}/widgets" ];
};
};
}; };
}; };
}; };