From 37a6c94bb8c9a9877fca0d729bd400536bcda41d Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sat, 7 Oct 2017 21:15:32 -0700 Subject: [PATCH 1/4] Adjusted plugins and gpg stuff --- link/nix/zshrc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/link/nix/zshrc b/link/nix/zshrc index 8831250..3b4c836 100644 --- a/link/nix/zshrc +++ b/link/nix/zshrc @@ -51,7 +51,7 @@ COMPLETION_WAITING_DOTS="false" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(brew bundler gem git git-flow gpg-agent history osx python vagrant) +plugins=(brew bundler gem git git-flow history osx pip python terraform vagrant) source $ZSH/oh-my-zsh.sh @@ -59,6 +59,11 @@ source $ZSH/oh-my-zsh.sh [ -f ~/.private-env ] && source ~/.private-env || echo '~/.private-env is missing' +# Start GPG agent +export GPG_TTY=$(tty) +gpg-connect-agent /bye +export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh + # export MANPATH="/usr/local/man:$MANPATH" # Set personal aliases, overriding those provided by oh-my-zsh libs, From 051cbaf9ed44738d994c466ea824a30177363642 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sat, 7 Oct 2017 21:15:59 -0700 Subject: [PATCH 2/4] added mouse support --- link/nix/tmux.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/link/nix/tmux.conf b/link/nix/tmux.conf index a6488ac..28031b4 100644 --- a/link/nix/tmux.conf +++ b/link/nix/tmux.conf @@ -1 +1,8 @@ source "/usr/local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf" + +# Make mouse useful in copy mode +set -g mouse on + +# Scroll History +set -g history-limit 30000 + From 5130729c0c375bd8dc92143c5cb47af29bbae0a3 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sat, 7 Oct 2017 21:16:16 -0700 Subject: [PATCH 3/4] Updated vim to fix powerline --- puppet/production/site/profile/manifests/mac.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/puppet/production/site/profile/manifests/mac.pp b/puppet/production/site/profile/manifests/mac.pp index a04e494..40508a5 100644 --- a/puppet/production/site/profile/manifests/mac.pp +++ b/puppet/production/site/profile/manifests/mac.pp @@ -36,6 +36,7 @@ class profile::mac { 'tree', 'unrar', 'vagrant-completion', + 'vim', 'watch', 'wget', 'zsh', From b075f047d605db8a8f2b56a631cc827b513a84cb Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sun, 15 Oct 2017 09:58:11 -0700 Subject: [PATCH 4/4] added /usr/local/sbin to PATH --- link/nix/zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/link/nix/zshrc b/link/nix/zshrc index 3b4c836..1b59019 100644 --- a/link/nix/zshrc +++ b/link/nix/zshrc @@ -86,6 +86,7 @@ export POWERLINE_CONFIG_COMMAND='/usr/local/bin/powerline-config' export PATH=$PATH:~/.nexustools 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" export PATH=$PATH:/usr/local/opt/node@6/bin