From a2f09d4f75cf9d00fa225bf3a75a01a23b6feeaa Mon Sep 17 00:00:00 2001 From: brustybee Date: Wed, 25 Mar 2026 01:00:42 +0530 Subject: lot is a lot --- common/modules/matugen/default.nix | 20 +++++++------ common/modules/matugen/templates/matugen-rofi.nix | 35 +++++++++++----------- .../modules/matugen/templates/matugen-terminal.nix | 4 +-- 3 files changed, 31 insertions(+), 28 deletions(-) (limited to 'common/modules/matugen') diff --git a/common/modules/matugen/default.nix b/common/modules/matugen/default.nix index e9e9252..5ce3014 100644 --- a/common/modules/matugen/default.nix +++ b/common/modules/matugen/default.nix @@ -43,15 +43,15 @@ in color_space = "salience"; check_contrast = true; templates = { - foot = { + foot = lib.mkIf config.beeMods.terminal.foot { template = "foot-colors.ini"; target = "~/.config/foot/colors.ini"; }; - alacritty = { + alacritty = lib.mkIf config.beeMods.terminal.alacritty { template = "alacritty-colors.toml"; target = "~/.config/alacritty/colors.toml"; }; - ghostty = { + ghostty = lib.mkIf config.beeMods.terminal.ghostty { template = "ghostty-colors.conf"; target = "~/.config/ghostty/colors.conf"; }; @@ -59,11 +59,11 @@ in template = "userChrome.css"; target = "~/.cache/wallust/userChrome.css"; }; - xresources = { + xresources = lib.mkIf config.beeMods.dwm.enable { template = "colors-xresources"; target = "~/.config/x11/matugen.Xresources"; }; - sequences = { + sequences = lib.mkIf (config.beeMods.terminal.default == "foot") { template = "sequences"; target = "~/.config/sequences"; }; @@ -180,14 +180,16 @@ in output_path = "~/.config/matugen/neovim_matugen.json" ''} + ${lib.optionalString (config.beeMods.terminal.default == "foot") '' + [templates.sequences] + input_path = '~/.config/matugen/templates/sequences' + output_path = '~/.config/wallust/templates/sequences' + ''} + [templates.zed] input_path = '~/.config/matugen/templates/zed.json' output_path = '~/.config/zed/themes/matugen.json' - [templates.sequences] - input_path = '~/.config/matugen/templates/sequences' - output_path = '~/.config/wallust/templates/sequences' - [templates.zen] input_path = '~/.config/matugen/templates/zen.css' output_path = '~/.config/wallust/templates/userChrome.css' diff --git a/common/modules/matugen/templates/matugen-rofi.nix b/common/modules/matugen/templates/matugen-rofi.nix index 2241c6d..60bf616 100644 --- a/common/modules/matugen/templates/matugen-rofi.nix +++ b/common/modules/matugen/templates/matugen-rofi.nix @@ -7,23 +7,24 @@ config = lib.mkIf config.programs.rofi.enable { xdg.configFile = { "matugen/templates/rofi-colors.rasi" = { - text = - # rasi - '' - * { - <* if {{ is_dark_mode }} *> - background: {{colors.surface.default.hex}}; - background-alt: {{colors.surface_container.default.hex}}; - <* else *> - background: {{colors.surface_container.default.hex}}; - background-alt: {{colors.surface_container_high.default.hex}}; - <* endif *> - foreground: {{colors.on_surface.default.hex}}; - selected: {{colors.primary.default.hex}}; - active: {{colors.secondary.default.hex}}; - urgent: {{colors.error.default.hex}}; - } - ''; + text = '' + * { + <* if {{ is_dark_mode }} *> + bg: {{colors.surface.default.hex}}; + bg-alt: {{colors.surface_container.default.hex}}; + <* else *> + bg: {{colors.surface_container.default.hex}}; + bg-alt: {{colors.surface_container_highest.default.hex}}; + <* endif *> + fg: {{colors.on_surface.default.hex}}; + fg-dim: {{colors.on_surface_variant.default.hex}}; + accent: {{colors.primary.default.hex}}; + selected-bg: {{colors.primary.default.hex}}; + selected-fg: {{colors.surface.default.hex}}; + urgent: {{colors.error.default.hex}}; + outline: {{colors.outline.default.hex}}; + } + ''; }; }; }; diff --git a/common/modules/matugen/templates/matugen-terminal.nix b/common/modules/matugen/templates/matugen-terminal.nix index 5ae9d86..c592226 100644 --- a/common/modules/matugen/templates/matugen-terminal.nix +++ b/common/modules/matugen/templates/matugen-terminal.nix @@ -87,9 +87,9 @@ xdg.configFile."matugen/templates/ghostty.conf" = { text = '' <* if {{ is_dark_mode }} *> - background = '{{colors.background.default.hex}}' + background = {{colors.background.default.hex}} <* else *> - background = '{{colors.surface_container.default.hex}}' + background = {{colors.surface_container.default.hex}} <* endif *> foreground = {{colors.on_surface.default.hex}} cursor-color = {{colors.primary.default.hex}} -- cgit v1.3.1