From 8e462a523cda5bf346fc0768fd99e7e3d1fa2ddb Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Fri, 19 Jun 2026 22:51:51 +0200 Subject: [PATCH] chore(foot)!: update config to newer version --- scripts/toggle-light-dark.sh | 32 +++-- stow/foot/.config/foot/foot.ini | 116 +++++++++--------- .../.config/foot/themes/tdpeuter-dark.ini | 6 +- .../.config/foot/themes/tdpeuter-light.ini | 6 +- 4 files changed, 81 insertions(+), 79 deletions(-) diff --git a/scripts/toggle-light-dark.sh b/scripts/toggle-light-dark.sh index c4667bf..03525d5 100755 --- a/scripts/toggle-light-dark.sh +++ b/scripts/toggle-light-dark.sh @@ -6,8 +6,8 @@ ### Variables ### ################# -THEME_LIGHT='tdpeuter-light' -THEME_DARK='tdpeuter-dark' +THEME_LIGHT='light' +THEME_DARK='dark' THEME_DEFAULT="${THEME_LIGHT}" STATE_DIR="${HOME}/.local/state/sisyphus" @@ -18,6 +18,10 @@ declare -A theme_next theme_next[${THEME_LIGHT}]="${THEME_DARK}" theme_next[${THEME_DARK}]="${THEME_LIGHT}" +declare -A personal_theme +personal_theme[${THEME_LIGHT}]='tdpeuter-light' +personal_theme[${THEME_DARK}]='tdpeuter-dark' + declare -A gsettings_alt gsettings_alt[${THEME_LIGHT}]='default' gsettings_alt[${THEME_DARK}]='prefer-dark' @@ -38,13 +42,13 @@ wallpaper[${THEME_DARK}]="bg-dark" while getopts ":m:g" option; do case "${option}" in m) - if [ "${OPTARG}" == 'light' ]; then + if [ "${OPTARG}" == "${THEME_LIGHT}" ]; then theme="${THEME_LIGHT}" - elif [ "${OPTARG}" == 'dark' ]; then + elif [ "${OPTARG}" == "${THEME_DARK}" ]; then theme="${THEME_DARK}" else - >&2 printf "Error: Invalid mode: '%s'.\nShould be either 'light' or 'dark'\n" "${option}" - exit 1 + >&2 printf "Error: Invalid mode: '%s'.\nShould be either 'light' or 'dark', falling back to default: '%s'\n" "${option}" "${THEME_DEFAULT}" + theme="${THEME_DEFAULT}" fi ;; g) @@ -100,8 +104,8 @@ function update_terminal_colors() { # Foot if [ "$(command -v foot)" ] ; then # Make color theme switch 'permanent'. - echo "include=~/.config/foot/themes/${theme}.ini" > ~/.config/foot/theme.ini & - # We will have to change the terminal colors ourselves. + echo "initial-color-theme=${theme}" > ~/.config/foot/theme.ini & + # We still have to change the terminal colors ourselves for existing sessions. update_terminal_colors & fi @@ -113,7 +117,7 @@ fi # Kitty if [ "$(command -v kitty)" ]; then - kitten themes --reload-in all --config-file-name theme.conf "${theme}" & + kitten themes --reload-in all --config-file-name theme.conf "${personal_theme[${theme}]}" & fi # Sway @@ -129,17 +133,19 @@ fi # Vifm if [ "$(command -v vifm)" ]; then - echo "colorscheme ${theme} Default-256 Default" > ~/.config/vifm/theme.conf + vifm_theme="${personal_theme[${theme}]}" + echo "colorscheme ${vifm_theme} Default-256 Default" > ~/.config/vifm/theme.conf # Update all running instances - vifm --remote -c "colorscheme ${theme}" & + vifm --remote -c "colorscheme ${vifm_theme}" & fi # Vim if [ "$(command -v vim)" ]; then - echo "colorscheme ${theme}" > ~/.vim/theme.conf + vim_theme="${personal_theme[${theme}]}" + echo "colorscheme ${vim_theme}" > ~/.vim/theme.conf # Update all running instances for server in $(vim --serverlist); do - vim --servername "${server}" --remote-send ":colorscheme ${theme}" + vim --servername "${server}" --remote-send ":colorscheme ${vim_theme}" done fi diff --git a/stow/foot/.config/foot/foot.ini b/stow/foot/.config/foot/foot.ini index efcd8d9..3796dad 100644 --- a/stow/foot/.config/foot/foot.ini +++ b/stow/foot/.config/foot/foot.ini @@ -1,7 +1,11 @@ # -*- conf -*- # ~/.config/foot/foot.ini -# Include the correct color scheme +# Color scheme definitions +include=~/.config/foot/themes/tdpeuter-light.ini +include=~/.config/foot/themes/tdpeuter-dark.ini + +# Default color scheme selection include=~/.config/foot/theme.ini # shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) @@ -23,17 +27,20 @@ font=letter extended:size=10 # vertical-letter-offset=0 # underline-offset= # underline-thickness= +# strikout-thickness= # box-drawings-uses-font-glyphs=no dpi-aware=yes +# gamma-correct-blending=no +# initial-color-theme=dark # initial-window-size-pixels=700x500 # Or, # initial-window-size-chars= # initial-window-mode=windowed -#pad=10x10 # optionally append 'center' +# pad=10x10 # optionally append 'center' +# resize-by-cells=yes +# resize-keep-grid=yes # resize-delay-ms=100 -# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body} - # bold-text-in-bright=no # word-delimiters=,│`|:"'()[]{}<> # selection-target=primary @@ -41,16 +48,28 @@ dpi-aware=yes # utmp-helper=/usr/lib/utempter/utempter # When utmp backend is ‘libutempter’ (Linux) # utmp-helper=/usr/libexec/ulog-helper # When utmp backend is ‘ulog’ (FreeBSD) +# uppercase-regex-insert=yes + [environment] # name=value +[security] +# osc52=enabled # disabled|copy-enabled|paste-enabled|enabled + [bell] +# system=yes urgent=yes notify=yes visual=yes # command= # command-focused=no +[desktop-notifications] +# command=notify-send --wait --app-name ${app-id} --icon ${app-id} --category ${category} --urgency ${urgency} --expire-time ${expire-time} --hint STRING:image-path:${icon} --hint BOOLEAN:suppress-sound:${muted} --hint STRING:sound-name:${sound-name} --replace-id ${replace-id} ${action-argument} --print-id -- ${title} ${body} +# command-action-argument=--action ${action-name}=${action-label} +# close="" +# inhibit-when-focused=yes + [scrollback] # lines=1000 # multiplier=3.0 @@ -60,14 +79,26 @@ visual=yes [url] # launch=xdg-open ${url} # label-letters=sadfjklewcmpgh +# style=dotted (none|single|double|curly|doted|dashed) # osc8-underline=url-mode -# protocols=http, https, ftp, ftps, file, gemini, gopher -# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[] +# regex=(((https?://|mailto:|ftp://|file:|ssh:|ssh://|git://|tel:|magnet:|ipfs://|ipns://|gemini://|gopher://|news:)|www\.)([0-9a-zA-Z:/?#@!$&*+,;=.~_%^\-]+|\([]\["0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*\)|\[[\(\)"0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*\]|"[]\[\(\)0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*"|'[]\[\(\)0-9a-zA-Z:/?#@!$&*+,;=.~_%^\-]*')+([0-9a-zA-Z/#@$&*+=~_%^\-]|\([]\["0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*\)|\[[\(\)"0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*\]|"[]\[\(\)0-9a-zA-Z:/?#@!$&'*+,;=.~_%^\-]*"|'[]\[\(\)0-9a-zA-Z:/?#@!$&*+,;=.~_%^\-]*')) + +# You can define your own regex's, by adding a section called +# 'regex:' with a 'regex' and 'launch' key. These can then be tied +# to a key-binding. See foot.ini(5) for details + +# [regex:your-fancy-name] +# regex= +# launch= ${match} +# +# [key-bindings] +# regex-launch=[your-fancy-name] Control+Shift+q +# regex-copy=[your-fancy-name] Control+Alt+Shift+q [cursor] # style=block -# color= # blink=no +# blink-rate=500 # beam-thickness=1.5 # underline-thickness= @@ -78,54 +109,10 @@ visual=yes [touch] # long-press-delay=400 -[colors] -alpha=0.8 -# background=242424 -# foreground=ffffff -flash=b00020 -# flash-alpha=0.5 - -## Normal/regular colors (color palette 0-7) -# regular0=242424 # black -# regular1=f62b5a # red -# regular2=47b413 # green -# regular3=e3c401 # yellow -# regular4=24acd4 # blue -# regular5=f2affd # magenta -# regular6=13c299 # cyan -# regular7=e6e6e6 # white - -## Bright colors (color palette 8-15) -# bright0=616161 # bright black -# bright1=ff4d51 # bright red -# bright2=35d450 # bright green -# bright3=e9e836 # bright yellow -# bright4=5dc5f8 # bright blue -# bright5=feabf2 # bright magenta -# bright6=24dfc4 # bright cyan -# bright7=ffffff # bright white - -## dimmed colors (see foot.ini(5) man page) -# dim0= -# ... -# dim7= - -## The remaining 256-color palette -# 16 = <256-color palette #16> -# ... -# 255 = <256-color palette #255> - -## Misc colors -# selection-foreground= -# selection-background= -# jump-labels= # black-on-yellow -# scrollback-indicator= # black-on-bright-blue -# search-box-no-match= # black-on-red -# search-box-match= # black-on-yellow -# urls= +# colors set by themes [csd] -preferred=none +# preferred=server # size=26 # font= # color= @@ -140,10 +127,10 @@ preferred=none # button-close-color= [key-bindings] -# scrollback-up-page=Shift+Page_Up +# scrollback-up-page=Shift+Page_Up Shift+KP_Page_Up # scrollback-up-half-page=none # scrollback-up-line=none -# scrollback-down-page=Shift+Page_Down +# scrollback-down-page=Shift+Page_Down Shift+KP_Page_Down # scrollback-down-half-page=none # scrollback-down-line=none # scrollback-home=none @@ -162,17 +149,22 @@ preferred=none # pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none # pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none # pipe-selected=[xargs -r firefox] none +# pipe-command-output=[wl-copy] none # Copy last command's output to the clipboard # show-urls-launch=Control+Shift+o # show-urls-copy=none # show-urls-persistent=none # prompt-prev=Control+Shift+z # prompt-next=Control+Shift+x # unicode-input=Control+Shift+u +# color-theme-switch-1=none +# color-theme-switch-2=none +# color-theme-toggle=none # noop=none +# quit=none [search-bindings] # cancel=Control+g Control+c Escape -# commit=Return +# commit=Return KP_Enter # find-prev=Control+r # find-next=Control+s # cursor-left=Left Control+b @@ -185,6 +177,8 @@ preferred=none # delete-prev-word=Mod1+BackSpace Control+BackSpace # delete-next=Delete # delete-next-word=Mod1+d Control+Delete +# delete-to-start=Control+u +# delete-to-end=Control+k # extend-char=Shift+Right # extend-to-word-boundary=Control+w Control+Shift+Right # extend-to-next-whitespace=Control+Shift+w @@ -196,10 +190,10 @@ preferred=none # clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste # primary-paste=Shift+Insert # unicode-input=none -# scrollback-up-page=Shift+Page_Up +# scrollback-up-page=Shift+Page_Up Shift+KP_Page_Up # scrollback-up-half-page=none # scrollback-up-line=none -# scrollback-down-page=Shift+Page_Down +# scrollback-down-page=Shift+Page_Down Shift+KP_Page_Down # scrollback-down-half-page=none # scrollback-down-line=none # scrollback-home=none @@ -213,8 +207,10 @@ preferred=none # \x03=Mod4+c # Map Super+c -> Ctrl+c [mouse-bindings] -# scrollback-up-mouse=BTN_BACK -# scrollback-down-mouse=BTN_FORWARD +# scrollback-up-mouse=BTN_WHEEL_BACK +# scrollback-down-mouse=BTN_WHEEL_FORWARD +# font-increase=Control+BTN_WHEEL_BACK +# font-decrease=Control+BTN_WHEEL_FORWARD # selection-override-modifiers=Shift # primary-paste=BTN_MIDDLE # select-begin=BTN_LEFT diff --git a/stow/foot/.config/foot/themes/tdpeuter-dark.ini b/stow/foot/.config/foot/themes/tdpeuter-dark.ini index 4ee35d8..89be385 100644 --- a/stow/foot/.config/foot/themes/tdpeuter-dark.ini +++ b/stow/foot/.config/foot/themes/tdpeuter-dark.ini @@ -1,8 +1,8 @@ -[colors] -# alpha=0.8 +[colors-dark] +alpha=0.8 background=171717 foreground=dcdfe4 -# flash=b00020 +flash=b00020 # flash-alpha=0.5 ## Normal/regular colors (color palette 0-7) diff --git a/stow/foot/.config/foot/themes/tdpeuter-light.ini b/stow/foot/.config/foot/themes/tdpeuter-light.ini index daeebb9..0cb8dbc 100644 --- a/stow/foot/.config/foot/themes/tdpeuter-light.ini +++ b/stow/foot/.config/foot/themes/tdpeuter-light.ini @@ -1,8 +1,8 @@ -[colors] -# alpha=0.8 +[colors-light] +alpha=0.8 background=fafafa foreground=000000 -# flash=b00020 +flash=b00020 # flash-alpha=0.5 ## Normal/regular colors (color palette 0-7)