From cde06bed949235cae1d22ac02ec2cf415c619dd1 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Wed, 21 May 2025 13:40:23 -0700 Subject: [PATCH] gitui: use mkTarget --- modules/gitui/hm.nix | 64 +++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/modules/gitui/hm.nix b/modules/gitui/hm.nix index 73cbadc4..7246cd04 100644 --- a/modules/gitui/hm.nix +++ b/modules/gitui/hm.nix @@ -1,33 +1,35 @@ -{ config, lib, ... }: -{ - options.stylix.targets.gitui.enable = - config.lib.stylix.mkEnableTarget "GitUI" true; +{ mkTarget, ... }: +mkTarget { + name = "gitui"; + humanName = "GitUI"; - config = lib.mkIf (config.stylix.enable && config.stylix.targets.gitui.enable) { - programs.gitui.theme = with config.lib.stylix.colors.withHashtag; '' - ( - selected_tab: Some("Reset"), - command_fg: Some("${base05}"), - selection_bg: Some("${base04}"), - selection_fg: Some("${base05}"), - cmdbar_bg: Some("${base01}"), - cmdbar_extra_lines_bg: Some("${base01}"), - disabled_fg: Some("${base04}"), - diff_line_add: Some("${base0B}"), - diff_line_delete: Some("${base08}"), - diff_file_added: Some("${base0A}"), - diff_file_removed: Some("${base08}"), - diff_file_moved: Some("${base0E}"), - diff_file_modified: Some("${base09}"), - commit_hash: Some("${base07}"), - commit_time: Some("${base05}"), - commit_author: Some("${base0D}"), - danger_fg: Some("${base08}"), - push_gauge_bg: Some("${base0D}"), - push_gauge_fg: Some("${base00}"), - tag_fg: Some("${base06}"), - branch_fg: Some("${base0C}") - ) - ''; - }; + configElements = + { colors }: + { + programs.gitui.theme = with colors.withHashtag; '' + ( + selected_tab: Some("Reset"), + command_fg: Some("${base05}"), + selection_bg: Some("${base04}"), + selection_fg: Some("${base05}"), + cmdbar_bg: Some("${base01}"), + cmdbar_extra_lines_bg: Some("${base01}"), + disabled_fg: Some("${base04}"), + diff_line_add: Some("${base0B}"), + diff_line_delete: Some("${base08}"), + diff_file_added: Some("${base0A}"), + diff_file_removed: Some("${base08}"), + diff_file_moved: Some("${base0E}"), + diff_file_modified: Some("${base09}"), + commit_hash: Some("${base07}"), + commit_time: Some("${base05}"), + commit_author: Some("${base0D}"), + danger_fg: Some("${base08}"), + push_gauge_bg: Some("${base0D}"), + push_gauge_fg: Some("${base00}"), + tag_fg: Some("${base06}"), + branch_fg: Some("${base0C}") + ) + ''; + }; }