Merge branch 'master' of github.com:ntietz/config

Conflicts:
	profile

profile

@@ -36,13 +36,19 @@ elif [[ "$unamestr" == 'Darwin' ]]; then
     alias ls="ls -G"
 fi
 
+if [[ "$unamestr" == 'Darwin' ]]; then
+  alias update_terminal_cwd=:
+fi
+
 # default editor
 export EDITOR=vim
 
 # set history
 export HISTSIZE=1000
 export HISTFILESIZE=1000
-export HISTCONTROL=ignoredups
+export HISTCONTROL=ignoredups,erasedups
+export PROMPT_COMMAND="history -a; $PROMPT_COMMAND"
+shopt -s histappend
 
 # disable messaging
 if `tty -s`; then
@@ -67,7 +73,7 @@ export PATH=/opt/local/bin:/opt/local/sbin:$PATH
 # Finished adapting your PATH environment variable for use with MacPorts.
 #export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home/
 #export JAVA_HOME="$(/usr/libexec/java_home)"
-export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
+#export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
 
 #### ALIAS SECTION
 
@@ -83,13 +89,13 @@ alias doit='sudo $(history -p !-1)'
 alias f="pushd"
 alias b="popd"
 alias screen_pwd='screen -X eval "chdir $PWD"'
-#alias psql="'/Applications/Postgres.app/Contents/Versions/9.3/bin'/psql -p5432"
+alias href="history -a; history -c; history -r"
 
 macos_magic_fix() {
     killall Dock
 }
 
-export PATH=$PATH:~/.bin
+export PATH=$PATH:~/.bin:/Developer/NVIDIA/CUDA-7.0/bin/
 
 export HISTCONTROL=ignorespace
 

vimrc

@@ -63,3 +63,8 @@ set number
 set backspace=indent,eol,start
 set hlsearch
 
+augroup HiglightTODO
+  autocmd!
+  autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'TODO', -1)
+augroup END
+