move around zsh stuff, clean up, change bg dark on vimrc
This commit is contained in:
Tyrel Souza
parent
b93ed94d2d
commit
7394c957b2
13
bash_aliases
13
bash_aliases
@ -15,5 +15,16 @@ alias nginx.logs.phpmyadmin.error='tail -250f /usr/local/etc/nginx/logs/phpmyadm
|
||||
alias nginx.logs.phpmyadmin.access='tail -250f /usr/local/etc/nginx/logs/phpmyadmin.access.log'
|
||||
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
|
||||
export HOMEBREW_GITHUB_API_TOKEN="caf4cd85c6eb6ddcf006d4571d4a294c0b0592e4"
|
||||
alias ag='\ag --pager="less"'
|
||||
alias cg='cd "$(git rev-parse --show-toplevel)"'
|
||||
alias fuck='eval $(thefuck $(fc -ln -1)); history -r'
|
||||
alias g='git'
|
||||
alias pdb="python -m pdb"
|
||||
alias ppjson="python -m json.tool"
|
||||
alias rm=trash
|
||||
|
||||
# Addgene specific
|
||||
alias adocs='cd $ADDGENE_CORE_REPO_DIR/docs && make html && open $ADDGENE_CORE_REPO_DIR/docs/build/html/index.html'
|
||||
alias deploy_all="fab -R silver-web deploy:master && fab -R gold-web deploy:master && fab -R jupyter fab -R jupyter deploy_jupyter && fab --parallel avail_staging_hosts deploy:master"
|
||||
alias deploy_all_migration="fab -R silver-web deploy:master,1 && fab -R gold-web deploy:master,1 && fab -R jupyter deploy_jupyter & fab --parallel avail_staging_hosts deploy:master,1"
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
ui = auto # covers diff = true, status = auto, branch = auto
|
||||
interactive = auto
|
||||
[push]
|
||||
default = simple
|
||||
default = current
|
||||
[format]
|
||||
pretty = format:%C(auto)%h %C(green)%G? %C(red)%<(15,trunc)%aN %C(cyan)%<(15,trunc)%ar %C(white)%<(60,trunc)%s %C(auto)%d
|
||||
[alias]
|
||||
@ -34,6 +34,7 @@
|
||||
d = diff --color-words
|
||||
#push
|
||||
p = push
|
||||
pr = !"pr() { git fetch origin pull/$1/head:pr-$1; git checkout pr-$1; }; pr"
|
||||
# Diff so fancy!
|
||||
dsf = "!f() { [ \"$GIT_PREFIX\" != \"\" ] && cd "$GIT_PREFIX"; git diff --color $@ | diff-so-fancy | less --tabs=4 -RFX; }; f"
|
||||
[filter "lfs"]
|
||||
|
||||
1
vimrc
1
vimrc
@ -113,3 +113,4 @@ hi Normal ctermbg=none
|
||||
if filereadable($HOME . "/.vimrc.local")
|
||||
source ~/.vimrc.local
|
||||
endif
|
||||
set background=dark
|
||||
|
||||
68
zshrc
68
zshrc
@ -1,71 +1,52 @@
|
||||
# Path to your oh-my-zsh installation.
|
||||
export ZSH=$HOME/.oh-my-zsh
|
||||
plugins=(git brew sudo github django python pip dnf emoji cp vagrant virtualenv nmap rvm)
|
||||
|
||||
plugins=(git brew sudo github django python pip cp vagrant virtualenv nmap rvm)
|
||||
if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
|
||||
ZSH_THEME="soliah"
|
||||
else
|
||||
#ZSH_THEME="candy"
|
||||
ZSH_THEME="candy"
|
||||
ZSH_THEME="tyrel"
|
||||
export VIRTUAL_ENV_DISABLE_PROMPT=1
|
||||
fi
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
##### ^^^ Oh my ZSH ^^^^ #####
|
||||
|
||||
export EDITOR=vim
|
||||
export LC_ALL=en_US.UTF-8
|
||||
export LANG=en_US.UTF-8
|
||||
export NPM_PACKAGES="${HOME}/.npm-packages"
|
||||
export NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
|
||||
export GOPATH=$HOME/go
|
||||
export PHP_AUTOCONF="/usr/local/bin/autoconf"
|
||||
export WORKON_HOME=$HOME/.virtualenvs
|
||||
export PROJECT_HOME=$HOME/AddGeneProjects
|
||||
source /usr/bin/virtualenvwrapper.sh
|
||||
#source $HOME/bin/virtualenv-auto-activate.sh
|
||||
|
||||
|
||||
|
||||
export LESSOPEN="| /usr/local/bin/src-hilite-lesspipe.sh %s"
|
||||
export LANG=en_US.UTF-8
|
||||
export LC_ALL=en_US.UTF-8
|
||||
export LESS=' -R '
|
||||
export LESSOPEN="| /usr/local/bin/src-hilite-lesspipe.sh %s"
|
||||
export NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
|
||||
export NPM_PACKAGES="${HOME}/.npm-packages"
|
||||
export PHP_AUTOCONF="/usr/local/bin/autoconf"
|
||||
|
||||
# Virtualenv + Wrapper
|
||||
export PROJECT_HOME=$HOME/AddGeneProjects
|
||||
export WORKON_HOME=$HOME/.virtualenvs
|
||||
source /usr/local/bin/virtualenvwrapper.sh
|
||||
|
||||
|
||||
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/.rvm/bin:$HOME/bin:$PATH" # Add RVM to PATH for scripting
|
||||
export PATH="$NPM_PACKAGES/bin:$GOPATH/bin:$HOME/bin:$PATH"
|
||||
|
||||
# Sourcing aliases and functions
|
||||
source ~/.bash_aliases
|
||||
alias cg='cd "$(git rev-parse --show-toplevel)"'
|
||||
alias fuck='eval $(thefuck $(fc -ln -1)); history -r'
|
||||
alias ag='\ag --pager="less"'
|
||||
alias g='git'
|
||||
|
||||
|
||||
#
|
||||
if [ -e ~/.ssh/id_rsa ];then
|
||||
ssh-add ~/.ssh/id_addgene
|
||||
fi
|
||||
|
||||
#
|
||||
if [ -z "$SSH_AUTH_SOCK" ] ; then
|
||||
eval `ssh-agent -s`
|
||||
ssh-add ~/.ssh/id_rsa
|
||||
ssh-add ~/.ssh/id_addgene
|
||||
fi
|
||||
|
||||
# Uncomment the following line to display red dots whilst waiting for completion.
|
||||
COMPLETION_WAITING_DOTS="true"
|
||||
|
||||
|
||||
|
||||
# VMware Fusion
|
||||
if [ -d "/Applications/VMware Fusion.app/Contents/Library" ]; then
|
||||
export PATH=$PATH:"/Applications/VMware Fusion.app/Contents/Library"
|
||||
fi
|
||||
export MP_FULLNAME="Tyrel Souza"
|
||||
|
||||
function adg () {
|
||||
workon addgene-core
|
||||
}
|
||||
|
||||
function cpbr () {
|
||||
if branch=$(git symbolic-ref --short -q HEAD)
|
||||
then
|
||||
@ -77,18 +58,11 @@ function cpbr () {
|
||||
}
|
||||
function hidden() { ls -a "$@" | grep '^\.'; }
|
||||
|
||||
|
||||
|
||||
|
||||
alias hideprev='history -d $((HISTCMD-2)) && history -d $((HISTCMD-1))' # Hide the previous command you just ran and forgot to use space.
|
||||
#let g:user_emmet_leader_key='<C-Z>'
|
||||
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
|
||||
# Sourcing aliases
|
||||
source ~/.bash_aliases
|
||||
source $HOME/.profile
|
||||
source $HOME/.credentials
|
||||
|
||||
Loading…
Reference in New Issue
Block a user