From 291cc4d5879f74b27694e8a79181330cd0c8e519 Mon Sep 17 00:00:00 2001 From: dafu Date: Sun, 13 Sep 2026 00:24:20 +0200 Subject: [PATCH] color changes --- bin/colortest | 34 +++++++++++++++++++ foot/foot.ini | 4 +-- foot/muted.ini | 31 +++++++++++++++++ mango/autostart.sh | 2 +- mango/config.conf | 21 ++++++------ waybar/mocha.css | 84 ++++++++++++++++++++++++++++++++++++++++++++++ waybar/style.css | 6 ++-- 7 files changed, 166 insertions(+), 16 deletions(-) create mode 100755 bin/colortest create mode 100644 foot/muted.ini create mode 100644 waybar/mocha.css diff --git a/bin/colortest b/bin/colortest new file mode 100755 index 0000000..0905c11 --- /dev/null +++ b/bin/colortest @@ -0,0 +1,34 @@ +#!/bin/sh +# Show the 16 base terminal colors (regular0-7, bright0-7) as fg/bg swatches +# with sample text, for eyeballing a foot/terminal colorscheme. + +names="black red green yellow blue magenta cyan white" + +printf '\n\033[1mForeground on default background:\033[0m\n' +i=0 +for n in $names; do + printf ' \033[3%sm%2d regular %-8s sample text AaBbCc\033[0m\n' "$i" "$i" "$n" + i=$((i + 1)) +done +i=0 +for n in $names; do + printf ' \033[9%sm%2d bright %-8s sample text AaBbCc\033[0m\n' "$i" "$((i + 8))" "$n" + i=$((i + 1)) +done + +printf '\n\033[1mBackground swatches (with contrasting text):\033[0m\n' +i=0 +for n in $names; do + fg=15 + [ "$i" = 3 ] && fg=0 + [ "$i" = 7 ] && fg=0 + printf ' \033[4%sm\033[38;5;%sm %2d regular %-8s \033[0m' "$i" "$fg" "$i" "$n" + i=$((i + 1)) +done +printf '\n' +i=0 +for n in $names; do + printf ' \033[10%sm\033[38;5;0m %2d bright %-8s \033[0m' "$i" "$((i + 8))" "$n" + i=$((i + 1)) +done +printf '\n\n' diff --git a/foot/foot.ini b/foot/foot.ini index 1cc3880..9a28639 100644 --- a/foot/foot.ini +++ b/foot/foot.ini @@ -1,5 +1,5 @@ font=JetBrainsMonoNl:size=11:weight=normal -include=/home/dafu/.config/foot/kanso.ini +include=/home/dafu/.config/foot/muted.ini pad=10x10 # selection-target=clipboard @@ -20,7 +20,7 @@ clipboard-paste=BTN_RIGHT select-extend=BTN_LEFT-5 # select-extend=BTN_RIGHT [colors-dark] -alpha=0.7 +# alpha=0.7 # catppuccin # [colors] diff --git a/foot/muted.ini b/foot/muted.ini new file mode 100644 index 0000000..4f3fcbc --- /dev/null +++ b/foot/muted.ini @@ -0,0 +1,31 @@ +[colors-dark] +foreground=c5c9c7 +background=090e13 + +regular0=12171d +regular1=a35e5c +regular2=8fb276 +regular3=ae9f6f +regular4=6f98ae +regular5=996fae +regular6=6faea7 +regular7=a4a7a4 + +bright0=5c6066 +bright1=b9716e +bright2=a3c78a +bright3=c3b383 +bright4=83adc3 +bright5=ae83c3 +bright6=83c3bc +bright7=c5c9c7 + +16=b08b6d +17=b07e6d + +selection-foreground=c5c9c7 +selection-background=22262d + +cursor=090e13 c5c9c7 + +urls=8ea2ac diff --git a/mango/autostart.sh b/mango/autostart.sh index afee77a..f1d4171 100755 --- a/mango/autostart.sh +++ b/mango/autostart.sh @@ -25,7 +25,7 @@ wl-clip-persist --clipboard regular --reconnect-tries 0 >/dev/null 2>&1 & # clipboard content manager wl-paste --type text --watch cliphist store >/dev/null 2>&1 & -swaybg -m full -i ~/Downloads/brandon-siu-nI7knd5sQfo-unsplash.jpg & +swaybg -m fill -i ~/Pictures/wallpapers/foot-muted-hex.png & # inhibit by audio # sway-audio-idle-inhibit >/dev/null 2>&1 & diff --git a/mango/config.conf b/mango/config.conf index 68680a0..7919061 100644 --- a/mango/config.conf +++ b/mango/config.conf @@ -90,7 +90,7 @@ enable_floating_snap=1 snap_distance=50 # cursor_size=24 # cursor_theme=Bibata-Modern-Ice -cursor_hide_timeout=0 +cursor_hide_timeout=2 drag_tile_to_tile=1 single_scratchpad = 1 @@ -126,14 +126,15 @@ gappov=0 scratchpad_width_ratio=0.8 scratchpad_height_ratio=0.9 borderpx=1 -rootcolor=0x201b14ff -bordercolor=0x444444ff -focuscolor=0xc9b890ff -maximizescreencolor=0xDA7510ff -urgentcolor=0xad401fff -scratchpadcolor=0xc4939dff -globalcolor=0x8d64cfff -overlaycolor=0x89aa61ff +# Catppuccin Mocha +rootcolor=0x11111bff +bordercolor=0x585b70ff +focuscolor=0xb4befeff +maximizescreencolor=0xfab387ff +urgentcolor=0xf38ba8ff +scratchpadcolor=0xf5c2e7ff +globalcolor=0xcba6f7ff +overlaycolor=0xa6e3a1ff # sub config load source=./env.conf @@ -145,4 +146,4 @@ exec-once=~/.config/mango/autostart.sh # source=./dms/outputs.conf source=./monitor.conf -source=./dms/colors.conf +# source=./dms/colors.conf diff --git a/waybar/mocha.css b/waybar/mocha.css new file mode 100644 index 0000000..92a7fa2 --- /dev/null +++ b/waybar/mocha.css @@ -0,0 +1,84 @@ +/* + * Catppuccin Mocha Color Palette for Waybar + * Colors from https://github.com/catppuccin/catppuccin + */ + +/* Raw Catppuccin Mocha Colors */ +@define-color rosewater #f5e0dc; +@define-color flamingo #f2cdcd; +@define-color pink #f5c2e7; +@define-color mauve #cba6f7; +@define-color red #f38ba8; +@define-color maroon #eba0ac; +@define-color peach #fab387; +@define-color yellow #f9e2af; +@define-color green #a6e3a1; +@define-color teal #94e2d5; +@define-color sky #89dceb; +@define-color sapphire #74c7ec; +@define-color blue #89b4fa; +@define-color lavender #b4befe; + +@define-color text #cdd6f4; +@define-color subtext1 #bac2de; +@define-color subtext0 #a6adc8; +@define-color overlay2 #9399b2; +@define-color overlay1 #7f849c; +@define-color overlay0 #6c7086; +@define-color surface2 #585b70; +@define-color surface1 #45475a; +@define-color surface0 #313244; +@define-color base #1e1e2e; +@define-color mantle #181825; +@define-color crust #11111b; + +/* GTK/Waybar Theme Variable Mappings */ +/* Widget text/foreground color */ +@define-color theme_fg_color @text; +/* Text color for entries, views, and general content */ +@define-color theme_text_color @text; +/* Widget base background color (Mocha crust @ 85% opacity) */ +@define-color theme_bg_color rgba(17, 17, 27, 1); +/* Text widgets and the like base background color (dark grey-blue) */ +@define-color theme_base_color @surface0; +/* Base background color of selections */ +@define-color theme_selected_bg_color @lavender; +/* Text/foreground color of selections */ +@define-color theme_selected_fg_color @base; + +/* Disabled widgets styling */ +@define-color insensitive_bg_color @surface1; +@define-color insensitive_fg_color @overlay1; +@define-color insensitive_base_color @mantle; + +/* Backdrop/unfocused window styling */ +@define-color theme_unfocused_fg_color @subtext0; +@define-color theme_unfocused_text_color @subtext0; +@define-color theme_unfocused_bg_color rgba(17, 17, 27, 0.85); +@define-color theme_unfocused_base_color @mantle; +@define-color theme_unfocused_selected_bg_color @surface2; +@define-color theme_unfocused_selected_fg_color @text; + +/* Border styling */ +@define-color borders @crust; +@define-color unfocused_borders @crust; + +/* State & Status Colors */ +@define-color warning_color @peach; +@define-color error_color @red; +@define-color success_color @green; + +/* Duplicate / Fallback definitions for compatibility */ +@define-color fg_color @text; +@define-color text_color @text; +@define-color bg_color rgba(17, 17, 27, 0.85); +@define-color base_color @surface0; +@define-color selected_bg_color @lavender; +@define-color selected_fg_color @base; + +@define-color unfocused_fg_color @subtext0; +@define-color unfocused_text_color @subtext0; +@define-color unfocused_bg_color rgba(17, 17, 27, 0.85); +@define-color unfocused_base_color @mantle; +@define-color unfocused_selected_bg_color @surface2; +@define-color unfocused_selected_fg_color @text; diff --git a/waybar/style.css b/waybar/style.css index 48c9b6e..893fb94 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,4 +1,4 @@ -@import "frappe.css"; +@import "mocha.css"; * { @@ -67,7 +67,7 @@ tooltip label { #waybar { background: @theme_bg_color; - color: rgba(198, 208, 245, 0.3); + color: rgba(205, 214, 244, 0.3); } #window, #mpris { @@ -90,7 +90,7 @@ tooltip label { margin: 2px 3px; padding: 0px; min-width: 24px; - color: rgba(198, 208, 245, 0.3); + color: rgba(205, 214, 244, 0.3); } #tags button.occupied {