myconfig

commit 06c0a01eef2eae6f46ae1acc72b74c6d073c69f5
parent 25e09807aa6946a306afd0d8fa74a6638c3d6cbc
Author: Antoine Amarilli <a3nm@a3nm.net>
Date:   Wed, 14 Dec 2016 17:24:34 +0100

Merge branch 'master' of a3nm.net:git/myconfig

Diffstat:
apt/headless
 | 
1
-
apt/server
 | 
6
++++--
mailcap
 | 
2
+-
mutt/muttrc
 | 
4
++--

4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/apt/headless b/apt/headless
@@ -40,4 +40,3 @@ geographiclib-tools # bigworld
 gnutls-bin # for ssl debugging
 dovecot-sieve # to edit my filters
 pelican # blog
-myrepos # update multiple repositories
diff --git a/apt/server b/apt/server
@@ -24,7 +24,6 @@ fdupes
 debian-goodies
 smartmontools
 mitmproxy
-tig
 xmlstarlet
 apt-file
 reportbug
@@ -49,7 +48,6 @@ pbuilder
 etckeeper
 stress
 apticron
-git-svn
 openvpn
 procmail
 
@@ -70,3 +68,7 @@ pdftk
 qpdf
 
 manpages
+
+tig
+myrepos # update multiple repositories
+git-svn
diff --git a/mailcap b/mailcap
@@ -7,7 +7,7 @@ image/*; /usr/bin/feh -.Z '%s'
 # mutt is a profile configured to use a proxy that does not really exist
 # to ensure that external resources cannot get loaded
 # TODO -no-remote allows only one instance at a time, but -P requires it...
-text/html; ~/bin/mutt_bgrun /usr/bin/iceweasel -P mutt -no-remote %s; nametemplate=%s.html
+text/html; ~/bin/mutt_bgrun /usr/bin/firefox -P mutt -no-remote %s; nametemplate=%s.html
 
 # dump with colors, remove useless whitespace
 text/html; iconv -f %{charset} %s | elinks -dump %{charset} -dump -dump-color-mode 1 /dev/stdin 2>/dev/null | sed 's/ *$//' | sed 's/   //'; copiousoutput
diff --git a/mutt/muttrc b/mutt/muttrc
@@ -153,12 +153,12 @@ macro index Alt-X \
 #set postponed="=draft_written"
 
 # save postponed mail in the inbox
-set postponed="=inbox"
+set postponed="=INBOX"
 # ugly hack to resume the currently highlighted mail
 # may fail messily if you do not create =draft_tmp first
 macro index,pager R \
  "<enter-command>set postponed='=draft_tmp' my_old_maildir_trash=\$maildir_trash nomaildir_trash<enter>\
- s=draft_tmp<enter><recall-message><enter-command>set postponed='=inbox' maildir_trash=\$my_old_maildir_trash<enter>" \
+ s=draft_tmp<enter><recall-message><enter-command>set postponed='=INBOX' maildir_trash=\$my_old_maildir_trash<enter>" \
  "recall current message"
 # unmodified drafts should be saved back to the inbox, not discarded
 set noabort_unmodified