From 677e466fbe2f8e4fb198ecf02edf800bf89dc3f7 Mon Sep 17 00:00:00 2001
From: Joe Papperello <joeyis@gmail.com>
Date: Thu, 23 Sep 2021 11:46:48 -0400
Subject: [PATCH] misc

---
 bashrc                   | 20 +++++++++++++-------
 doom.d/configuration.org |  2 ++
 ssh-config               | 10 +++++++++-
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/bashrc b/bashrc
index 43e0c13..3e99f82 100644
--- a/bashrc
+++ b/bashrc
@@ -152,17 +152,23 @@ function vpnconnect() {
 }
 
 function bwvpnconnect() {
-    echo $(bw get username "$1.vpn") > $HOME/vpn/$1.tblk/Contents/Resources/creds.txt
-    VPNPASS=$(bw get password "$1.vpn") 
-    VPNOTP=$(bw get totp $1)
-    echo "$VPNPASS$VPNOTP" >> $HOME/vpn/$1.tblk/Contents/Resources/creds.txt
-    docker start $1 && sleep 1 && rm $HOME/vpn/$1.tblk/Contents/Resources/creds.txt && echo "connected to $1"
+    SERVER=$1
+    echo $(bw get username "$SERVER.vpn") > $HOME/vpn/$SERVER.tblk/Contents/Resources/creds.txt
+    VPNPASS=$(bw get password "$SERVER.vpn") 
+    VPNOTP=$(bw get totp $SERVER)
+    echo "$VPNPASS$VPNOTP" >> $HOME/vpn/$SERVER.tblk/Contents/Resources/creds.txt
+    docker start $SERVER && sleep 1 && rm $HOME/vpn/$SERVER.tblk/Contents/Resources/creds.txt && echo "connected to $SERVER"
 }
 
 function sfvpn() {
-    local bw_session=$(bw unlock --raw)
+    if [ -z "${BW_SESSION}" ]; then
+        local bw_session=$(bw unlock --raw)
+    else
+        local bw_session=$BW_SESSION
+    fi
+
     BW_SESSION=$bw_session bwvpnconnect mars &
-    BW_SESSION=$bw_session bwvpnconnect saturn 
+    BW_SESSION=$bw_session bwvpnconnect saturn
 }
 
 function vssh() {
diff --git a/doom.d/configuration.org b/doom.d/configuration.org
index b7f21e6..7e19eaf 100644
--- a/doom.d/configuration.org
+++ b/doom.d/configuration.org
@@ -341,6 +341,8 @@ org mode seems to ignore my per-headline visibility properties unless this is se
 * Super agenda
 #+BEGIN_SRC emacs-lisp
 (setq org-tag-alist '(("work" . ?w) ("home" . ?h) ("ramona" . ?r) ("buy" . ?b) ("someday" . ?s)))
+
+; dont need to show project tag
 (setq org-agenda-hide-tags-regexp (regexp-opt '("project")))
 
 (use-package! org-super-agenda
diff --git a/ssh-config b/ssh-config
index 91057d8..2c8b58c 100644
--- a/ssh-config
+++ b/ssh-config
@@ -23,12 +23,20 @@ Host 10.125.*.*
   KbdInteractiveAuthentication false
 
 
+Host 10.96.*.*
+  User appuser
+  ConnectTimeout 30
+  ProxyCommand docker exec -i mars nc -q0 %h %p 2>/dev/null
+  #ProxyCommand ~/dotfiles/script/vpnnc.sh saturn %h %p 
+  StrictHostKeyChecking false
+  KbdInteractiveAuthentication false
+
+
 
 Host *.saturn.sfsrv.net
   User appuser
   ConnectTimeout 30
   ProxyCommand docker exec -i saturn nc -q0 %h %p 2>/dev/null
-  #ProxyCommand ~/dotfiles/script/vpnnc.sh saturn %h %p
   StrictHostKeyChecking false
   KbdInteractiveAuthentication false