From 5b268d64e8164db9b6474bf7dfec1525e70d8452 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Wed, 21 Sep 2016 16:53:26 +0200 Subject: [PATCH] email fixes" --- .gitmodules | 3 +++ email/.config/offlineimap/config | 1 + email/.mutt/colors.muttrc | 6 ++++++ email/.mutt/gpg.muttrc | 6 ++++++ email/.mutt/muttrc | 17 +++++++---------- email/.mutt/notmuch.muttrc | 19 ------------------- email/.mutt/sidebar.muttrc | 16 ++++++++++++++++ vim/.vim/bundle/vim-linux-coding-style | 1 + 8 files changed, 40 insertions(+), 29 deletions(-) create mode 100644 email/.mutt/gpg.muttrc delete mode 100644 email/.mutt/notmuch.muttrc create mode 100644 email/.mutt/sidebar.muttrc create mode 160000 vim/.vim/bundle/vim-linux-coding-style diff --git a/.gitmodules b/.gitmodules index 598ab4d..a0e2bbe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "vim/.vim/bundle/vim-spl.git"] path = vim/.vim/bundle/vim-spl.git url = git@github.com:dopefishh/vim-spl.git +[submodule "vim/.vim/bundle/vim-linux-coding-style"] + path = vim/.vim/bundle/vim-linux-coding-style + url = https://github.com/vivien/vim-linux-coding-style diff --git a/email/.config/offlineimap/config b/email/.config/offlineimap/config index 50466cc..7511a48 100644 --- a/email/.config/offlineimap/config +++ b/email/.config/offlineimap/config @@ -30,3 +30,4 @@ header = "mailboxes " peritem = "~/.mutt/mail/%(foldername)s/" sep = " " footer = "\n" +incremental = yes diff --git a/email/.mutt/colors.muttrc b/email/.mutt/colors.muttrc index f9deffe..99a2298 100644 --- a/email/.mutt/colors.muttrc +++ b/email/.mutt/colors.muttrc @@ -1,3 +1,4 @@ +# sidebar color normal white default color attachment brightyellow default color hdrdefault cyan default @@ -20,3 +21,8 @@ color index brightyellow default ~O color index blue default ~T color index red default ~D color index brightblue default ~F + +# sidebar +color sidebar_divider blue black +color sidebar_flagged brightblue default +color sidebar_new brightyellow default diff --git a/email/.mutt/gpg.muttrc b/email/.mutt/gpg.muttrc new file mode 100644 index 0000000..87d7316 --- /dev/null +++ b/email/.mutt/gpg.muttrc @@ -0,0 +1,6 @@ +set crypt_use_gpgme=yes +set crypt_autosign +set crypt_replysign +set crypt_replysignencrypted=yes +set crypt_verify_sig=yes +message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp" diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc index b99644b..00dfdeb 100644 --- a/email/.mutt/muttrc +++ b/email/.mutt/muttrc @@ -24,6 +24,7 @@ bind pager j next-line bind pager gg top bind pager G bottom bind index,pager R group-reply +bind index,pager F flag-message # Misc options set timeout=2 @@ -72,16 +73,12 @@ macro index,pager A \ "khard add-email" \ "add the sender email address to khard" +# sidebar +source ~/.mutt/sidebar.muttrc + +# Crypto +source ~/.mutt/gpg.muttrc + # Colors source ~/.mutt/colors.muttrc -# notmuch -source ~/.mutt/notmuch.muttrc - -# Crypto -set crypt_use_gpgme=yes -set crypt_autosign -set crypt_replysign -set crypt_replysignencrypted=yes -set crypt_verify_sig=yes -message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp" diff --git a/email/.mutt/notmuch.muttrc b/email/.mutt/notmuch.muttrc deleted file mode 100644 index 6b299dc..0000000 --- a/email/.mutt/notmuch.muttrc +++ /dev/null @@ -1,19 +0,0 @@ -macro index \ -"set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key\ -notmuch-mutt -r --prompt search\ -`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`\ -set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key" \ - "notmuch: search mail" - -macro index \ -"set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key\ -notmuch-mutt -r thread\ -`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`\ -set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key" \ - "notmuch: reconstruct thread" - -macro index \ -"set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key\ -notmuch-mutt tag -- -inbox\ -set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key" \ - "notmuch: remove message from inbox" diff --git a/email/.mutt/sidebar.muttrc b/email/.mutt/sidebar.muttrc new file mode 100644 index 0000000..a998759 --- /dev/null +++ b/email/.mutt/sidebar.muttrc @@ -0,0 +1,16 @@ +# Settings +set sidebar_visible = yes +set sidebar_width = 25 +set sidebar_next_new_wrap = yes +set mail_check_stats +set sidebar_format = '%B%?F? [%F]?%* %?N?%N/?%S' +set sidebar_sort_method = 'path' + +# Keybindings +bind index,pager \Cj sidebar-prev +bind index,pager \Ck sidebar-next +bind index,pager \Cl sidebar-open +bind index,pager B sidebar-toggle-visible + +# Colors +color indicator cyan black diff --git a/vim/.vim/bundle/vim-linux-coding-style b/vim/.vim/bundle/vim-linux-coding-style new file mode 160000 index 0000000..6c2bb8e --- /dev/null +++ b/vim/.vim/bundle/vim-linux-coding-style @@ -0,0 +1 @@ +Subproject commit 6c2bb8e1839d3cac42eaabca0f4409b263799f27 -- 2.20.1