nicole/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	profile
This commit is contained in:
Nicole Tietz-Sokolskaya 2016-02-03 22:34:30 -05:00
commit 0ecdb211ac
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
profile
View file

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

5
vimrc
View file

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