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

Author: shurane

.bash_aliases

@@ -13,7 +13,7 @@ alias .....='cd ../../../..'
 alias po='popd'
 alias pu='pushd'
 alias ack='ack-grep'
-alias df='df -ch'
+#alias df='df -ch'
 alias egrep='egrep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias gopen='gnome-open'

.bashrc

@@ -62,3 +62,13 @@ fi
 if command -v "bash_completion_tmux.sh" >/dev/null; then
     . "bash_completion_tmux.sh"
 fi
+
+# pip bash completion start
+_pip_completion()
+{
+    COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]}" \
+                   COMP_CWORD=$COMP_CWORD \
+                   PIP_AUTO_COMPLETE=1 $1 ) )
+}
+complete -o default -F _pip_completion pip
+# pip bash completion end

.profile

@@ -9,25 +9,15 @@
 #umask 022
 
 # if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
-    fi
-fi
+#if [ -n "$BASH_VERSION" ]; then
+    ## include .bashrc if it exists
+    #if [ -f "$HOME/.bashrc" ]; then
+	#. "$HOME/.bashrc"
+    #fi
+#fi
 
 # set PATH so it includes user's private bin if it exists
 if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
-# pip bash completion start
-_pip_completion()
-{
-    COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]}" \
-                   COMP_CWORD=$COMP_CWORD \
-                   PIP_AUTO_COMPLETE=1 $1 ) )
-}
-complete -o default -F _pip_completion pip
-# pip bash completion end
-

.xmonad/xmonad.hs

@@ -43,7 +43,7 @@ myManageHook = (composeAll . concat $
     where 
         term = [ "Gnome-terminal", "urxvt" ]
         web  = [ "Firefox", "Google-chrome" ]
-        docs = [ "Sumatra PDF" ]
+        docs = [ "Sumatra PDF", "djview4", "djview" ]
         chat = [ "Pidgin", "Xchat" ]
         full = [ "SMPlayer", "MPlayer" ]