[fish] Cleaning up bad merges

.gitignore

@@ -27,3 +27,36 @@ error.log
 *.envrc
 fish/completions/
 fish_variables
+_tide*
+fish/.config/fish/functions/fisher.fish
+fish/.config/fish/completions/fisher.fish
+fish/.config/fish/completions/tide.fish
+fish/.config/fish/conf.d/direnv.fish
+fish/.config/fish/conf.d/gitnow.fish
+fish/.config/fish/conf.d/gitnow_config.fish
+fish/.config/fish/conf.d/z.fish
+fish/.config/fish/functions/fish_mode_prompt.fish
+fish/.config/fish/functions/tide.fish
+fish/.config/fish/functions/tide/configure/choices/all/finish.fish
+fish/.config/fish/functions/tide/configure/choices/all/icons.fish
+fish/.config/fish/functions/tide/configure/choices/all/prompt_colors.fish
+fish/.config/fish/functions/tide/configure/choices/all/prompt_connection.fish
+fish/.config/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish
+fish/.config/fish/functions/tide/configure/choices/all/prompt_spacing.fish
+fish/.config/fish/functions/tide/configure/choices/all/show_time.fish
+fish/.config/fish/functions/tide/configure/choices/all/style.fish
+fish/.config/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish
+fish/.config/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish
+fish/.config/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish
+fish/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish
+fish/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish
+fish/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish
+fish/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish
+fish/.config/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish
+fish/.config/fish/functions/tide/configure/configs/classic.fish
+fish/.config/fish/functions/tide/configure/configs/classic_16color.fish
+fish/.config/fish/functions/tide/configure/configs/lean.fish
+fish/.config/fish/functions/tide/configure/configs/lean_16color.fish
+fish/.config/fish/functions/tide/configure/configs/rainbow.fish
+fish/.config/fish/functions/tide/configure/configs/rainbow_16color.fish
+_fake*

qutebrowser/.config/qutebrowser/autoconfig.yml

@@ -13,6 +13,7 @@ settings:
   content.geolocation:
     https://app.zestful.com: true
     https://box.unbl.ink: true
+    https://www.rcplanet.com: false
   content.media.audio_capture:
     https://15five.zoom.us: true
     https://meet.google.com: true

qutebrowser/.config/qutebrowser/bookmarks/urls

@@ -9,3 +9,4 @@ https://app.slack.com/client/T042JGM5N/C0437D88S/thread/C0437D88S-1615565720.132
 https://15five.15five.com/admin/dj/saml2/saml2config/?q=60027 Select Configuration to change | Django site admin
 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

ssh/.ssh/config

@@ -68,7 +68,7 @@ Host skoll.local
   User powellc
 Host atlas.local
   User powellc
-Host daphnis.local
+Host ijiraq.local
   User powellc
 
 Host telesto.local
@@ -94,7 +94,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