boop

4 files changed, 16 insertions, 14 deletions

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 2f44895..c727a72 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -13,7 +13,7 @@ function set_envvars
 end
 
 function load_plugins
-  if not test -f "$XDG_CONFIG_HOME/fish/functions/fisher.fish"
+  if not functions -q fisher
     echo 'bootstrapping fisher'
     curl -sL https://git.io/fisher | source && fisher update
   end
@@ -21,10 +21,14 @@ function load_plugins
   if command -q zoxide
     zoxide init fish | source
   end
+
+  if command -q starship
+    starship init fish | source
+  end
 end
 
-if status is-login
-  set_envvars
-else if status is-interactive
+if status is-interactive
   load_plugins
+else
+  set_envvars
 end
diff --git a/.config/fish/fish_plugins b/.config/fish/fish_plugins
index 0f0f3c6..be95bfb 100644
--- a/.config/fish/fish_plugins
+++ b/.config/fish/fish_plugins
@@ -1,5 +1,4 @@
 jorgebucaran/fisher
-jorgebucaran/hydro
 ehfive/fish-bash2env
 jorgebucaran/autopair.fish
 nickeb96/puffer-fish
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index 632f763..47532d7 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -15,6 +15,6 @@ set undodir=$XDG_STATE_HOME/vim/undo     | call mkdir(&undodir,   'p')
 set viewdir=$XDG_STATE_HOME/vim/view     | call mkdir(&viewdir,   'p')
 set viminfofile=$XDG_STATE_HOME/vim/viminfo
 
-set ts=2
-set sw=2
-set et
+set tabstop=2
+set shiftwidth=2
+set expandtab
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 4da21d0..0503459 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -18,16 +18,15 @@ fi
 source "${antidote_dir}/antidote.zsh"
 
 # zmodules
-autoload -Uz bashcompinit compinit colors
-colors
+autoload -Uz bashcompinit compinit # colors promptinit
+# colors
+# promptinit; prompt walters
 zmodload zsh/zutil
 zmodload zsh/complist
 zstyle ':completion::*' add-space 'false'
-zstyle ':completion::*' completer _ignored _expand_alias _expand _extensions _complete _approximate
 zstyle ':completion::*' group-name ''
 zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
-zstyle ':completion:*' menu 'true' 'select'
-zstyle ':completion:*' single-ignored 'file'
+zstyle ':completion:*' menu 'select'
 zstyle ':completion:*' squeeze-slashes 'true'
 zstyle ':completion::*' use-cache 'true'
 zstyle ':completion::*' cache-path "$zdump"
@@ -43,8 +42,8 @@ unset zdump
 
 # load plugins
 antidote load
+## eval "$(zoxide init zsh)"
 unset antidote_dir
-eval "$(zoxide init zsh)"
 
 # options
 unsetopt beep