misc cleanup

Signed-off-by: Florian Pritz <bluewind@xinu.at>

4 files changed, 6 insertions, 24 deletions

diff --git a/.gitconfig b/.gitconfig
index 425f6a8..8eebcf8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,6 +20,7 @@
 	refl = reflog --date=relative
 [merge]
 	tool = vimdiff
+	conflictstyle = diff3
 [push]
 	default = current
 [color]
diff --git a/.vimrc b/.vimrc
index 4bdf229..ce62a24 100644
--- a/.vimrc
+++ b/.vimrc
@@ -12,7 +12,7 @@ set shiftwidth=4
 set softtabstop=4
 set ruler                        " show me where the cursor is
 set rulerformat=%l/%L(%p%%),%c   " a better ruler
-set showmatch                    " show matching brackets 
+set showmatch                    " show matching brackets
 "set cindent
 set number                       " show line numbers
 set showmode                     " show mode at bottom of screen
@@ -188,14 +188,6 @@ au FileType lua map <F10> :!lua %<CR>
 au FileType html,xhtml map <F10> :!firefox %<CR>
 au FileType tex map <F10> :!texi2pdf -c %<CR>
 
-" MiniBufExplorer
-"let g:miniBufExplMapWindowNavVim = 1
-"let g:miniBufExplMapWindowNavArrows = 1
-"let g:miniBufExplMapCTabSwitchBufs = 1
-"let g:miniBufExplModSelTarget = 1 
-
-"set tags+=$HOME/.vim/tags/python.ctags
-
 " Get the commit responsible for the current line
 nmap <c-b> :call BlameCurrentLine()<cr>
 " Get the current line number & file name, view the git commit that inserted it
diff --git a/.xinitrc b/.xinitrc
index 5d27bee..9eb1942 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -10,7 +10,7 @@ xrandr --output DVI-D-0 --left-of DVI-I-1
 dash $HOME/.bg &
 
 numlockx
-xset r rate 250 50 & # also in ~/bin/suspend-resume.sh
+xset r rate 250 50 &
 source $HOME/bin/gpg-agent.sh
 
 # autostart entries
@@ -21,7 +21,8 @@ xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.
 pulseaudio --start &
 remote-notify-client.sh &
 compton -bfzCG --backend glx --vsync opengl-swc --paint-on-overlay -D2
-xflux  -l 48.190  -g 15.62 -k 4200
+#xflux  -l 48.190  -g 15.62 -k 4200
+redshift -l 48.190:15.62 -t 5700:3400 -m randr &
 
 autostart () {
   #urxvt -g 125x+45+1041+0 -e ssh mistral &
@@ -31,7 +32,7 @@ autostart () {
     conky -c "$f" &
   done
   rm -f $HOME/passwords.kdb.lock
-  keepassx&
+  keepassx &
   transmission-remote-gtk &
   thunderbird &
   clipit &
diff --git a/.zshrc b/.zshrc
index dfa565b..5354b59 100644
--- a/.zshrc
+++ b/.zshrc
@@ -13,9 +13,6 @@ for _dir in $HOME/bin/extra/*(/N); do
 done
 
 export PATH=$HOME/bin:$PATH
-if [[ -d $HOME/misc/scripts ]]; then
-	export PATH=${HOME}/misc/scripts:${PATH}
-fi
 if [ $UID -eq 0 ]; then
   export PATH=/root/bin:$PATH
 fi
@@ -246,15 +243,6 @@ sv() {
 	vim "sudo:$1"
 }
 
-starttls() {
-	gnutls-cli --starttls --crlf "$@"
-}
-
-# always /etc/rc.d/blub is a bit too much work ;)
-rc() {
-	sudo /etc/rc.d/$1 $2
-}
-
 # add current time to a file
 mbk() {
 	mv -b "${1}" "$(echo $1 | sed -r "s/(.*)(\.|$)(.*)/\1_`date +%Y-%m-%d_%H%M%S`\2\3/")"