From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 18 Aug 2016 11:48:06 +0000 (+0200)
Subject: email updates, calendar uni added, mailcap update, location change config files,... 
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=6228817eca37fd92348d47e0de2ebb3221c0de1e;p=dotfiles.git

email updates, calendar uni added, mailcap update, location change config files, gpg update, xinitrc minimized
---

diff --git a/cal/.config/khal/khal.conf b/cal/.config/khal/khal.conf
index 9f3745e..6ea0795 100644
--- a/cal/.config/khal/khal.conf
+++ b/cal/.config/khal/khal.conf
@@ -5,7 +5,7 @@ color = light green
 
 [[elvira]]
 path = ~/.vdirsyncer/cal/elvira
-color = light red
+color = light magenta
 
 [[default]]
 path = ~/.vdirsyncer/cal/default
@@ -15,6 +15,11 @@ color = light blue
 path = ~/.vdirsyncer/cal/vuilnis
 color = brown
 
+[[uni]]
+path = ~/.vdirsyncer/uni
+color = light red
+readonly = True
+
 [sqlite]
 path = ~/.vdirsyncer/khal.db
 
diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index 91265d8..0bb3a69 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -47,3 +47,18 @@ url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart/default
 auth = digest
 username = mart
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
+
+# UNI
+[pair uni]
+a = uni_local
+b = uni_remote
+collections = null
+
+[storage uni_local]
+type = filesystem
+path = ~/.vdirsyncer/uni
+fileext = .ics
+
+[storage uni_remote]
+type = http
+url = "http://persoonlijkrooster.ru.nl/ical?57b59e14&eu=czQxMDk1MDM=&t=9d96e939-2d1b-4b49-b376-93937bc08725"
diff --git a/email/.mutt/msmtprc b/email/.config/msmtp/config
similarity index 100%
rename from email/.mutt/msmtprc
rename to email/.config/msmtp/config
diff --git a/email/.mutt/notmuch-config b/email/.config/notmuch/config
similarity index 100%
rename from email/.mutt/notmuch-config
rename to email/.config/notmuch/config
diff --git a/email/.mutt/offlineimaprc b/email/.config/offlineimap/config
similarity index 92%
rename from email/.mutt/offlineimaprc
rename to email/.config/offlineimap/config
index 107a1f4..50466cc 100644
--- a/email/.mutt/offlineimaprc
+++ b/email/.config/offlineimap/config
@@ -1,5 +1,5 @@
 [general]
-pythonfile = ~/.mutt/offlineimap.py
+pythonfile = ~/.config/offlineimap/offlineimap.py
 metadata = ~/.mutt/offlineimap_meta
 accounts = net
 ui = quiet
diff --git a/email/.mutt/offlineimap.py b/email/.config/offlineimap/offlineimap.py
similarity index 93%
rename from email/.mutt/offlineimap.py
rename to email/.config/offlineimap/offlineimap.py
index 02e4e2b..99aeec0 100644
--- a/email/.mutt/offlineimap.py
+++ b/email/.config/offlineimap/offlineimap.py
@@ -13,6 +13,6 @@ def folderfilter(x):
     if match:
         return abs(datetime.date.today() -
                    datetime.date(int(match.group(1)), int(match.group(2)), 1)
-                   ).days <= 31*2
+                   ).days <= 31*4
     else:
         return not x.startswith('archive')
diff --git a/email/.mutt/mailcap b/email/.mutt/mailcap
index c0569ab..8f502d4 100644
--- a/email/.mutt/mailcap
+++ b/email/.mutt/mailcap
@@ -1,3 +1,34 @@
-application/msword; libreoffice %s;
+# Fork off a process
 application/pdf; gv %s;
+text/html; firefox -new-tab %s & sleep 5;
+
+# Open document formats
+application/vnd.oasis.opendocument.text; libreoffice '%s';
+application/vnd.oasis.opendocument.text-template; libreoffice '%s';
+application/vnd.oasis.opendocument.text-web; libreoffice '%s';
+application/vnd.oasis.opendocument.text-master; libreoffice '%s';
+application/vnd.oasis.opendocument.graphics; libreoffice '%s';
+application/vnd.oasis.opendocument.graphics-template; libreoffice '%s';
+application/vnd.oasis.opendocument.presentation; libreoffice '%s';
+application/vnd.oasis.opendocument.presentation-template; libreoffice '%s';
+application/vnd.oasis.opendocument.spreadsheet; libreoffice '%s';
+application/vnd.oasis.opendocument.spreadsheet-template; libreoffice '%s';
+application/vnd.oasis.opendocument.chart; libreoffice '%s';
+application/vnd.oasis.opendocument.formula; libreoffice '%s';
+application/vnd.oasis.opendocument.database; libreoffice '%s';
+application/vnd.oasis.opendocument.image; libreoffice '%s';
+
+# Microsoft Office formats
+application/msword; libreoffice '%s';
+application/vnd.ms-excel; libreoffice '%s';
+application/vnd.ms-powerpoint; libreoffice '%s';
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; libreoffice '%s';
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; libreoffice '%s';
+application/vnd.openxmlformats-officedocument.presentationml.presentation; libreoffice '%s';
+
+# All the autoview
 text/html; w3m -I %{charset} -T text/html; copiousoutput;
+application/pdf; pdftotext '%s' -; copiousoutput;
+application/msword; libreoffice --headless --cat '%s'; copiousoutput;
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; libreoffice --headless --cat '%s'; copiousoutput;
+application/vnd.oasis.opendocument.text; libreoffice --headless --cat '%s'; copiousoutput;
diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc
index 2743046..b99644b 100644
--- a/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@ -11,9 +11,9 @@ set mask="!^\\.[^.]"
 source ~/.mutt/mailboxes
 
 # Receiving, sending and searching
-set sendmail="msmtp -C /home/mrl/.mutt/msmtprc"
+set sendmail="msmtp -C /home/mrl/.config/msmtp/config"
 set send_charset="us-ascii:utf-8"
-macro index,pager $ "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc &<enter><sync-mailbox>" "Force refresh"
+macro index,pager $ "<shell-escape>offlineimap &<enter><sync-mailbox>" "Force refresh"
 macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"<enter>"
 
 # Key bindings
@@ -23,7 +23,7 @@ bind pager k previous-line
 bind pager j next-line
 bind pager gg top
 bind pager G bottom
-bind pager R group-reply 
+bind index,pager R group-reply 
 
 # Misc options
 set timeout=2
@@ -45,7 +45,16 @@ ignore headers *
 unignore headers from to subject date cc
 set mailcap_path=~/.mutt/mailcap
 set mailcap_sanitize=yes
+
+# w3m --dump
 auto_view text/html
+# pdftotext
+auto_view application/pdf 
+# libreoffice --cat
+auto_view application/vnd.openxmlformats-officedocument.wordprocessingml.document
+auto_view application/msword
+auto_view application/vnd.openxmlformats-officedocument.wordprocessingml.document
+auto_view application/vnd.oasis.opendocument.text
 
 # Pager options
 set pager_index_lines=20
diff --git a/pgp/.gnupg/gpg-agent.conf b/pgp/.gnupg/gpg-agent.conf
index 360079f..c3e2eda 100644
--- a/pgp/.gnupg/gpg-agent.conf
+++ b/pgp/.gnupg/gpg-agent.conf
@@ -1 +1,3 @@
+pinentry-program /usr/bin/pinentry-qt
 default-cache-ttl 3600
+enable-ssh-support
diff --git a/pgp/.gnupg/gpg.conf b/pgp/.gnupg/gpg.conf
index 0dd69bd..92cbe52 100644
--- a/pgp/.gnupg/gpg.conf
+++ b/pgp/.gnupg/gpg.conf
@@ -193,5 +193,4 @@ keyserver hkp://keys.gnupg.net
 #
 # Use your MIME handler to view photos:
 # photo-viewer "metamail -q -d -b -c %T -s 'KeyID 0x%k' -f GnuPG"
-armor
 use-agent
diff --git a/shell/.bashrc b/shell/.bashrc
index c7b2658..a4f3d7a 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -13,7 +13,7 @@ export BROWSER=firefox
 export PAGER=less
 
 export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
-export NOTMUCH_CONFIG=~/.mutt/notmuch-config
+export NOTMUCH_CONFIG=~/.config/notmuch/config
 
 export CLEAN_HOME=/opt/clean
 export PATH=~/.local/bin:$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
diff --git a/x/.xinitrc b/x/.xinitrc
index 08f1db1..558b4cf 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,13 +1,5 @@
 fbgrab /tmp/bg.png
 
-envfile="$HOME/.gnupg/gpg-agent.env"
-if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null
-then
-	eval "$(cat "$envfile")"
-else
-	eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "$envfile")"
-fi
-export GPG_AGENT_INFO
-export SSH_AUTH_SOCK
+eval "$(gpg-agent --daemon)"
 
 exec i3