From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 21 Jan 2016 14:26:13 +0000 (+0100)
Subject: added vim-praat, update keymap and better muttrc
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=081b167a47e0ed34514535fe67501dfd006b3061;p=dotfiles.git

added vim-praat, update keymap and better muttrc
---

diff --git a/.gitmodules b/.gitmodules
index b35fc6b..ff93fba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "vim/.vim/bundle/vim-syntastic.git"]
 	path = vim/.vim/bundle/vim-syntastic.git
 	url = git@github.com:scrooloose/syntastic.git
+[submodule "vim/.vim/bundle/vim-praat.git"]
+	path = vim/.vim/bundle/vim-praat.git
+	url = git@github.com:dopefishh/vim-praat.git
diff --git a/email/.mutt/colors.muttrc b/email/.mutt/colors.muttrc
new file mode 100644
index 0000000..14f0a08
--- /dev/null
+++ b/email/.mutt/colors.muttrc
@@ -0,0 +1,21 @@
+color normal white default
+color attachment brightyellow default
+color hdrdefault cyan default
+color indicator default cyan
+color markers brightred default
+color quoted green default
+color signature cyan default
+color status brightgreen blue
+color tilde blue default
+color tree red default
+color body brightred default [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+
+color body brightblue default (https?|ftp)://[\-\.\,/%~_:?\#a-zA-Z0-9]+
+color quoted1 brightyellow default
+color quoted2 red default
+color hdrdefault cyan default
+color signature cyan default
+color index green default ~p
+color index brightyellow default ~N
+color index blue default ~T
+color index red default ~D
+color index brightblue default ~F
diff --git a/email/.mutt/mailcap b/email/.mutt/mailcap
index 15d34c1..c0569ab 100644
--- a/email/.mutt/mailcap
+++ b/email/.mutt/mailcap
@@ -1,2 +1,3 @@
 application/msword; libreoffice %s;
+application/pdf; gv %s;
 text/html; w3m -I %{charset} -T text/html; copiousoutput;
diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc
index 39af2ba..e7463cb 100644
--- a/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@ -12,9 +12,9 @@ source ~/.mutt/mailboxes
 
 # Receiving, sending and searching
 set sendmail="msmtp -C /home/mart/.mutt/msmtprc"
+set send_charset="us-ascii:utf-8"
 macro index,pager $ "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc &<enter><sync-mailbox>" "Force refresh"
 macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"<enter>"
-source /etc/Muttrc.d/notmuch-mutt.rc
 
 # Key bindings
 bind index gg first-entry
@@ -55,7 +55,7 @@ set menu_scroll
 set tilde
 set quote_regexp="^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
 
-# Aliases
+# Address book
 set query_command= "khard mutt --search '%s'"
 bind editor <Tab> complete-query
 bind editor ^T    complete
@@ -64,30 +64,9 @@ macro index,pager A \
     "add the sender email address to khard"
 
 # Colors
-color normal white default
-color attachment brightyellow default
-color hdrdefault cyan default
-color indicator default cyan
-color markers brightred default
-color quoted green default
-color signature cyan default
-color status brightgreen blue
-color tilde blue default
-color tree red default
-color body brightred default [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+
-color body brightblue default (https?|ftp)://[\-\.\,/%~_:?\#a-zA-Z0-9]+
-color quoted1 brightyellow default
-color quoted2 red default
-color hdrdefault cyan default
-color signature cyan default
-color index green default ~p
-color index brightyellow default ~N
-color index blue default ~T
-color index red default ~D
-color index brightblue default ~F
+source ~/.mutt/colors.muttrc
 
 # Crypto
-source /etc/Muttrc.d/gpg.rc
 set crypt_autosign
 set crypt_replysign
 set crypt_replysignencrypted=yes
diff --git a/vim/.vim/bundle/vim-praat.git b/vim/.vim/bundle/vim-praat.git
new file mode 160000
index 0000000..62116f7
--- /dev/null
+++ b/vim/.vim/bundle/vim-praat.git
@@ -0,0 +1 @@
+Subproject commit 62116f73b3bb753e7e512c262dd4bc0928b53360
diff --git a/x/.config/i3/config b/x/.config/i3/config
index 1192360..10af625 100644
--- a/x/.config/i3/config
+++ b/x/.config/i3/config
@@ -140,7 +140,7 @@ bindsym $mod+p mode "resize"
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-	status_command i3status
+	status_command /home/mart/projects/i3status/i3status
 	modifier $mod
 	font pango:$font $fontsize
 }
diff --git a/x/.config/i3status/config b/x/.config/i3status/config
index 7d21672..3ade2be 100644
--- a/x/.config/i3status/config
+++ b/x/.config/i3status/config
@@ -3,6 +3,7 @@ general {
 	interval = 5
 }
 
+order += "cmd helloworld"
 order += "volume master"
 order += "disk /"
 order += "wireless wlp1s0"
@@ -24,3 +25,7 @@ tztime local {
 disk "/" {
 	format = "%free/%total free"
 }
+
+cmd helloworld {
+	cmd = "pkill -0 quodlibet && quodlibet --print-playing || echo -n Stopped"
+}
diff --git a/x/.xinitrc b/x/.xinitrc
index 53c756f..6c2f666 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -11,4 +11,5 @@ fi
 export GPG_AGENT_INFO
 export SSH_AUTH_SOCK
 
+setxkbmap -layout dvorak,ru -variant ,phonetic_dvorak -option compose:ralt,grp:menu_toggle
 exec i3