Merge branch 'master' of https://gitlab.com/sagev9000/dotfiles

.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-)
 }
 
+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 {}'"
 

.zshrc

@@ -1,5 +1,7 @@
 source ~/.zsh_local
+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
@@ -80,6 +82,12 @@ function getdot {
     cd -
 }
 
+if which starship &> /dev/null; then
     eval "$(starship init zsh)"
+fi
+
+if test -f ~/.cargo/env; then
     source ~/.cargo/env
+fi
+
 source ~/.shell_aliases

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