From 58f0462cd509de3a53028e609e633a60e8684431 Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Mon, 10 Mar 2025 21:44:55 +0800 Subject: [PATCH] chore: with config.lib.stylix.colors --- home/programs/coding/nixvim/default.nix | 8 ------ home/programs/desktop/niri/waybar.nix | 33 +++++++++++++------------ home/programs/desktop/tofi.nix | 31 ++++++++++++----------- home/tweaks/fcitx5.nix | 23 ++++++++--------- 4 files changed, 45 insertions(+), 50 deletions(-) diff --git a/home/programs/coding/nixvim/default.nix b/home/programs/coding/nixvim/default.nix index dfd33c8..faa61c6 100644 --- a/home/programs/coding/nixvim/default.nix +++ b/home/programs/coding/nixvim/default.nix @@ -40,14 +40,6 @@ Boolean.fg = base0E; String.italic = true; String.fg = base0B; - # LineNrAbove = { - # bg = "#${config.lib.stylix.colors.base00}"; - # fg = "#${config.lib.stylix.colors.base06}"; - # }; - # LineNrBelow = { - # bg = "#${config.lib.stylix.colors.base00}"; - # fg = "#${config.lib.stylix.colors.base07}"; - # }; }; opts = { number = true; diff --git a/home/programs/desktop/niri/waybar.nix b/home/programs/desktop/niri/waybar.nix index a85dd41..8495b95 100644 --- a/home/programs/desktop/niri/waybar.nix +++ b/home/programs/desktop/niri/waybar.nix @@ -1,4 +1,5 @@ { config, ... }: +with config.lib.stylix.colors; let moduleConfiguration = # jsonc @@ -24,14 +25,14 @@ let }, "memory": { "interval": 30, - "format": " {used:0.1f}G/{total:0.1f}G", + "format": " {used:0.1f}G/{total:0.1f}G", "on-click": "kitty --class=htop,htop -e htop" }, "backlight": { "device": "intel_backlight", "on-scroll-up": "light -A 1", "on-scroll-down": "light -U 1", - "format": "{icon} {percent}%", + "format": "{icon} {percent}%", "format-icons": [ "", "" @@ -42,7 +43,7 @@ let "spacing": 10 }, "clock": { - "format": " {:%a %d %H:%M}", + "format": " {:%a %d %H:%M}", "tooltip-format": "{:%Y %B}\n{calendar}", "on-click": "kitty --class=clock,clock --title=clock -o remember_window_size=no -o initial_window_width=600 -o initial_window_height=200 -e tty-clock -s -c -C 5" }, @@ -51,13 +52,13 @@ let "warning": 30, "critical": 15, }, - "format": "{icon} {capacity}%", - "format-warning": "{icon} {capacity}%", - "format-critical": "{icon} {capacity}%", - "format-charging": "{capacity}%", - "format-plugged": "{capacity}%", - "format-alt": "{icon} {time}", - "format-full": "{capacity}%", + "format": "{icon} {capacity}%", + "format-warning": "{icon} {capacity}%", + "format-critical": "{icon} {capacity}%", + "format-charging": "{capacity}%", + "format-plugged": "{capacity}%", + "format-alt": "{icon} {time}", + "format-full": "{capacity}%", "format-icons": [ "", "", @@ -69,10 +70,10 @@ let "interval": 5 }, "network": { - "format-wifi": "󰖩 {essid}", - "format-ethernet": "󰤭 Disconnected", + "format-wifi": "󰖩 {essid}", + "format-ethernet": "󰤭 Disconnected", "format-linked": "{ifname} (No IP) 󱚵", - "format-disconnected": "Disconnected", + "format-disconnected": "Disconnected", "tooltip-format-wifi": "Signal Strenght: {signalStrength}%", "on-click": "kitty --class nmtui,nmtui --title=nmtui -o remember_window_size=no -o initial_window_width=400 -o initial_window_height=400 -e doas nmtui" }, @@ -80,8 +81,8 @@ let "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", "on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.01+", "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.01-", - "format": "{icon} {volume}%", - "format-muted": "Muted", + "format": "{icon} {volume}%", + "format-muted": "Muted", "format-icons": { "headphone": "󱡏", "hands-free": "", @@ -114,7 +115,7 @@ let ''; trayBackgroundColor = if config.stylix.polarity == "dark" then "@base00" else "@base05"; colors = { - inherit (config.lib.stylix.colors.withHashtag) + inherit (withHashtag) base00 base01 base04 diff --git a/home/programs/desktop/tofi.nix b/home/programs/desktop/tofi.nix index 81fea61..e801a05 100644 --- a/home/programs/desktop/tofi.nix +++ b/home/programs/desktop/tofi.nix @@ -3,6 +3,7 @@ pkgs, ... }: +with config.lib.stylix.colors; { home.packages = with pkgs; [ tofi @@ -36,29 +37,29 @@ prompt-text = "Can I have a" prompt-padding = 15 - background-color = #${config.lib.stylix.colors.base00} - text-color = #${config.lib.stylix.colors.base05} + background-color = #${base00} + text-color = #${base05} - prompt-color = #${config.lib.stylix.colors.base00} - prompt-background = #${config.lib.stylix.colors.base0B} + prompt-color = #${base00} + prompt-background = #${base0B} prompt-background-padding = 2, 5 prompt-background-corner-radius = 6 - input-color = #${config.lib.stylix.colors.base00} - input-background = #${config.lib.stylix.colors.base07} + input-color = #${base00} + input-background = #${base07} input-background-padding = 2, 5 input-background-corner-radius = 6 - alternate-result-color = #${config.lib.stylix.colors.base00} - alternate-result-background = #${config.lib.stylix.colors.base0A} + alternate-result-color = #${base00} + alternate-result-background = #${base0A} alternate-result-background-padding = 2, 5 alternate-result-background-corner-radius = 6 - selection-color = #${config.lib.stylix.colors.base00} - selection-background = #${config.lib.stylix.colors.base0E} + selection-color = #${base00} + selection-background = #${base0E} selection-background-padding = 2, 5 selection-background-corner-radius = 6 - selection-match-color = #${config.lib.stylix.colors.base00} + selection-match-color = #${base00} clip-to-padding = false @@ -76,9 +77,9 @@ # font = Comic Mono Nerd Font font = Hug Me Tight prompt-padding = 15 - background-color = #${config.lib.stylix.colors.base00}aa - text-color = #${config.lib.stylix.colors.base05} - prompt-color = #${config.lib.stylix.colors.base0B} - selection-color = #${config.lib.stylix.colors.base0E} + background-color = #${base00}aa + text-color = #${base05} + prompt-color = #${base0B} + selection-color = #${base0E} ''; } diff --git a/home/tweaks/fcitx5.nix b/home/tweaks/fcitx5.nix index 0c8db75..4d44b23 100644 --- a/home/tweaks/fcitx5.nix +++ b/home/tweaks/fcitx5.nix @@ -1,4 +1,5 @@ { config, ... }: +with config.lib.stylix.colors; { xdg.dataFile."fcitx5/themes/stylix/theme.conf".text = # ini @@ -14,16 +15,16 @@ Font=Sans 13 # 非选中候选字颜色 #Blue - NormalColor=#${config.lib.stylix.colors.base0D} + NormalColor=#${base0D} # 选中候选字颜色 #Peach - HighlightCandidateColor=#${config.lib.stylix.colors.base00} + HighlightCandidateColor=#${base00} # 高亮前景颜色(输入字符颜色) #Peach - HighlightColor=#${config.lib.stylix.colors.base07} + HighlightColor=#${base07} # 输入字符背景颜色 # Black3/surface0 - HighlightBackgroundColor=#${config.lib.stylix.colors.base02} + HighlightBackgroundColor=#${base02} # Spacing=3 @@ -39,9 +40,9 @@ [InputPanel/Background] #Black3/surface0 - Color=#${config.lib.stylix.colors.base01} + Color=#${base01} #Black3/surface0 - BorderColor=#${config.lib.stylix.colors.base0E} + BorderColor=#${base0E} BorderWidth=0 [InputPanel/Background/Margin] @@ -52,7 +53,7 @@ [InputPanel/Highlight] #Black3/surface0 - Color=#${config.lib.stylix.colors.base0E} + Color=#${base0E} [InputPanel/Highlight/Margin] # 高亮区域左边距 @@ -67,13 +68,13 @@ [Menu] Font=Sans 10 #White/Text - NormalColor=#${config.lib.stylix.colors.base05} + NormalColor=#${base05} #HighlightColor=#4c566a Spacing=3 [Menu/Background] #Black3/surface0 - Color=#${config.lib.stylix.colors.base02} + Color=#${base02} [Menu/Background/Margin] Left=2 @@ -89,7 +90,7 @@ [Menu/Highlight] #Pink - Color=#${config.lib.stylix.colors.base0E} + Color=#${base0E} [Menu/Highlight/Margin] Left=10 @@ -99,7 +100,7 @@ [Menu/Separator] #Black2/base - Color=#${config.lib.stylix.colors.base00} + Color=#${base00} [Menu/TextMargin] Left=5