genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 09:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #111 from genebean/stuff

Browse source 
Move to airline, adapt for Apple Silicon
This commit is contained in:
Gene Liverman 2021-03-10 13:36:50 -05:00 • committed by GitHub
commit c392e100ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
link/nix/vimrc
View file

@ -17,6 +17,8 @@ Plugin 'MarcWeber/vim-addon-mw-utils' " a utility used by vim-snipmate
Plugin 'mrk21/yaml-vim' " provides indentation and syntax highlighting for yaml
Plugin 'rodjek/vim-puppet' " provides several niceties for working with Puppet
Plugin 'tomtom/tlib_vim' " a utility used by vim-snipmate
Plugin 'vim-airline/vim-airline' " status line alternative to powerline
Plugin 'vim-airline/vim-airline-themes' " themes for vim-airline
Plugin 'vim-ruby/vim-ruby' " provides syntax highlighting for ruby files
Plugin 'vim-syntastic/syntastic' " provides syntax checking
@ -69,6 +71,8 @@ let g:syntastic_quiet_messages = {'level': 'warnings'}
" don't wrap text in markdown files
let g:vim_markdown_folding_disabled = 1
" settings for vim-airline
let g:airline_theme='powerlineish'
" import settings that are OS specific
source ~/.vimrc_os_specific
" source ~/.vimrc_os_specific

67
link/nix/zshrc
View file

@ -93,12 +93,14 @@ gpg-connect-agent updatestartuptty /bye >/dev/null
# alias ohmyzsh="mate ~/.oh-my-zsh"
#alias ll='ls -G -l'
#alias ls='ls -G'
alias beo='bundle exec onceover run spec --trace --force'
alias biv='bundle install --path=vendor/bundle'
alias gbc='git branch --merged | command grep -vE "^(\*|\s*(master|develop|production)\s*$)" | command xargs -n 1 git branch -d'
alias ce='code-exploration'
alias gbc='git branch --merged | command grep -vE "^(\*|\s*(main|master|develop|production)\s*$)" | command xargs -n 1 git branch -d'
alias gitextract='git log --pretty=email --patch-with-stat --reverse --full-index --binary --'
alias hubpr='hub pull-request --push --browse'
alias ogk='open -a GitKraken'
alias pssh='ssh -o "UserKnownHostsFile /dev/null" -o "StrictHostKeyChecking no"'
alias pssh='ssh -o "UserKnownHostsFile /dev/null" -o "StrictHostKeyChecking no" -i ~/.ssh/id_rsa-acceptance'
alias sal='ssh-add -L'
alias st='open -a SourceTree'
alias sz='source ~/.zshrc'
@ -134,6 +136,43 @@ export VAGRANT_DEFAULT_PROVIDER='virtualbox'
export PATH=$PATH:~/.nexustools
if [[ `uname` == 'Darwin' ]]; then
if [[ `uname -p` == 'arm' ]]; then
eval "$(/opt/homebrew/bin/brew shellenv)"
glcoud_zsh_path='/usr/local/google-cloud-sdk/path.zsh.inc'
[ -f $glcoud_zsh_path ] && source $glcoud_zsh_path
gcloud_zsh_completions='/usr/local/google-cloud-sdk/completion.zsh.inc'
[ -f $gcloud_zsh_completions ] && source $gcloud_zsh_completions
# use homebrew's ruby
[ -d /opt/homebrew/opt/ruby@2.7/bin ] && export PATH=/opt/homebrew/opt/ruby@2.7/bin:$PATH
# hide ruby 2.7's extra output
export RUBYOPT='-W:no-deprecated -W:no-experimental'
else
eval "$(/usr/local/bin/brew shellenv)"
# optional additions from homebrew
[ -d "/usr/local/opt/node@12/bin" ] && export PATH="/usr/local/opt/node@12/bin:$PATH"
[ -d /usr/local/opt/qt/bin ] && export PATH=$PATH:/usr/local/opt/qt/bin
# use homebrew's ruby
[ -d /usr/local/opt/ruby/bin ] && export PATH=/usr/local/opt/ruby/bin:$PATH
# hide ruby 2.7's extra output
export RUBYOPT='-W:no-deprecated -W:no-experimental'
glcoud_zsh_path='/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc'
[ -f $glcoud_zsh_path ] && source $glcoud_zsh_path
gcloud_zsh_completions='/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc'
[ -f $gcloud_zsh_completions ] && source $gcloud_zsh_completions
fi
[ -d "$HOME/.krew" ] && export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
export PATH=$PATH:/usr/local/sbin
alias flushdns='sudo killall -HUP mDNSResponder'
@ -150,29 +189,10 @@ if [[ `uname` == 'Darwin' ]]; then
# Add OVFTool to PATH if it is installed
[ -d '/Applications/VMware OVF Tool' ] && export PATH=$PATH:'/Applications/VMware OVF Tool'
# optional additions from homebrew
[ -d "/usr/local/opt/node@12/bin" ] && export PATH="/usr/local/opt/node@12/bin:$PATH"
[ -d /usr/local/opt/qt/bin ] && export PATH=$PATH:/usr/local/opt/qt/bin
# use homebrew's ruby
[ -d /usr/local/opt/ruby/bin ] && export PATH=/usr/local/opt/ruby/bin:$PATH
# hide ruby 2.7's extra output
export RUBYOPT='-W:no-deprecated -W:no-experimental'
# add gems to path
GEMBIN="$(gem environment gemdir)/bin"
export PATH=$PATH:$GEMBIN
# Force google-cloud-sdk to use python 3.8
export CLOUDSDK_PYTHON="/usr/local/opt/python@3.8/libexec/bin/python"
glcoud_zsh_path='/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc'
[ -f $glcoud_zsh_path ] && source $glcoud_zsh_path
gcloud_zsh_completions='/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc'
[ -f $gcloud_zsh_completions ] && source $gcloud_zsh_completions
# added by travis gem
[ -f ~/.travis/travis.sh ] && source ~/.travis/travis.sh || echo 'The travis gem is missing. After installing it run "echo y|travis" to create ~/.travis'
@ -189,10 +209,7 @@ if [[ `uname` == 'Darwin' ]]; then
export OPENFAAS_PREFIX="genebean"
fi
# added by travis gem
[ ! -s /Users/gene/.travis/travis.sh ] || source /Users/gene/.travis/travis.sh
# default kube-ps1 to off
kubeoff
test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"