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

Merge branch 'master' into mint

Browse source
This commit is contained in:
Gene Liverman 2017-10-15 10:27:57 -07:00
commit b9d6bd57bb
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
link/mac/tmux.conf
View file

@ -1 +1,8 @@
source "/usr/local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf" 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

8
link/nix/zshrc
View file

@ -54,7 +54,7 @@ COMPLETION_WAITING_DOTS="false"
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup. # 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 source $ZSH/oh-my-zsh.sh
@ -62,6 +62,11 @@ source $ZSH/oh-my-zsh.sh
[ -f ~/.private-env ] && source ~/.private-env || echo '~/.private-env is missing' [ -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" # export MANPATH="/usr/local/man:$MANPATH"
# Start GPG agent # Start GPG agent
@ -89,6 +94,7 @@ export POWERLINE_CONFIG_COMMAND='/usr/local/bin/powerline-config'
export PATH=$PATH:~/.nexustools export PATH=$PATH:~/.nexustools
if [[ `uname` == 'Darwin' ]]; then if [[ `uname` == 'Darwin' ]]; then
export PATH=$PATH:/usr/local/sbin
export PATH=$PATH:/Applications/Araxis\ Merge.app/Contents/Utilities export PATH=$PATH:/Applications/Araxis\ Merge.app/Contents/Utilities
export PATH="/usr/local/opt/python/libexec/bin:$PATH" export PATH="/usr/local/opt/python/libexec/bin:$PATH"
export PATH=$PATH:/usr/local/opt/node@6/bin export PATH=$PATH:/usr/local/opt/node@6/bin

1
puppet/production/site/profile/manifests/mac.pp
View file

@ -36,6 +36,7 @@ class profile::mac {
'tree', 'tree',
'unrar', 'unrar',
'vagrant-completion', 'vagrant-completion',
'vim',
'watch', 'watch',
'wget', 'wget',
'zsh', 'zsh',