Merge branch 'master' into laptop

This commit is contained in:
Thomas Avé 2024-04-20 12:52:24 +02:00
commit a856d6461b
3 changed files with 12 additions and 11 deletions

View File

@ -1,6 +1,3 @@
#
# aerc main configuration
[general] [general]
# #
# Used as a default path for save operations if no other path is specified. # Used as a default path for save operations if no other path is specified.
@ -568,7 +565,7 @@ pager=nvim -u $XDG_CONFIG_HOME/nvim/aerc.lua
# ignored. # ignored.
# #
# This parameter can also be set per account in accounts.conf. # This parameter can also be set per account in accounts.conf.
#address-book-cmd= address-book-cmd='notmuch address "%s"'
# Specifies the command to be used to select attachments. Any occurrence of # Specifies the command to be used to select attachments. Any occurrence of
# '%s' in the file-picker-cmd will be replaced with the argument <arg> # '%s' in the file-picker-cmd will be replaced with the argument <arg>
@ -622,7 +619,9 @@ pager=nvim -u $XDG_CONFIG_HOME/nvim/aerc.lua
# #
# Example (obviously, this requires that you write your main text/plain body # Example (obviously, this requires that you write your main text/plain body
# using the markdown syntax): # using the markdown syntax):
text/html=pandoc -f markdown -t html --standalone # text/html=pandoc -f markdown -t html --standalone
# text/html=lynx -dump -force_html -stdin
text/html=w3m -dump -o display_link_number=1 -T text/html
[filters] [filters]
# #
@ -662,7 +661,8 @@ text/plain=cat
text/calendar=gnome-calendar text/calendar=gnome-calendar
message/delivery-status=cat message/delivery-status=cat
message/rfc822=cat message/rfc822=cat
text/html=pandoc -f html -t plain # text/html=lynx -dump -force_html -stdin
text/html=w3m -dump -o display_link_number=1 -T text/html
#text/html=html | colorize #text/html=html | colorize
text/*=bat -fP --file-name="$AERC_FILENAME" text/*=bat -fP --file-name="$AERC_FILENAME"
application/x-sh=bat -fP -l sh application/x-sh=bat -fP -l sh

View File

@ -35,8 +35,7 @@ K = :prev-folder<Enter>
v = :mark -t<Enter> v = :mark -t<Enter>
# <Space> = :mark -t<Enter>:next<Enter> # <Space> = :mark -t<Enter>:next<Enter>
V = :mark -v<Enter> V = :mark -v<Enter>
<Space> = :read<Enter> <Space> = :read -t<Enter>
<C-Space> = :unread<Enter>
T = :toggle-threads<Enter> T = :toggle-threads<Enter>
# zc = :fold<Enter> # zc = :fold<Enter>
@ -51,6 +50,7 @@ d = :prompt 'Really delete this message?' 'delete-message'<Enter>
D = :delete<Enter> D = :delete<Enter>
a = :archive flat<Enter> a = :archive flat<Enter>
A = :unmark -a<Enter>:mark -T<Enter>:archive flat<Enter> A = :unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>
f = :flag -t<Enter>
c = :compose<Enter> c = :compose<Enter>
m = :compose<Enter> m = :compose<Enter>
@ -65,8 +65,8 @@ $ = :term<space>
! = :term<space> ! = :term<space>
| = :pipe<space> | = :pipe<space>
/ = :search<space> / = :search -a<space>
\ = :filter<space> \ = :filter -a <space>
n = :next-result<Enter> n = :next-result<Enter>
N = :prev-result<Enter> N = :prev-result<Enter>
<Esc> = :clear<Enter> <Esc> = :clear<Enter>
@ -96,7 +96,7 @@ A = :archive flat<Enter>
<C-l> = :open-link <space> <C-l> = :open-link <space>
f = :forward<Enter> f = :flag -t<Enter>
rr = :reply -a<Enter> rr = :reply -a<Enter>
rq = :reply -aq<Enter> rq = :reply -aq<Enter>
Rr = :reply<Enter> Rr = :reply<Enter>

View File

@ -17,3 +17,4 @@ export ZDOTDIR="$XDG_CONFIG_HOME"/zsh
export XDG_CURRENT_DESKTOP=GNOME export XDG_CURRENT_DESKTOP=GNOME
export OPENCV_LOG_LEVEL=ERROR export OPENCV_LOG_LEVEL=ERROR
export PATH="$HOME/.local/bin:$PATH" export PATH="$HOME/.local/bin:$PATH"
export COLORTERM=truecolor