From 08e46c265f09ec561017a46eeac5076224108c22 Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 28 Mar 2019 10:08:33 +0100
Subject: [PATCH] many fixes, new st version

---
 config.h/st/config.h        | 2 +-
 email/.config/msmtp/config  | 2 ++
 email/.config/mutt/mailcap  | 1 +
 email/.config/mutt/muttrc   | 3 ++-
 email/.local/bin/newmail.sh | 5 ++++-
 git/.gitconfig              | 8 --------
 shell/.bashrc               | 3 ++-
 7 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 git/.gitconfig

diff --git a/config.h/st/config.h b/config.h/st/config.h
index 7e41a7e..4765228 100644
--- a/config.h/st/config.h
+++ b/config.h/st/config.h
@@ -32,7 +32,7 @@ static float chscale = 1.0;
  *
  * More advanced example: " `'\"()[]{}"
  */
-char *worddelimiters = " ";
+wchar_t *worddelimiters = L" ";
 
 /* selection timeouts (in milliseconds) */
 static unsigned int doubleclicktimeout = 300;
diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config
index 9b6be2f..a567e5f 100644
--- a/email/.config/msmtp/config
+++ b/email/.config/msmtp/config
@@ -18,5 +18,7 @@ auth on
 tls on
 tls_fingerprint BE:B9:55:15:31:91:FD:0A:C1:E5:DB:FE:C7:94:AB:8D:49:9D:B2:0E:2C:6B:4A:78:04:FD:0E:76:AE:2B:63:44
 user mlubbers
+#proxy_host localhost
+#proxy_port 8008
 passwordeval pass science.ru.nl/mlubbers
 from mart@cs.ru.nl
diff --git a/email/.config/mutt/mailcap b/email/.config/mutt/mailcap
index 10590f4..b79ea43 100644
--- a/email/.config/mutt/mailcap
+++ b/email/.config/mutt/mailcap
@@ -31,5 +31,6 @@ text/html; w3m -I %{charset} -T text/html; copiousoutput;
 application/pdf; pdftotext '%s' -; copiousoutput;
 application/msword; libreoffice --headless --cat '%s'; copiousoutput;
 application/ics; khal printics '%s'; copiousoutput;
+text/calendar; khal printics '%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/.config/mutt/muttrc b/email/.config/mutt/muttrc
index 6da670c..6e32d40 100644
--- a/email/.config/mutt/muttrc
+++ b/email/.config/mutt/muttrc
@@ -1,6 +1,6 @@
 # Basic information
 set from="mart@martlubbers.net"
-alternates "mart@(cs\.ru\.nl|mart@martlubbers\.net)"
+alternates "(mart@cs\.ru\.nl|mart@martlubbers\.net|Mart\.Lubbers@ru\.nl)"
 set use_from=yes
 set reverse_name=yes
 set envelope_from=yes
@@ -67,6 +67,7 @@ auto_view text/html
 auto_view application/pdf
 # khal
 auto_view application/ics
+auto_view text/calendar
 # libreoffice --cat
 auto_view application/vnd.openxmlformats-officedocument.wordprocessingml.document
 auto_view application/msword
diff --git a/email/.local/bin/newmail.sh b/email/.local/bin/newmail.sh
index a0af1ad..4290971 100755
--- a/email/.local/bin/newmail.sh
+++ b/email/.local/bin/newmail.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 newmail="$(find ~/.local/share/offlineimap/mail/INBOX/new/ -type f | wc -l)"
-if [ "$newmail" -ne 0 ]
+if [ "$newmail" -eq 1 ]
+then
+	notify-send "1 new email!"
+else if [ "$newmail" -ne 0 ]
 then
 	notify-send "$newmail new emails!"
 fi
diff --git a/git/.gitconfig b/git/.gitconfig
deleted file mode 100644
index 1d53d93..0000000
--- a/git/.gitconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-[user]
-	name = Mart Lubbers
-	email = mart@martlubbers.net
-
-[alias]
-	tree = log --decorate --oneline --graph --all
-	pushm = push origin master
-	pushd = push origin develop
diff --git a/shell/.bashrc b/shell/.bashrc
index 3cb3c7c..e627663 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -14,6 +14,8 @@ export PAGER=more
 export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
 
 # XDG fixes
+alias svn="svn --config-dir \"${XDG_CONFIG_HOME:-$HOME/.config}\"/subversion"
+alias tmux="tmux -f \"${XDG_CONFIG_HOME:-$HOME/.config}/tmux/config\""
 export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}"/notmuch/config
 export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}"/pass
 export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
@@ -31,7 +33,6 @@ alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias vi=vim
 alias latexmk='make -f ~/.local/bin/latex.mk'
-alias tmux="tmux -f \"${XDG_CONFIG_HOME:-$HOME/.config}/tmux/config\""
 alias shutdown="echo \"Are you sure? I\'m Ygdrassil\" && read && shutdown"
 
 . /etc/bash_completion
-- 
2.20.1