From 5df77d6163aa91c6a1c4c44895dbd9f3a9703c9e Mon Sep 17 00:00:00 2001
From: Joe Papperello <joe@socialflow.com>
Date: Thu, 28 Mar 2019 11:52:27 -0400
Subject: [PATCH] v

---
 bashrc          |  4 ++--
 install.sh      |  1 +
 setup_bashrc.sh |  1 +
 ssh-config      | 25 +++++++++++++++++++++++++
 tmux.conf       | 10 +++++-----
 5 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/bashrc b/bashrc
index 4d01902..a666557 100644
--- a/bashrc
+++ b/bashrc
@@ -41,7 +41,7 @@ ec2-info() {
 }
 export EDITOR=vim
 export GOPATH=$HOME/code/go
-export PATH=$HOME/bin:$HOME/bin/fzf/bin/:$HOME/gobin/go/bin/:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$HOME/Library/Python/2.7/bin:$HOME/bin/vim/vim-8.0.1481/bin/bin/:$PATH 
+export PATH=$HOME/bin:$HOME/bin/fzf/bin/:$HOME/gobin/go/bin/:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$HOME/Library/Python/2.7/bin:$HOME/bin/vim/vim-8.0.1481/bin/bin/:/usr/local/MacGPG2/bin/:/usr/local/bin/:$PATH 
 [ -f $HOME/perl5/lib/perl5/Devel/Local.pm ] && source `which devel-local.sh`
 function github() {
     git clone git@github.com:SocialFlowDev/$1.git
@@ -82,7 +82,7 @@ elif command -v ack-grep >/dev/null 2>&1; then
 fi
 [ -f /home/joe/dotfiles/additional_options ] && . /home/joe/dotfiles/additional_options
 export GOPATH=$HOME/code/go
-export PATH=$PATH:$GOPATH/bin
+export PATH=$PATH:$GOPATH/bin:$HOME/.local/bin
 export PERLBREW_ROOT=$HOME/perlbrew
 function refresh_gpga() {
     if [ -f "${HOME}/.gpg-agent-info" ]; then
diff --git a/install.sh b/install.sh
index 4533814..bb2e73e 100755
--- a/install.sh
+++ b/install.sh
@@ -14,3 +14,4 @@ DIR="$(pwd)"
     ln -sf "$DIR/vim-colors/molokaimod.vim" "$HOME/.vim/colors/molokaimod.vim"
     ln -sf "$DIR/vim-autoload" "$HOME/.vim/autoload"
     ln -sf "$DIR/etc/gpg-agent.conf" "$HOME/.gnupg/gpg-agent.conf"
+    ln -sf "$DIR/inputrc" "$HOME/.inputrc"
diff --git a/setup_bashrc.sh b/setup_bashrc.sh
index 360da1c..3ec4f96 100755
--- a/setup_bashrc.sh
+++ b/setup_bashrc.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 DIR="$(pwd)"
 echo "[ -f $DIR/bashrc ] && . $DIR/bashrc" >> ~/.bashrc
+echo "[ -f $DIR/bashrc ] && . $DIR/bashrc" >> ~/.bash_profile
diff --git a/ssh-config b/ssh-config
index 9b27aa4..5cbeb37 100644
--- a/ssh-config
+++ b/ssh-config
@@ -14,6 +14,22 @@ Host *.mars.sfsrv.net
   StrictHostKeyChecking false
   KbdInteractiveAuthentication false
 
+Host 20.0.*.*
+  User appuser
+  ConnectTimeout 30
+  ProxyCommand ~/dotfiles/script/vpnnc.sh marsvpn %h %p 
+  StrictHostKeyChecking false
+  KbdInteractiveAuthentication false
+
+Host 10.125.*.*
+  User appuser
+  ConnectTimeout 30
+  ProxyCommand ~/dotfiles/script/vpnnc.sh saturnvpn %h %p 
+  StrictHostKeyChecking false
+  KbdInteractiveAuthentication false
+
+
+
 Host *.saturn.sfsrv.net
   User appuser
   ConnectTimeout 30
@@ -22,6 +38,15 @@ Host *.saturn.sfsrv.net
   StrictHostKeyChecking false
   KbdInteractiveAuthentication false
 
+Host 54.164.21.74
+  User appuser
+  ConnectTimeout 30
+  #ProxyCommand docker exec -i saturnvpn nc -q0 %h %p 2>/dev/null
+  ProxyCommand ~/dotfiles/script/vpnnc.sh saturnvpn %h %p 
+  StrictHostKeyChecking false
+  KbdInteractiveAuthentication false
+
+
 
 
 Host *.sflow.us
diff --git a/tmux.conf b/tmux.conf
index ba7deec..2680ec1 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -23,8 +23,8 @@ set -g status-right '#[fg=colour245] %R %d %b #[fg=colour235,bg=colour252,bold]
 
 set -g default-terminal "screen-256color"
 setw -g mode-keys vi
-bind-key -t vi-copy 'v' begin-selection
-bind-key -t vi-copy 'y' copy-selection
+#bind-key -t vi-copy 'v' begin-selection
+#bind-key -t vi-copy 'y' copy-selection
 setw -g monitor-activity on
 
 ## Mouse stuff
@@ -37,7 +37,7 @@ setw -g monitor-activity on
 
 
 # Decrease the timeout when moving between windows using arrow keys
-set-option repeat-time 100 
+#set-option repeat-time 100 
 
 
 # force a reload of the config file
@@ -59,7 +59,7 @@ bind h split-window -h
 bind v split-window -v
 unbind C-p
 bind C-p run " tmux show-buffer | xclip -selection clipboard -i >/dev/null"
-bind-key -t vi-copy y copy-pipe 'xclip -selection clipboard >/dev/null'
+#bind-key -t vi-copy y copy-pipe 'xclip -selection clipboard >/dev/null'
 
 
 
@@ -88,7 +88,7 @@ bind k next-window
 
 unbind @
 bind @ command-prompt -p "join pane to:"  "join-pane -t '%%'"
-if-shell "uname | grep -q Darwin" "set-option -g default-command \"reattach-to-user-namespace -l bash\""
+#if-shell "uname | grep -q Darwin" "set-option -g default-command \"reattach-to-user-namespace -l bash\""
 
 
 ## Nested tmux