Merge branch 'master' of github.com:dopefishh/dotfiles

diff --git a/email/.config/notmuch/config b/email/.config/notmuch/config
index 73b20c3..e9150a6 100644 (file)
--- a/email/.config/notmuch/config
+++ b/email/.config/notmuch/config
@@ -31,6 +31,7 @@ path=/home/mrl/.mutt/mail
 [user]
 name=Mart Lubbers
 primary_email=mart@martlubbers.net
+other_email=martlubbers@gmail.com,mart-lubbers@hotmail.com,mail@rooslubbers.nl,mart@cs.ru.nl
 
 # Configuration for "notmuch new"
 #

diff --git a/shell/.bashrc b/shell/.bashrc
index e5e5995..3e31b10 100644 (file)
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -28,6 +28,7 @@ alias vi=vim
 alias latexmk='make -f ~/.local/bin/latex.mk'
 export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
 alias tmux='tmux -f ~/.config/tmux/config'
+alias shutdown="echo \"Are you sure? I\'m Ygdrassil\" && read && shutdown"
 
 . /etc/bash_completion
 

diff --git a/shell/.local/bin/backup.sh b/shell/.local/bin/backup.sh
index 0656811..cd4ebe5 100755 (executable)
--- a/shell/.local/bin/backup.sh
+++ b/shell/.local/bin/backup.sh
@@ -8,7 +8,7 @@ um ()
 start="$(date)"
 if [ ! -n "$1" ]
 then
-       echo "Was this script called from udev? I need the ID_FS_UUID_ENC variable" | tee /home/mrl/backup.log
+       echo "Was this script called from udev? I need the UUID as the first argument" > /home/mrl/backup.log
        exit 1
 elif mountpoint -q /mnt/backupdrive
 then

diff --git a/x/.xinitrc b/x/.xinitrc
index 7966201..23df7c9 100755 (executable)
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -2,7 +2,7 @@
 #To fix java applications in tiling (e.g. arduino)
 export _JAVA_AWT_WM_NONREPARENTING=1
 dunst &
-trayer --align right --widthtype request --SetPartialStrut false --height 22 &
+# trayer --align right --widthtype request --SetPartialStrut false --height 22 &
 
 eval "$(gpg-agent --daemon)"
 xrdb -merge ~/.Xresources