more changes

This commit is contained in:
Tyrel Souza 2016-07-14 15:19:30 -04:00
parent 27ea98bdbd
commit d165fc7af2
No known key found for this signature in database
GPG Key ID: 2EECB5087209E6A5
4 changed files with 16 additions and 7 deletions

View File

@ -13,6 +13,7 @@ alias nginx.logs.default.access='tail -250f /usr/local/etc/nginx/logs/default.ac
alias nginx.logs.default-ssl.access='tail -250f /usr/local/etc/nginx/logs/default-ssl.access.log'
alias nginx.logs.phpmyadmin.error='tail -250f /usr/local/etc/nginx/logs/phpmyadmin.error.log'
alias nginx.logs.phpmyadmin.access='tail -250f /usr/local/etc/nginx/logs/phpmyadmin.access.log'
alias rm=/bin/rm -i
function gi() { curl -L -s https://www.gitignore.io/api/$@ ;}
function glate(){git for-each-ref --sort=-committerdate refs/heads/ --format='%(refname) %(committerdate) %(authorname)' | sed 's/refs\/heads\///g';}
alias vim=nvim
alias rm=trash

View File

@ -23,7 +23,7 @@
# show a tree with branches merging
logtree= "log --graph --oneline --decorate --all"
# get the most 10 recent branches worked on
recent = "!git for-each-ref --format=\"%(committerdate:relative) | %(refname)\" --sort=-committerdate refs/heads | sed '/master/d' | head -n 10"
recent = "!git for-each-ref --format=\"%(committerdate:relative) | %(refname)\" --sort=-committerdate refs/heads | sed '/master/d' | head -n 15"
# show tabs with ⌑ replacing tabs
tabs = "!git diff --color | sed 's/\t/⌑/g'"
# show the current version tag
@ -34,7 +34,14 @@
d = diff --color-words
#push
p = push
# Diff so fancy!
dsf = "!f() { [ \"$GIT_PREFIX\" != \"\" ] && cd "$GIT_PREFIX"; git diff --color $@ | diff-so-fancy | less --tabs=4 -RFX; }; f"
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22

3
vimrc
View File

@ -103,9 +103,6 @@ autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
nmap <C-n> :NERDTreeToggle<CR>
"autocmd BufWinLeave *.* mkview
"autocmd BufWinEnter *.* silent loadview
autocmd StdinReadPre * let s:std_in=1

8
zshrc
View File

@ -30,9 +30,9 @@ export LESSOPEN="| /usr/local/bin/src-hilite-lesspipe.sh %s"
export LESS=' -R '
export PATH="$HOME/bin:$HOME/.rvm.bin:$NPM_PACKAGES/bin:$GOPATH/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH"
export PATH="$NPM_PACKAGES/bin:$GOPATH/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH"
export PATH=/bin:/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/Users/tsouza/bin:/opt/local/bin:$PATH
export PATH="$HOME/bin:$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
export PATH="$HOME/.rvm/bin:$HOME/bin:$PATH" # Add RVM to PATH for scripting
# Sourcing aliases and functions
source ~/.bash_aliases
@ -85,6 +85,10 @@ alias hideprev='history -d $((HISTCMD-2)) && history -d $((HISTCMD-1))' # Hide t
if [ -e ~/.zshrc.local ];then
source ~/.zshrc.local
fi
alias vim=nvim
export VAGRANT_DEFAULT_PROVIDER=virtualbox
export PYENV_ROOT=/usr/local/var/pyenv
if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi
source $HOME/.profile