Merge branch 'master' of https://github.com/joshtronic/dotfiles
Conflicts: zsh/zshrc
This commit is contained in:
Josh Sherman
commit
d9fadb44ea
6 changed files with 63 additions and 56 deletions
12
bin/vim
Executable file
12
bin/vim
Executable file
|
|
@ -0,0 +1,12 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
if [[ `ps -o stat= -p $PPID` == *"s"* ]]; then
|
||||
echo ""
|
||||
echo -e "\e[1;31mUse the alias \`v\`\e[0m"
|
||||
echo -e "\e[1;31m(╯°□°）╯︵ ɯıʌ\e[0m"
|
||||
exit 1;
|
||||
else
|
||||
/usr/local/bin/vim $@
|
||||
fi
|
||||
|
||||
|
||||
1
gem/gemrc
Normal file
1
gem/gemrc
Normal file
|
|
@ -0,0 +1 @@
|
|||
gem: --no-document
|
||||
15
setup
15
setup
|
|
@ -5,6 +5,7 @@ DOTFILES_DIR=~/.dotfiles
|
|||
|
||||
# FILEINREPO SPACE WHEREYOUWANTITLINKED
|
||||
SYMLINKS=(
|
||||
"gem/gemrc ~/.gemrc"
|
||||
"git/gitconfig ~/.gitconfig"
|
||||
"mysql/my.cnf ~/.my.cnf"
|
||||
"tmux/tmux.conf ~/.tmux.conf"
|
||||
|
|
@ -26,6 +27,7 @@ HOMEBREW_PACKAGES=(
|
|||
"git"
|
||||
"git-extras"
|
||||
"gpg"
|
||||
"httpie"
|
||||
"imagemagick"
|
||||
"likes"
|
||||
"memcached"
|
||||
|
|
@ -44,9 +46,19 @@ HOMEBREW_PACKAGES=(
|
|||
)
|
||||
|
||||
GEMS=(
|
||||
"bundler"
|
||||
"tmuxinator"
|
||||
)
|
||||
|
||||
# TODO Not sure about this because they would need to be installed on a
|
||||
# per-node version basis as I am running nvm with both the latest node
|
||||
# installed as well as whatever specific versions I need
|
||||
NPM=(
|
||||
"bower -g"
|
||||
"grunt -g"
|
||||
"gulp -g"
|
||||
)
|
||||
|
||||
PIP=(
|
||||
"powerline-status"
|
||||
"psutil"
|
||||
|
|
@ -90,3 +102,6 @@ vim +BundleInstall +qall
|
|||
###### # Gets our Vundle on!
|
||||
###### git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
|
||||
###### vim +BundleInstall +qall
|
||||
|
||||
# TODO setup logic for defaults for nvm
|
||||
# TODO setup logic for defaults for rvm
|
||||
|
|
|
|||
|
|
@ -24,10 +24,8 @@ bind-key -t vi-copy 'y' copy-selection
|
|||
# vi like paste
|
||||
bind-key p paste-buffer
|
||||
|
||||
setw -g mode-mouse on
|
||||
# set -g mouse-select-window on
|
||||
# set -g mouse-select-pane on
|
||||
# set -g mouse-resize-pane on
|
||||
setw -g mouse-utf8 on
|
||||
setw -g mouse on
|
||||
|
||||
set -g @plugin 'tmux-plugins/tpm'
|
||||
set -g @plugin 'tmux-plugins/tmux-sensible'
|
||||
|
|
|
|||
10
vim/vimrc
10
vim/vimrc
|
|
@ -50,7 +50,7 @@ set wildmode=list:longest
|
|||
|
||||
" Automatically wraps markdown and text to 80 columns
|
||||
if &filetype == 'markdown' || &filetype == 'text'
|
||||
set textwidth=79
|
||||
set textwidth=80
|
||||
set wrapmargin=2
|
||||
else
|
||||
set smartindent
|
||||
|
|
@ -186,11 +186,5 @@ if executable('ag')
|
|||
\ -U -p ~/.agignore
|
||||
\ -l -m 50000
|
||||
\ %s -g ""'
|
||||
" let g:ctrlp_user_command = 'ag %s -i --nocolor --nogroup --hidden
|
||||
" \ --ignore .git
|
||||
" \ --ignore .svn
|
||||
" \ --ignore .hg
|
||||
" \ --ignore .DS_Store
|
||||
" \ --ignore "**/*.pyc"
|
||||
" \ -g ""'
|
||||
endif
|
||||
|
||||
|
|
|
|||
75
zsh/zshrc
75
zsh/zshrc
|
|
@ -1,27 +1,13 @@
|
|||
DOTFILES_DIR=$HOME/.dotfiles
|
||||
DEFAULT_USER=josh
|
||||
|
||||
export TERM="xterm-256color"
|
||||
export CLICOLOR=1
|
||||
export EDITOR=vim
|
||||
export KEYTIMEOUT=1
|
||||
export TERM="xterm-256color"
|
||||
|
||||
bindkey -v
|
||||
|
||||
# ZSH=$HOME/.oh-my-zsh
|
||||
#
|
||||
# ZSH_THEME="joshtronic"
|
||||
#
|
||||
# COMPLETION_WAITING_DOTS="true"
|
||||
#
|
||||
# plugins=(brew common-aliases composer git-extras git gitfast gitignore jsontools meteor node npm nvm osx redis-cli rsync systemadmin vundle web-search xcode z zsh_reload)
|
||||
#
|
||||
# source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# PHP_FULL_VERSION=`php --version | head -n 1 | awk '{print $2}'`
|
||||
# PHP_MAJOR_MINOR=`echo $PHP_FULL_VERSION | awk -F '.' '{print $1$2}'`
|
||||
# PHP_BASE_PATH=/usr/local/Cellar/php$PHP_MAJOR_MINOR/$PHP_FULL_VERSION
|
||||
#
|
||||
# export PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PHP_BASE_PATH/lib/php:~/Source/dotfiles/scripts:~/Source/dotfiles/git/scripts:$PHP_BASE_PATH/bin:/opt/X11/bin:$PHP_BASE_PATH/lib/php/File
|
||||
|
||||
source $DOTFILES_DIR/.antigen/antigen.zsh
|
||||
|
||||
antigen-use oh-my-zsh
|
||||
|
|
@ -29,6 +15,9 @@ antigen-bundle git
|
|||
|
||||
if [[ $OSTYPE == "darwin*" ]]; then
|
||||
antigen-bundle osx
|
||||
|
||||
# Unquarantine files on OSX
|
||||
alias unquarantine="xattr -r -d com.apple.quarantine *"
|
||||
fi
|
||||
|
||||
antigen-bundle zsh-users/zsh-completions
|
||||
|
|
@ -38,37 +27,30 @@ antigen-bundle zsh-users/zsh-syntax-highlighting
|
|||
antigen-theme $DOTFILES_DIR/zsh joshtronic-2015
|
||||
antigen-apply
|
||||
|
||||
# alias gaa="git add --all"
|
||||
# alias gcob="git checkout -B"
|
||||
# alias gdb="git delete-branch"
|
||||
# alias gf="git fetch"
|
||||
# alias gmm="git merge master"
|
||||
# alias gmup="git fetch upstream; git merge origin/upstream"
|
||||
# alias gmv="git mv"
|
||||
# #alias gp="git rev-parse --abbrev-ref HEAD | xargs git push origin"
|
||||
# #alias gpu="git rev-parse --abbrev-ref HEAD | xargs git pull origin"
|
||||
# alias gra="git remote add"
|
||||
# alias grm="git rm"
|
||||
# alias gs="git status"
|
||||
# alias gh-pages="bundle exec jekyll serve"
|
||||
# alias mtr="sudo mtr"
|
||||
# alias uuid="node -e \"var uuid = require('node-uuid'); console.log(uuid.v4())\""
|
||||
# alias unq="xattr -r -d com.apple.quarantine *"
|
||||
# alias v="vim"
|
||||
# alias vd="vimdiff"
|
||||
# Git aliases
|
||||
alias gdb="git delete-branch"
|
||||
alias gmm="git merge master"
|
||||
alias gmv="git mv"
|
||||
alias grm="git rm"
|
||||
|
||||
export CLICOLOR=1
|
||||
#export LSCOLORS=Exfxcxdxbxegedabagacad
|
||||
# HTTPie aliases
|
||||
alias GET="http"
|
||||
alias POST="http POST"
|
||||
alias HEAD="http HEAD"
|
||||
alias dl="http --print=b --download"
|
||||
|
||||
# Generate a UUID
|
||||
alias uuid="node -e \"var uuid = require('node-uuid'); console.log(uuid.v4())\""
|
||||
|
||||
# Vim aliases
|
||||
alias v="/usr/local/bin/vim"
|
||||
alias vd="vimdiff"
|
||||
|
||||
# This is kinda fucked, I outta rework into a separate grep alias to skip stuff
|
||||
export GREP_OPTIONS="--color=auto --exclude-dir=.git --exclude-dir=artwork --exclude-dir=node_modules --exclude-dir=.sass-cache"
|
||||
|
||||
export EDITOR=vim
|
||||
|
||||
for method in GET HEAD POST PUT DELETE TRACE OPTIONS; do
|
||||
alias "$method"="lwp-request -m '$method'"
|
||||
done
|
||||
|
||||
export PATH=/usr/local/bin:/usr/local/sbin:./node_modules/bower/bin:./node_modules/grunt-cli/bin:$PATH
|
||||
# I dunno about all of this either
|
||||
export PATH=~/.dotfiles/bin:/usr/local/bin:/usr/local/sbin:./node_modules/bower/bin:./node_modules/grunt-cli/bin:$PATH
|
||||
|
||||
# May not need this now, moved it to mux
|
||||
export NODE_ENV=development
|
||||
|
|
@ -77,6 +59,11 @@ export NODE_ENV=development
|
|||
|
||||
# [ -z "$TMUX" ] && export TERM=xterm-256color && exec tmux
|
||||
|
||||
export NVM_DIR=~/.nvm
|
||||
source $(brew --prefix nvm)/nvm.sh
|
||||
|
||||
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
|
||||
|
||||
# Because `npm` shit the bed on me...
|
||||
ulimit -n 4096
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue