From a5307e5324366140ef7c6655ae7e6a1892318728 Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@unbl.ink>
Date: Mon, 10 Jan 2022 10:45:13 -0500
Subject: [PATCH] Merge

---
 fish/.config/fish/functions/fisher.fish       |  4 +++-
 .../.config/qutebrowser/bookmarks/urls        |  1 +
 ssh/.ssh/config                               | 19 ++++++++++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/fish/.config/fish/functions/fisher.fish b/fish/.config/fish/functions/fisher.fish
index a1fb6cf..72203a2 100644
--- a/fish/.config/fish/functions/fisher.fish
+++ b/fish/.config/fish/functions/fisher.fish
@@ -1,6 +1,6 @@
 function fisher --argument-names cmd --description "A plugin manager for Fish"
     set --query fisher_path || set --local fisher_path $__fish_config_dir
-    set --local fisher_version 4.3.0
+    set --local fisher_version 4.3.1
     set --local fish_plugins $__fish_config_dir/fish_plugins
 
     switch "$cmd"
@@ -15,6 +15,8 @@ function fisher --argument-names cmd --description "A plugin manager for Fish"
             echo "Options:"
             echo "       -v or --version  Print version"
             echo "       -h or --help     Print this help message"
+            echo "Variables:"
+            echo "       \$fisher_path  Plugin installation path. Default: ~/.config/fish"
         case ls list
             string match --entire --regex -- "$argv[2]" $_fisher_plugins
         case install update remove
diff --git a/qutebrowser/.config/qutebrowser/bookmarks/urls b/qutebrowser/.config/qutebrowser/bookmarks/urls
index 18183f6..bf29ae8 100644
--- a/qutebrowser/.config/qutebrowser/bookmarks/urls
+++ b/qutebrowser/.config/qutebrowser/bookmarks/urls
@@ -10,3 +10,4 @@ https://15five.15five.com/admin/dj/saml2/saml2config/?q=60027 Select Configurati
 https://app.slack.com/client/T042JGM5N/G010U55A8CV/thread/G010U55A8CV-1637246877.000600 Slack | support-tier2 | 15Five
 https://15five.lightning.force.com/lightning/r/Case/5004T00000BGbDBQA1/view 00018911 | Salesforce
 https://www.figma.com/file/0qsXDQRmrdtoNaBmGIdD1Y/Partnerships-Team?node-id=518%3A23 Partnerships Team – Figma
+https://15five.lightning.force.com/lightning/r/Case/5004T00000D7iRDQAZ/view 00024824 | Salesforce
diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index f583e72..d87044c 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -96,7 +96,7 @@ Host *.local 192.168.1.*
   User root
   IdentityFile ~/.ssh/jails
   Hostname %h
-  #ProxyJump bastion.unbl.ink
+  ProxyJump bastion.unbl.ink
 
 Host *.cloud51
     HostName %h
@@ -132,5 +132,22 @@ Host bastion.cloud100.15five.com
     Port 155
     AddKeysToAgent yes
 
+Host *.cloud101
+    HostName %h
+    User colin
+    IdentityFile ~/.ssh/ff_cloud101_rsa_2021q3
+    ProxyJump bastion.cloud101.15five.com
+    LocalForward 127.0.0.1:5437 db.mirror0.cloud101:5432
+    Port 155
+    ServerAliveInterval 30
+    ServerAliveCountMax 3
+    AddKeysToAgent yes
+
+Host bastion.cloud101.15five.com
+    User colin
+    IdentityFile ~/.ssh/ff_cloud101_rsa_2021q3
+    Port 155
+    AddKeysToAgent yes
+
 Host 192.168.1.238
     Port 2222