From 8a83312514b83ff7035620da58ef8ace852504a3 Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Tue, 20 May 2025 10:37:20 +0200 Subject: [PATCH] aerc style tweaks and config reordering --- aerc/binds.conf | 154 +++++++++++++--------------- aerc/stylesets/catppuccin.frappe | 6 ++ aerc/stylesets/catppuccin.latte | 6 ++ aerc/stylesets/catppuccin.macchiato | 6 ++ aerc/stylesets/catppuccin.mocha | 6 ++ aerc/stylesets/qxx.conf | 30 +++--- 6 files changed, 108 insertions(+), 100 deletions(-) diff --git a/aerc/binds.conf b/aerc/binds.conf index d32eb95..86f992d 100644 --- a/aerc/binds.conf +++ b/aerc/binds.conf @@ -1,73 +1,61 @@ # Binds are of the form = # To use '=' in a key sequence, substitute it with "Eq": "" # If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit - = :prev-tab +# make consistent vs newsboat c-j vs J = :next-tab -\[t = :prev-tab -\]t = :next-tab + = :prev-tab = :term ? = :help keys +\[t = :prev-tab +\]t = :next-tab [messages] -q = :quit - -j = :next - = :next +! = :term +$ = :term +/ = :search +| = :pipe + = :prev 100% = :next 50% = :next 100% - = :next 100% - -k = :prev - = :prev = :prev 50% - = :prev 100% - = :prev 100% -g = :select 0 -G = :select -1 - -J = :next-folder -K = :prev-folder -H = :collapse-folder -L = :expand-folder - -v = :mark -t -V = :mark -v - -T = :toggle-threads - -zz = :align center -zt = :align top -zb = :align bottom - + = :next = :view -dd = :mv Trash -D = :delete-message -m = :move -aa = :archive flat -A = :unmark -a:mark -T:archive flat - -C = :compose - -b = :bounce - -rr = :reply -a -rq = :reply -aq -Rr = :reply -Rq = :reply -q - -c = :cf -$ = :term -! = :term -| = :pipe - -/ = :search + = :clear + = :next 100% + = :prev 100% + = :prev \ = :filter +A = :unmark -a:mark -T:archive flat +aa = :archive flat +b = :bounce +c = :cf +C = :compose +D = :delete-message +dd = :mv Trash +G = :select -1 +g = :select 0 +H = :collapse-folder +J = :next-folder +j = :next +K = :prev-folder +k = :prev +L = :expand-folder +m = :move n = :next-result N = :prev-result - = :clear - +q = :quit +rq = :reply -aq +Rq = :reply -q +rr = :reply -a +Rr = :reply s = :split S = :vsplit +T = :toggle-threads +v = :mark -t +V = :mark -v +zb = :align bottom +zt = :align top +zz = :align center [messages:folder=Drafts] = :recall @@ -82,30 +70,27 @@ D = :delete-message [view] / = :toggle-key-passthrough/ -q = :close -O = :open -o = :open -S = :save | = :pipe -dd = :mv Trash -D = :delete-message -m = :move -aa = :archive flat -A = :unmark -a:mark -T:archive flat - - = :open-link - -f = :forward -rr = :reply -a -rq = :reply -aq -Rr = :reply -Rq = :reply -q - -H = :toggle-headers - = :prev-part = :next-part + = :open-link + = :prev-part +A = :unmark -a:mark -T:archive flat +aa = :archive flat +D = :delete-message +dd = :mv Trash +f = :forward +H = :toggle-headers J = :next K = :prev +m = :move +O = :open +o = :open +q = :close +rq = :reply -aq +Rq = :reply -q +rr = :reply -a +Rr = :reply +S = :save [view:folder=Trash] dd = :delete-message @@ -117,28 +102,27 @@ $ex = = :toggle-key-passthrough [compose] -# Keybindings used when the embedded terminal is not selected in the compose -# view -$noinherit = true -$ex = +# Keybindings used when the embedded terminal is not selected in the compose view $complete = - = :prev-field - = :next-field - = :switch-account -p +$ex = +$noinherit = true = :switch-account -n - = :next-field + = :switch-account -p = :prev-field - = :prev-tab + = :next-field = :next-tab + = :prev-field + = :prev-tab + = :next-field [compose::editor] # Keybindings used when the embedded terminal is selected in the compose view $noinherit = true $ex = - = :prev-field = :next-field - = :prev-tab = :next-tab + = :prev-field + = :prev-tab [compose::review] y = :send # Send @@ -156,5 +140,5 @@ x = :encrypt # Toggle encryption to all recipients $noinherit = true $ex = - = :prev-tab = :next-tab + = :prev-tab diff --git a/aerc/stylesets/catppuccin.frappe b/aerc/stylesets/catppuccin.frappe index e94b0f8..f6b7377 100644 --- a/aerc/stylesets/catppuccin.frappe +++ b/aerc/stylesets/catppuccin.frappe @@ -35,6 +35,12 @@ statusline_success.bold=true completion_default.selected.bg=#414559 +part_*.fg=#c6d0f5 +part_mimetype.fg=#c6d0f5 +part_*.selected.fg=#c6d0f5 +part_*.selected.bg=#303446 +part_filename.selected.bold=true + [viewer] url.fg=#8caaee url.underline=true diff --git a/aerc/stylesets/catppuccin.latte b/aerc/stylesets/catppuccin.latte index 368ae4c..cd03396 100644 --- a/aerc/stylesets/catppuccin.latte +++ b/aerc/stylesets/catppuccin.latte @@ -35,6 +35,12 @@ statusline_success.bold=true completion_default.selected.bg=#ccd0da +part_*.fg=#4c4f69 +part_mimetype.fg=#4c4f69 +part_*.selected.fg=#4c4f69 +part_*.selected.bg=#eff1f5 +part_filename.selected.bold=true + [viewer] url.fg=#1e66f5 url.underline=true diff --git a/aerc/stylesets/catppuccin.macchiato b/aerc/stylesets/catppuccin.macchiato index a58cc41..06cf3c6 100644 --- a/aerc/stylesets/catppuccin.macchiato +++ b/aerc/stylesets/catppuccin.macchiato @@ -35,6 +35,12 @@ statusline_success.bold=true completion_default.selected.bg=#363a4f +part_*.fg=#cad3f5 +part_mimetype.fg=#cad3f5 +part_*.selected.fg=#cad3f5 +part_*.selected.bg=#24273a +part_filename.selected.bold=true + [viewer] url.fg=#8aadf4 url.underline=true diff --git a/aerc/stylesets/catppuccin.mocha b/aerc/stylesets/catppuccin.mocha index aeece23..58cdeee 100644 --- a/aerc/stylesets/catppuccin.mocha +++ b/aerc/stylesets/catppuccin.mocha @@ -35,6 +35,12 @@ statusline_success.bold=true completion_default.selected.bg=#313244 +part_*.fg=#cdd6f4 +part_mimetype.fg=#cdd6f4 +part_*.selected.fg=#cdd6f4 +part_*.selected.bg=#1e1e2e +part_filename.selected.bold=true + [viewer] url.fg=#89b4fa url.underline=true diff --git a/aerc/stylesets/qxx.conf b/aerc/stylesets/qxx.conf index 04bec3b..6d03028 100644 --- a/aerc/stylesets/qxx.conf +++ b/aerc/stylesets/qxx.conf @@ -58,18 +58,18 @@ default.selected.bg=#005f87 completion_default.selected.bg=#005f87 -#[viewer] -#url.fg=#ffffaf -#url.underline=true -#header.fg=#af87ff -#signature.fg=#af87ff -#diff_meta.fg=#ffffff -#diff_meta.bold=true -#diff_chunk.fg=#00cdcd -#diff_add.fg=#00cd00 -#diff_del.fg=#cd0000 -#quote_1.fg=#5fafff -#quote_2.fg=#ff8700 -#quote_3.fg=#af87ff -#quote_4.fg=#ff5fd7 -#quote_x.fg=#808080 +[viewer] +url.fg=#ffffaf +url.underline=true +header.fg=#af87ff +signature.fg=#af87ff +diff_meta.fg=#ffffff +diff_meta.bold=true +diff_chunk.fg=#00cdcd +diff_add.fg=#00cd00 +diff_del.fg=#cd0000 +quote_1.fg=#5fafff +quote_2.fg=#ff8700 +quote_3.fg=#af87ff +quote_4.fg=#ff5fd7 +quote_x.fg=#808080