config updateHEADmaster

14 files changed, 92 insertions, 38 deletions

diff --git a/config/account-collabora b/config/account-collabora
new file mode 100644
index 0000000..197864c
--- /dev/null
+++ b/config/account-collabora
@@ -0,0 +1,7 @@
+set from=sebastian.reichel@collabora.com
+set folder="~/.mail-collabora/"
+set spoolfile="~/.mail-collabora/INBOX"
+set header_cache=~/.mutt/headers-collabora
+
+unmailboxes *
+mailboxes =INBOX =SPAM
diff --git a/config/account-private b/config/account-private
new file mode 100644
index 0000000..777ad46
--- /dev/null
+++ b/config/account-private
@@ -0,0 +1,7 @@
+set from=sre@ring0.de
+set folder="~/.mail/"
+set spoolfile="~/.mail/INBOX"
+set header_cache=~/.mutt/headers
+
+unmailboxes *
+mailboxes =INBOX =Feuerwehr =Hackspace =Debian =Kernel
diff --git a/config/common b/config/common
index 9f638cf..95a0c33 100644
--- a/config/common
+++ b/config/common
@@ -9,7 +9,6 @@ set collapse_unread=yes		# dont collapse threads with unread messages
 set mark_old=no             # neue mails beim beenden nicht als old markieren
 set followup_to=no          # Mail-Followup-To beim verschicken nicht generieren
 set honor_followup_to=no    # Mail-Followup-To ignorieren
-set header_cache=~/.mutt/headers	# cache headers
 set alias_file=~/.mutt/aliases
 set sort_alias=unsorted
 
@@ -23,7 +22,10 @@ mime_lookup application/octet-stream
 unset imap_passive          # Don't wait to enter mailbox manually
 set imap_check_subscribed   # automatically poll subscribed
 set sleep_time = 0          # fast scrolling
-set mail_check = 60         # reduce polling frequency to a sane level
-set timeout    = 10         # poll current mailbox more often
+set timeout    = 1          # poll current mailbox more often
 set net_inc    = 5          # Display download progress every 5K
 set ts_enabled=yes          # fancy xterm title
+
+# index format
+set index_format = "%4C %Z %{%b %d} %-15.15L %s"
+#set index_format = "%4C %Z %{%b %d} %s"
diff --git a/config/editor b/config/editor
index fd47bf8..9e92759 100644
--- a/config/editor
+++ b/config/editor
@@ -1,15 +1,15 @@
 set editor="vim -c 'set tw=68 et'"	# Editor zum Schreiben von Mails
-set sendmail="/usr/bin/msmtp"		# mSMTP zum versenden der Mails
+#set sendmail="/usr/bin/msmtp"		# mSMTP zum versenden der Mails
+set sendmail="/usr/sbin/sendmail"	# postfix zum versenden der Mails
 set use_envelope_from=yes			# verwende Account anhand des From Felds
 set realname="Sebastian Reichel"	# setzten des Namen
 
 # Default From Adresse
 set reverse_name
-set from=sre@ring0.de
-alternates "elektranox@gmail.com|sre@debian.org|sre@kernel.org|sre@kreativitaet-trifft-technik.de|sr@kreativitaet-trifft-technik.de|sr@ktt-ol.de|sre@ktt-ol.de"
+alternates "elektranox@gmail.com|sre@debian.org|sre@kernel.org|sre@kreativitaet-trifft-technik.de|sr@kreativitaet-trifft-technik.de|sr@ktt-ol.de|sre@ktt-ol.de|sre@mainframe.io|sebastian.reichel@collabora.com|sebastian.reichel@collabora.co.uk"
 
 # Macros zum setzen des Accounts
 #set use_from=yes					# From Feld verwenden
 #macro generic "<esc>1" ":set from=elektranox@gmail.com\n"
 #macro generic "<esc>2" ":set from=sre@ring0.de\n"
-#macro generic "<esc>3" ":set from=sebastian.reichel@informatik.uni-oldenburg.de\n"
+#macro generic "<esc>3" ":set from=sebastian.reichel@collabora.com\n"
diff --git a/config/gpg b/config/gpg
index 72bc1fc..6b3b035 100644
--- a/config/gpg
+++ b/config/gpg
@@ -12,7 +12,10 @@
 #set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r" 
 #set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" 
 
+set pgp_encrypt_self=yes
+
 # specify the uid to use when encrypting/signing
+set pgp_default_key=0xC83BFA9A
 set pgp_sign_as=0xC83BFA9A
 
 # set the number of seconds to keep in memory the passpharse used to encrypt/sign
diff --git a/config/hooks b/config/hooks
index 75f23e3..3ac49c9 100644
--- a/config/hooks
+++ b/config/hooks
@@ -1,7 +1,11 @@
 send-hook . 'unmy_hdr From:'
 
+send-hook '~c ^dri-devel@lists\.freedesktop\.org$' 'my_hdr From: Sebastian Reichel <sre@kernel.org>'
+send-hook '~t ^dri-devel@lists\.freedesktop\.org$' 'my_hdr From: Sebastian Reichel <sre@kernel.org>'
 send-hook '~t ^linux-kernel@vger\.kernel\.org$' 'my_hdr From: Sebastian Reichel <sre@kernel.org>'
 send-hook '~t ^linux-pm@vger\.kernel\.org$' 'my_hdr From: Sebastian Reichel <sre@kernel.org>'
 send-hook '~t ^linux-omap@vger\.kernel\.org$' 'my_hdr From: Sebastian Reichel <sre@kernel.org>'
-send-hook '~t ^diskussion@kreativitaet-trifft-technik\.de$' 'my_hdr From: Sebastian Reichel <sre@kreativitaet-trifft-technik.de>'
+send-hook '~t ^linux-media@vger\.kernel\.org$' 'my_hdr From: Sebastian Reichel <sre@kernel.org>'
+send-hook '~t ^diskussion@kreativitaet-trifft-technik\.de$' 'my_hdr From: Sebastian Reichel <sre@mainframe.io>'
+send-hook '~t ^keyholder@kreativitaet-trifft-technik\.de$' 'my_hdr From: Sebastian Reichel <sre@mainframe.io>'
 send-hook '~t ^debian-devel@lists\.debian\.org$' 'my_hdr From: Sebastian Reichel <sre@debian.org>'
diff --git a/config/imap b/config/imap
index ffebc46..9ad8060 100644
--- a/config/imap
+++ b/config/imap
@@ -1,11 +1,11 @@
 # IMAP User Daten
-set imap_user="sre"
-set imap_pass=`getpassword imap.elektranox.dyndns.org`
-set imap_idle=yes
+#set imap_user="sre"
+#set imap_pass=`getpassword imap.elektranox.dyndns.org`
+#set imap_idle=yes
 
 # Verzeichnisse der Mails
-set folder="imaps://mars.elektranox.org/"
-set spoolfile="imaps://mars.elektranox.org/INBOX"
+#set folder="imaps://mars.elektranox.org/"
+#set spoolfile="imaps://mars.elektranox.org/INBOX"
 
 # Certificat
-set certificate_file=~/.mutt/certificates
+#set certificate_file=~/.mutt/certificates
diff --git a/config/keys b/config/keys
index 7bdde6a..72756f9 100644
--- a/config/keys
+++ b/config/keys
@@ -6,8 +6,8 @@ bind pager <right> next-entry
 bind index \t next-unread
 bind pager \t next-unread
 
-bind index .\t next-unread-mailbox
-bind pager .\t next-unread-mailbox
+bind index . previous-unread
+bind pager . previous-unread
 
 bind browser ^ check-new
 bind index ^ imap-fetch-mail
@@ -17,9 +17,9 @@ bind index b buffy-list
 
 bind compose f edit-from
 
-bind index <Esc>f followup-message
 bind index F forward-message
 bind index f flag-message
 
 macro index y '<read-thread><previous-thread><next-unread>'
+macro index - '<read-thread><previous-unread>'
 macro index S "<save-message>=SPAM<enter>" "move message to spam"
diff --git a/config/lists b/config/lists
index c44b6d3..e9210db 100644
--- a/config/lists
+++ b/config/lists
@@ -1,8 +1,26 @@
+subscribe diskussion@kreativitaet-trifft-technik.de
+
 subscribe smartphones-userland@linuxtogo.org
 subscribe cairo@cairographics.org
 subscribe vala-list@gnome.org
+subscribe powervr-devel@listas.gnu.org.ve
+
+subscribe debian-devel@lists.debian.org
+subscribe debian-boot@lists.debian.org
+subscribe debian-mobile@lists.debian.org
+subscribe debian-cross@lists.debian.org
+subscribe debian-kernel@lists.debian.org
+
 subscribe linux-kernel@vger.kernel.org
 subscribe linux-pm@vger.kernel.org
 subscribe linux-omap@vger.kernel.org
-subscribe diskussion@kreativitaet-trifft-technik.de
-subscribe debian-devel@lists.debian.org
+subscribe linux-bluetooth@vger.kernel.org
+subscribe linux-media@vger.kernel.org
+subscribe linux-pm@vger.kernel.org
+subscribe linux-iio@vger.kernel.org
+subscribe linux-raid@vger.kernel.org
+subscribe linux-next@vger.kernel.org
+subscribe dri-devel@lists.freedesktop.org
+
+subscribe ksummit-discuss@lists.linuxfoundation.org
+subscribe users@linux.kernel.org
diff --git a/config/select-account b/config/select-account
new file mode 100644
index 0000000..e837ab2
--- /dev/null
+++ b/config/select-account
@@ -0,0 +1,2 @@
+macro index <f2> '<sync-mailbox><refresh><enter-command>source ~/.mutt/config/account-private<enter><change-folder>!<enter>'
+macro index <f3> '<sync-mailbox><refresh><enter-command>source ~/.mutt/config/account-collabora<enter><change-folder>!<enter>'
diff --git a/config/sidebar b/config/sidebar
index b27412f..7c8c968 100644
--- a/config/sidebar
+++ b/config/sidebar
@@ -1,7 +1,11 @@
-mailboxes =INBOX =Feuerwehr =Hackspace =KTT-Vorstand =Debian =debian-cross =debian-mobile =debian-boot =debian-kernel =ksummit-discuss =linux-next =linux-kernel =linux-omap =linux-media =linux-pm =kernel-users =OpenMoko =pkg-fso-maint =powervr-devel =vala =radare =Shops =System =SPAM
+set mail_check_stats=yes
+set mail_check_stats_interval=1
 
 # width
-set sidebar_width=26
+set sidebar_visible=yes
+set sidebar_width=28
+set sidebar_format="%B%*  %S%?N?(%N)?%?F?[%F]?"
+set sidebar_short_path=yes
 
 # b toggles sidebar visibility
 macro index b '<enter-command>toggle sidebar_visible<enter>'
diff --git a/config/urlscan b/config/urlscan
new file mode 100644
index 0000000..623727c
--- /dev/null
+++ b/config/urlscan
@@ -0,0 +1,2 @@
+macro index,pager \cb "<pipe-message> urlscan<Enter>" "call urlscan to extract URLs out of a message"
+macro attach,compose \cb "<pipe-entry> urlscan<Enter>" "call urlscan to extract URLs out of a message"
diff --git a/mailcap b/mailcap
index 28a8071..7ce7832 100644
--- a/mailcap
+++ b/mailcap
@@ -22,11 +22,12 @@ application/pgp-encrypted; gpg < %s ; needsterminal; \
 application/x-tar; tar -tf %s ; copiousoutput
 
 # office
-application/pdf; evince %s
-application/msword; libreoffice %s
+application/pdf; mutt_bgrun evince %s
+application/msword; mutt_bgrun libreoffice %s
+application/vnd.oasis.opendocument.text; mutt_bgrun libreoffice %s
 
 # pictures
-image/png; gpicview %s
-image/jpeg; gpicview %s
-image/jpg; gpicview %s
-image/gif; gpicview %s
+image/png; mutt_bgrun gpicview %s
+image/jpeg; mutt_bgrun gpicview %s
+image/jpg; mutt_bgrun gpicview %s
+image/gif; mutt_bgrun gpicview %s
diff --git a/muttrc b/muttrc
index a4ef2b7..ebe1642 100644
--- a/muttrc
+++ b/muttrc
@@ -1,11 +1,15 @@
-source ~/.mutt/config/imap			# IMAP
-source ~/.mutt/config/header		# Header
-source ~/.mutt/config/color			# Farben
-source ~/.mutt/config/gpg			# GPG Mails
-source ~/.mutt/config/editor		# Editor
-source ~/.mutt/config/common		# Standard Einstellungen
-source ~/.mutt/config/keys			# Tastenbelegungen
-source ~/.mutt/config/lists			# Mailing Listen
-source ~/.mutt/config/hooks			# Send Hooks
-source ~/.mutt/config/sidebar		# Sidebar
-source $alias_file					# Contacts
+source ~/.mutt/config/account-private	# Default Account
+
+source ~/.mutt/config/select-account	# Account Selection with F-keys
+source ~/.mutt/config/imap				# IMAP
+source ~/.mutt/config/header			# Header
+source ~/.mutt/config/color				# Farben
+source ~/.mutt/config/gpg				# GPG Mails
+source ~/.mutt/config/editor			# Editor
+source ~/.mutt/config/common			# Standard Einstellungen
+source ~/.mutt/config/keys				# Tastenbelegungen
+source ~/.mutt/config/lists				# Mailing Listen
+source ~/.mutt/config/hooks				# Send Hooks
+source ~/.mutt/config/sidebar			# Sidebar
+source ~/.mutt/config/urlscan			# Scan for URLs
+source $alias_file						# Contacts