joshtronic/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Josh Sherman 2016-09-18 21:04:27 -05:00
commit ffb15f7b2f
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
vim/vimrc
View file

@ -52,9 +52,8 @@ autocmd BufNewFile,BufRead nginx.conf set filetype=nginx
autocmd BufNewFile,BufRead *.mustache,*.hogan,*.hulk,*.hjs set filetype=html.mustache syntax=mustache
autocmd BufNewFile,BufRead *.handlebars,*.hbs set filetype=html.handlebars syntax=mustache
autocmd FileType css setlocal tabstop=2 shiftwidth=2 softtabstop=2
autocmd FileType javascript setlocal tabstop=2 shiftwidth=2 softtabstop=2
autocmd FileType go setlocal noexpandtab
autocmd FileType javascript,dustjs,handlebars,css setlocal tabstop=2 shiftwidth=2 softtabstop=2
autocmd FileType go setlocal noexpandtab
" Automatically wraps markdown and text to 80 columns
if &filetype == 'markdown' || &filetype == 'text'

8
zsh/zshrc
View file

@ -13,9 +13,12 @@ source $DOTFILES_DIR/.antigen/antigen.zsh
antigen-use oh-my-zsh
antigen-bundle git
if [[ $OSTYPE == "darwin*" ]]; then
if [[ $OSTYPE == darwin* ]]; then
antigen-bundle osx
# Lock it up
alias lock="pmset sleepnow"
# Unquarantine files on OSX
alias unquarantine="xattr -r -d com.apple.quarantine *"
fi
@ -74,11 +77,14 @@ export NODE_ENV=development
# [ -z "$TMUX" ] && export TERM=xterm-256color && exec tmux
# Need to run this conditionally based on the tmux environment
export NVM_DIR=~/.nvm
source $(brew --prefix nvm)/nvm.sh
# Need to run this conditionally on OSX
source "`brew --prefix`/etc/grc.bashrc"
# Need to run this conditionally based on the environment (I think OSX specific)
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
# Because `npm` shit the bed on me...