From 623c2bef1fe09000c9f4947c17cdfd9a988ef5ad Mon Sep 17 00:00:00 2001
From: Dr-Wasabi <drwasabi@tilde.team>
Date: Sat, 10 Oct 2020 10:00:16 -0400
Subject: [PATCH] Have no idea what I really changed here.

---
 .bashrc                 | 22 +++++++++++++++-------
 .bombadillo.ini         | 17 ++++++++++-------
 .gitignore              |  1 +
 fzf-plugin-settings.vim |  2 +-
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/.bashrc b/.bashrc
index ae9efc9..cf7d23f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -66,7 +66,7 @@ if [ -n "$force_color_prompt" ]; then
 fi
 
 if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]<\u@\lhost\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$> '
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]<\u@\h:\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$>'
 else
     PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 fi
@@ -117,12 +117,6 @@ if ! shopt -oq posix; then
   fi
 fi
 
-# set up some of my go env path
-export GOPATH=$HOME/dev/go
-export GOBIN=$HOME/dev/go/bin
-
-export EDITOR=nvim
-
 # Use the Powerline_go prompt system
 function _update_ps1() {
     PS1="$($GOPATH/bin/powerline-go -condensed -error $?)"
@@ -135,6 +129,17 @@ fi
 # create a shortcut to my windows home folder
 #export $WINHOME=/mnt/c/Users/Russ\ Riker/
 
+# set up some of my go env path
+export GOPATH=$HOME/dev/go
+export GOBIN=$HOME/dev/go/bin
+
+# common dev folders I use
+export MYGODEV=~/dev/go/src/github.com/Dr-Wasabi/
+export MYDOTFILES=~/dev/dotfiles
+
+# My editor of choice
+export EDITOR=nvim
+
 # Add my local /bin to the path
 export PATH=/home/drwasabi/.local/bin:$PATH
 
@@ -143,6 +148,9 @@ export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_DATA_HOME="$HOME/.local/share"
 
+# Trying to get fzf to not look into .git folders
+export FZF_DEFAULT_COMMAND='rg --files --hidden'
+
 
 # Look in my ascii-art folder, and use shuf to get a randome file name.
 BANNERFILE=$(ls ~/mydocs/ascii-art/ | shuf -n 1)
diff --git a/.bombadillo.ini b/.bombadillo.ini
index 1291e71..11d3a64 100644
--- a/.bombadillo.ini
+++ b/.bombadillo.ini
@@ -1,17 +1,20 @@
 
 [SETTINGS]
+tlscertificate=
+tlskey=
 savelocation=/home/drwasabi
-geminiblocks=block
+defaultscheme=gopher
+homeurl=gopher://bombadillo.colorfield.space:70/1/user-guide.map
 searchengine=gopher://gopher.floodgap.com:70/7/v2/vs
 showimages=true
 telnetcommand=telnet
+geminiblocks=block
 theme=normal
-tlscertificate=
-tlskey=
 webmode=none
-defaultscheme=gopher
-homeurl=gopher://bombadillo.colorfield.space:70/1/user-guide.map
 configlocation=/home/drwasabi/.config
 [CERTS]
-tilde.team=E1:70:E7:3E:FA:E7:63:82:3C:62:8D:6B:BC:FA:36:EE:3E:B8:7F:D3|1598782512
-gemini.circumlunar.space=5D:35:B2:11:AA:D4:C1:C2:44:F6:71:5B:6B:E2:AD:FE:CD:E3:E5:C5|1601476250
+gemini.susa.net=D1:42:B7:B3:F0:52:75:9B:F7:B3:6F:51:EB:E4:9E:88:5C:79:FF:75|1607630856
+typed-hole.org=DC:F8:38:67:21:A0:FE:3F:68:14:08:E0:11:38:76:1B:5D:25:35:7C|1879493781
+gemini.circumlunar.space=5D:BF:7E:4B:47:E8:D4:46:D2:44:C8:09:3F:58:F7:E3:D4:43:3D:56|1759499437
+tilde.team=44:68:98:02:C3:FC:EA:AD:37:07:51:CC:C3:97:9E:4A:4C:36:6B:76|1603978040
+gemlog.blue=37:BE:F0:78:8C:33:95:9A:2F:C3:33:57:7A:8A:BC:01:CA:31:93:A2|1679454621
diff --git a/.gitignore b/.gitignore
index 14e1d3b..ddd076d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+.git/
 .bash_history
 __pycache__/
diff --git a/fzf-plugin-settings.vim b/fzf-plugin-settings.vim
index 6e3dcc3..1ce738c 100644
--- a/fzf-plugin-settings.vim
+++ b/fzf-plugin-settings.vim
@@ -24,7 +24,7 @@ let g:fzf_tags_command = 'ctags -R'
 let g:fzf_layout = {'up':'~90%', 'window': { 'width': 0.8, 'height':0.8,'yoffset':0.5,'xoffset': 0.5, 'highlight': 'Todo', 'border':'sharp' } }
 
 let $FZF_DEFAULT_OPTS = '--layout=reverse --info=inline'
-let $FZF_DEFAULT_COMMAND="rg --files --hidden"
+let $FZF_DEFAULT_COMMAND='rg --files --hidden'
 
 
 " Customize fzf colors to match your color scheme