From 7a61e3414c772768c130ae05ee5a37e77f489bcd Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sun, 15 Oct 2017 15:39:37 -0700 Subject: [PATCH 1/2] make backspacing work again Using the Vim from homebrew caused the backspace key to stop working. This fixes that issue. --- link/nix/vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/link/nix/vimrc b/link/nix/vimrc index bd616ab..9311092 100644 --- a/link/nix/vimrc +++ b/link/nix/vimrc @@ -37,6 +37,7 @@ set termencoding=utf-8 set autoindent set background=dark +set backspace=2 set expandtab set fillchars+=stl:\ ,stlnc:\ set laststatus=2 From 2e9ada45ef561d5a6983195a3e7e2299b6335bec Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sun, 15 Oct 2017 15:43:12 -0700 Subject: [PATCH 2/2] ZSH additions Added alias for Sourcetree, added helper method to make Puppet's PDK work, and added conditional additions for Google's SDK. --- link/nix/zshrc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/link/nix/zshrc b/link/nix/zshrc index 4111e32..980f12d 100644 --- a/link/nix/zshrc +++ b/link/nix/zshrc @@ -81,6 +81,7 @@ export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh #alias ls='ls -G' alias sal='ssh-add -L' alias sz='source ~/.zshrc' +alias st='/Applications/SourceTree.app/Contents/MacOS/SourceTree &' alias ykey='pkill gpg-agent && source ~/.zshrc; ssh-add -L' export EDITOR='vim' @@ -92,10 +93,15 @@ if [[ `uname` == 'Darwin' ]]; then export PATH=$PATH:/usr/local/sbin export PATH=$PATH:/Applications/Araxis\ Merge.app/Contents/Utilities export PATH="/usr/local/opt/python/libexec/bin:$PATH" + eval '/usr/libexec/path_helper -s' > /dev/null export PATH=$PATH:/usr/local/opt/node@6/bin + if [[ -f '/Applications/google-cloud-sdk' ]]; then + source /Applications/google-cloud-sdk/completion.zsh.inc + source /Applications/google-cloud-sdk/path.zsh.inc + fi +fi + # 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' fi - -