5f0834f30c
- Move 32+ app-specific scripts from features/apps/scripts/ to features/scripts/utils/ for centralized packaging. - Create individual Nix modules for orphaned app configurations (btop, kitty, tmux, etc.) in features/apps/ using xdg.configFile. - Fix broken paths in core/system/makima.nix and features/apps/vscode.nix. - Update VSCode configuration to use the modern 'profiles.default.userSettings' API, resolving deprecation warnings. - Merge duplicate 'nomarchy-launch-walker' scripts into a single robust utility. - Remove stale root 'config/' directory. - Update README.md and docs/creating-themes.md to reflect the new architecture and keybindings. - Ensure all modules are correctly imported and verified via nix flake check.
76 lines
3.0 KiB
Nix
76 lines
3.0 KiB
Nix
{ config, lib, ... }:
|
|
|
|
let
|
|
nomarchyLib = import ../../lib { inherit lib; };
|
|
themePath = ../palettes + "/${config.nomarchy.theme}";
|
|
themeAppsPath = themePath + "/apps";
|
|
nordAppsPath = ../../features/desktop/hyprland/themes/nord;
|
|
hyprlandThemePath = ../../features/desktop/hyprland/themes + "/${config.nomarchy.theme}";
|
|
|
|
# Check if theme has hyprland.conf in palette apps/ or feature themes/
|
|
hasHyprlandConf = builtins.pathExists (themeAppsPath + "/hyprland.conf");
|
|
hasHyprlandFeatureConf = builtins.pathExists (hyprlandThemePath + "/hyprland.conf");
|
|
|
|
hyprlandConfSource =
|
|
if hasHyprlandConf then themeAppsPath + "/hyprland.conf"
|
|
else if hasHyprlandFeatureConf then hyprlandThemePath + "/hyprland.conf"
|
|
else nordAppsPath + "/hyprland.conf";
|
|
|
|
# Get palette for dynamic CSS generation
|
|
palette = nomarchyLib.getPalette config.nomarchy.theme;
|
|
in
|
|
{
|
|
xdg.configFile."nomarchy/current/theme" = {
|
|
source = themePath;
|
|
recursive = true;
|
|
};
|
|
|
|
# Generate waybar.css if it doesn't exist in the theme
|
|
# This provides the @background and @foreground variables used by the default style
|
|
xdg.configFile."nomarchy/current/theme/waybar.css".text = ''
|
|
@define-color background #${palette.base00};
|
|
@define-color foreground #${palette.base05};
|
|
@define-color accent #${palette.base0D};
|
|
'';
|
|
|
|
# Ensure theme-specific hyprland config exists
|
|
# Lookup priority: palette apps/ > feature themes/ > nord fallback
|
|
xdg.configFile."nomarchy/current/theme/apps/hyprland.conf" = lib.mkIf (!hasHyprlandConf) {
|
|
source = if hasHyprlandFeatureConf then hyprlandThemePath + "/hyprland.conf"
|
|
else nordAppsPath + "/hyprland.conf";
|
|
};
|
|
|
|
# Legacy compatibility: symlink apps/hyprland.conf to root for scripts expecting old path
|
|
xdg.configFile."nomarchy/current/theme/hyprland.conf" = {
|
|
source = hyprlandConfSource;
|
|
};
|
|
|
|
xdg.configFile."nomarchy/current/theme.name".text = config.nomarchy.theme;
|
|
|
|
# Expose branding assets
|
|
xdg.configFile."nomarchy/branding/logo.png".source = ../../core/branding/logo.png;
|
|
xdg.configFile."nomarchy/branding/logo.txt".source = ../../core/branding/logo.txt;
|
|
xdg.configFile."nomarchy/branding/logo.svg".source = ../../core/branding/logo.svg;
|
|
xdg.configFile."nomarchy/branding/icon.png".source = ../../core/branding/icon.png;
|
|
xdg.configFile."nomarchy/branding/icon.txt".source = ../../core/branding/icon.txt;
|
|
|
|
# Expose all themes to the system via local share for script accessibility
|
|
# We filter out images to prevent Nix Store bloat
|
|
xdg.dataFile."nomarchy/themes".source = builtins.path {
|
|
name = "nomarchy-themes-no-images";
|
|
path = ../palettes;
|
|
filter = path: type:
|
|
let
|
|
baseName = baseNameOf path;
|
|
in
|
|
! (type == "regular" && (
|
|
lib.hasSuffix ".jpg" baseName ||
|
|
lib.hasSuffix ".png" baseName ||
|
|
lib.hasSuffix ".jpeg" baseName
|
|
));
|
|
};
|
|
|
|
# Nautilus python extensions
|
|
xdg.dataFile."nautilus-python/extensions/localsend.py".source = ../../core/home/config/nautilus-python/extensions/localsend.py;
|
|
}
|