From 8032e27573227d4c125a9a3d0004f12a1eacee70 Mon Sep 17 00:00:00 2001
From: Sage Vaillancourt <sage@sagev.space>
Date: Tue, 18 Oct 2022 02:35:06 +0000
Subject: [PATCH 1/2] Add some possible-missing-file checks.

Use newer starship install method.
Add empty files.vim
---
 .zshrc  | 46 +++++++++++++++++++++++++++-------------------
 copy.sh |  5 ++++-
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/.zshrc b/.zshrc
index 811ba59..afb6d0d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,5 +1,7 @@
 source ~/.zsh_local
-source /usr/share/doc/fzf/examples/completion.zsh
+if test -f /usr/share/doc/fzf/examples/completion.zsh &> /dev/null; then
+    source /usr/share/doc/fzf/examples/completion.zsh
+fi
 
 HISTFILE=~/.histfile
 HISTSIZE=10000
@@ -41,22 +43,22 @@ export PATH=./:~/.bin:/usr/local/go/bin:$PATH
 fignore=(o)
 
 function SetTtyColors() {
-    echo -en "\e]P0""292e2f" #black      1
-    echo -en "\e]P1""dc4848" #darkgrey   2
-    echo -en "\e]P2""00aa00" #darkred    3
-    echo -en "\e]P3""d99f4e" #red        4
-    echo -en "\e]P4""4444aa" #darkgreen  5
-    echo -en "\e]P5""c436b9" #green      6
-    echo -en "\e]P6""00aaaa" #brown      7
-    echo -en "\e]P7""d7d7d7" #yellow     8
-    echo -en "\e]P8""7b7b7b" #darkblue   9
-    echo -en "\e]P9""6f6fff" #blue       10
-    echo -en "\e]PA""55ff55" #darkmagenta11
-    echo -en "\e]PB""ffed8b" #magenta    12
-    echo -en "\e]PC""5555ff" #darkcyan   13
-    echo -en "\e]PD""ff6eff" #cyan       14
-    echo -en "\e]PE""55ffff" #lightgray  15
-    echo -en "\e]PF""aaaaaa" #white      16
+    echo -en "\e]P0""292e2f" #black       1
+    echo -en "\e]P1""dc4848" #darkgrey    2
+    echo -en "\e]P2""00aa00" #darkred     3
+    echo -en "\e]P3""d99f4e" #red         4
+    echo -en "\e]P4""4444aa" #darkgreen   5
+    echo -en "\e]P5""c436b9" #green       6
+    echo -en "\e]P6""00aaaa" #brown       7
+    echo -en "\e]P7""d7d7d7" #yellow      8
+    echo -en "\e]P8""7b7b7b" #darkblue    9
+    echo -en "\e]P9""6f6fff" #blue        10
+    echo -en "\e]PA""55ff55" #darkmagenta 11
+    echo -en "\e]PB""ffed8b" #magenta     12
+    echo -en "\e]PC""5555ff" #darkcyan    13
+    echo -en "\e]PD""ff6eff" #cyan        14
+    echo -en "\e]PE""55ffff" #lightgray   15
+    echo -en "\e]PF""aaaaaa" #white       16
     clear
 }
 
@@ -80,6 +82,12 @@ function getdot {
     cd -
 }
 
-eval "$(starship init zsh)"
-source ~/.cargo/env
+if which starship &> /dev/null; then
+    eval "$(starship init zsh)"
+fi
+
+if test -f ~/.cargo/env; then
+    source ~/.cargo/env
+fi
+
 source ~/.shell_aliases
diff --git a/copy.sh b/copy.sh
index bce7a18..cea2684 100755
--- a/copy.sh
+++ b/copy.sh
@@ -5,6 +5,9 @@ moving_files="$(find $SCRIPT_DIR -mindepth 1 -maxdepth 1 -type f -not -name "cop
 moving_files=$(echo -e "$moving_files\n$(find $SCRIPT_DIR/.vim/colors/ -mindepth 1)")
 moving_files=$(echo -e "$moving_files\n$(find $SCRIPT_DIR/.config/ -mindepth 1)")
 
+mkdir -p $HOME/.vim/user/
+touch $HOME/.vim/user/files.vim
+
 home_files=""
 for f in $moving_files; do
   home_file="$HOME$(echo $f | sed "s@$SCRIPT_DIR@@")"
@@ -55,7 +58,7 @@ if [[ "$1" == "--install" ]]; then
   if command -v cargo; then
     cargo install bat
   fi
-  sh -c "$(curl -fsSL https://starship.rs/install.sh)"
+  curl -sS https://starship.rs/install.sh | sh
   echo "Starship requires an NFont: https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/FiraCode.zip"
   echo "You may wish to install fzf"
 fi

From 197df71e3e02d1b42f58b629999723bb5af9c974 Mon Sep 17 00:00:00 2001
From: Sage Vaillancourt <sage@sagev.space>
Date: Tue, 18 Oct 2022 02:39:26 +0000
Subject: [PATCH 2/2] Also check if bat exists before aliasing cat.

---
 .shell_aliases | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.shell_aliases b/.shell_aliases
index 827f655..0985b6b 100755
--- a/.shell_aliases
+++ b/.shell_aliases
@@ -22,7 +22,9 @@ function ww {
     ws $(rg --no-line-number --no-filename . ~/wiki | sed 's/[^a-zA-Z0-9]\+/\n/g' | grep -v "^$" | sort -f | uniq -ci | sort -hr | fzf -i | cut -c 9-)
 }
 
-alias cat="bat"
+if command -v bat; then
+    alias cat="bat"
+fi
 export FZF_DEFAULT_COMMAND='fd --type f'
 alias fzf="fzf --preview 'bat --style=numbers --color=always {}'"