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
This commit is contained in:
Nicole Tietz-Sokolskaya 2015-09-08 11:17:14 -04:00
commit c0d1cc8c38
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
profile
View file

@ -42,7 +42,9 @@ 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
@ -66,7 +68,8 @@ export JAVA_HOME=/usr
export PATH=/opt/local/bin:/opt/local/sbin:$PATH 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::")
#### ALIAS SECTION #### ALIAS SECTION
@ -81,7 +84,7 @@ alias cls='clear && ls'
alias doit='sudo $(history -p !-1)' alias doit='sudo $(history -p !-1)'
alias f="pushd" alias f="pushd"
alias b="popd" alias b="popd"
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

8
vimrc
View file

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