From e1ea5a28c3c29a04bd98efea27613149cd0187c4 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Wed, 3 Nov 2021 12:18:12 -0500
Subject: [PATCH] More cleanup

---
 common/bash/rc                          | 3 ++-
 common/fish/vars.fish                   | 5 ++++-
 common/neovim/colors/base16-donokai.vim | 2 +-
 readme.md                               | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/common/bash/rc b/common/bash/rc
index 8412f44..5e059fb 100644
--- a/common/bash/rc
+++ b/common/bash/rc
@@ -4,6 +4,7 @@
 command -v fish >/dev/null 2>&1 && grep fish /etc/shells >/dev/null 2>&1 && {
 	echo "This user is configured to use 'fish' as its primary shell."
 	echo "  You may want to run 'chsh' and set your shell to $(grep fish /etc/shells | head -n1)'."
-	echo "  You may also temporarily use fish by simply running 'fish'."
+	echo "  Once that's done, simply run 'fish'."
+	echo "  You can also try fish temporarily by running 'fish'. No 'chsh' commitment required."
 	echo "  If you're in bash for intentionally for some reason, then ignore this message."
 }
diff --git a/common/fish/vars.fish b/common/fish/vars.fish
index b98c79e..675496b 100644
--- a/common/fish/vars.fish
+++ b/common/fish/vars.fish
@@ -16,7 +16,10 @@ set --export --universal MANPAGER 'env MANWIDTH="" nvim --cmd "let g:prosession_
 if command --search --quiet nvim
 	set --export --universal EDITOR nvim
 	set --export --universal VISUAL nvim
-else
+else if command --search --quiet vim
+	set --export --universal EDITOR vim
+	set --export --universal VISUAL vim
+else if command --search --quiet vi
 	set --export --universal EDITOR vi
 	set --export --universal VISUAL vi
 end
diff --git a/common/neovim/colors/base16-donokai.vim b/common/neovim/colors/base16-donokai.vim
index 3397d0b..3af3c64 120000
--- a/common/neovim/colors/base16-donokai.vim
+++ b/common/neovim/colors/base16-donokai.vim
@@ -1 +1 @@
-/root/.config/lytedev-dotfiles/common/colors/vim
\ No newline at end of file
+/home/daniel/.home/.config/lytedev-dotfiles/common/colors/vim
\ No newline at end of file
diff --git a/readme.md b/readme.md
index ded9c94..099bc1c 100644
--- a/readme.md
+++ b/readme.md
@@ -10,7 +10,7 @@ take what you like.
 
 # Basic Setup
 
-    curl -LsSf https://lyte.dev/df.sh | sh
+    curl -Ss https://lyte.dev/df.sh | sh
 
 ## I don't like `curl ... | sh`
 
@@ -44,6 +44,7 @@ And then link them yourself (note the replacing of slashes with dashes):
     ln -s (pwd)/os/linux/arch $ENV_PATH/os-linux-arch
     ln -s (pwd)/host/laptop $ENV_PATH/host-laptop
     ln -s (pwd)/host/laptop/third $ENV_PATH/os-laptop-third
+    # etc...
 
 And run setup again once you've finished linking all related environments: