From c2eeaebfab6014a9369d4b94b13ca77bc1eec776 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sun, 18 Jan 2015 16:19:40 +0100
Subject: misc

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .vimrc   |  2 ++
 .xinitrc |  4 ++--
 .zshrc   | 23 ++++++++++++++++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.vimrc b/.vimrc
index bf4036f..67bd052 100644
--- a/.vimrc
+++ b/.vimrc
@@ -123,6 +123,8 @@ inoremap <C-s> <esc>:w<cr>a
 nnoremap <C-s> :w<cr>
 inoremap <C-c> <esc>:q<cr>
 nnoremap <C-c> :q<cr>
+inoremap <C-x> <esc>:bd<cr>
+nnoremap <C-x> :bd<cr>
 
 " movement mappings
 nnoremap <silent> <C-Right> <c-w>l
diff --git a/.xinitrc b/.xinitrc
index ef15d27..860a936 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -18,14 +18,14 @@ source $HOME/bin/gpg-agent.sh
 
 # autostart entries
 setxkbmap de nodeadkeys
-(sleep 4; xbindkeys) &
+sup --delay-after 3 --delay 1 --reset-after 0 xbindkeys -n &
 xkbcomp ~/.xkbmap $DISPLAY &
 xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 10 &
 pulseaudio --start &
 remote-notify-client.sh </dev/null &
 # might need --glx-copy-from-front to reduce lag in urxvt
 compton -bfzCG --backend glx --vsync opengl-swc --paint-on-overlay -D2 #--glx-no-rebind-pixmap --glx-no-stencil --unredir-if-possible
-redshift -l 48.190:15.62 -t 5700:4000 -m randr &
+redshift -l 48.190:15.62 -t 5700:3400 -m randr &
 
 autostart () {
   #urxvt -g 125x+45+1041+0 -e ssh mistral &
diff --git a/.zshrc b/.zshrc
index f83b7da..86dd89f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -17,7 +17,20 @@ if [ $UID -eq 0 ]; then
   export PATH=/root/bin:$PATH
 fi
 
+# Exports {{{
 
+# TODO: move these to file and load in .xinitrc?
+# XDG directories
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="$HOME/.local/share"
+
+#export MPV_HOME="$XDG_CONFIG_HOME/mpv"
+
+# Work around pssh hanging due to multiplexer not closing stdin
+export PSSH_OPTIONS='ControlPersist=no'
+
+# }}}
 # Colors {{{
 #use these in functions/shell scripts
 export NC='\e[0m'
@@ -269,8 +282,8 @@ chpwd() {
 
 # idea by Gigamo http://bbs.archlinux.org/viewtopic.php?pid=478094#p478094
 ls () {
-  /bin/ls -rhbtF --color=auto $@ &&
-  echo "${MAGENTA}Files: ${BLUE}$(/bin/ls -l $@ | grep -v "^[l|d|total]" | wc -l) ${GREEN}--- ${MAGENTA}Directories: ${BLUE}$(/bin/ls -l $@ | grep "^d" | wc -l)${NC}"
+  /bin/ls -rhbtF --color=auto "$@" #&&
+  #echo "${MAGENTA}Files: ${BLUE}$(/bin/ls -l $@ | grep -v "^[l|d|total]" | wc -l) ${GREEN}--- ${MAGENTA}Directories: ${BLUE}$(/bin/ls -l $@ | grep "^d" | wc -l)${NC}"
 }
 
 ctailf() {
@@ -357,9 +370,9 @@ hless() {
 
 # }}}
 # History {{{
-export HISTFILE=~/.zsh/histfile
-export HISTSIZE=10000
-export SAVEHIST=5000000
+HISTFILE=~/.zsh/histfile
+HISTSIZE=10000
+SAVEHIST=5000000
 # }}}
 # Other ZSH options {{{
 autoload -U colors
-- 
cgit v1.2.3-24-g4f1b