diff --git a/base/bashrc b/base/bashrc
index 177ef86..811a361 100755
--- a/base/bashrc
+++ b/base/bashrc
@@ -3,12 +3,11 @@
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
-export DOTFILES_SHARED_LOADED=""
 # shellcheck source=scripts/shared.sh
 source "$DOTFILES/scripts/shared.sh"
 path_prepend "$DOTFILES/local/bin"
 
-x-load-configs
+$DOTFILES/local/bin/x-load-configs
 
 # Import ssh keys in keychain
 ssh-add -A 2>/dev/null
diff --git a/base/zshrc b/base/zshrc
index fc8c282..a47fdc7 100755
--- a/base/zshrc
+++ b/base/zshrc
@@ -9,7 +9,7 @@ path_prepend "$DOTFILES/local/bin"
 
 export COMPLETION_WAITING_DOTS=true
 
-x-load-configs
+$DOTFILES/local/bin/x-load-configs
 
 export ZSH_CUSTOM_COMPLETION_PATH="$XDG_CONFIG_HOME/zsh/completion"
 x-dc "$ZSH_CUSTOM_COMPLETION_PATH"
@@ -51,13 +51,6 @@ antigen bundle jreese/zsh-titles
 antigen bundle unixorn/autoupdate-antigen.zshplugin
 antigen bundle zsh-users/zsh-completions
 
-# prettier history search
-antigen bundle zsh-history-substring-search
-bindkey "${terminfo[kcuu1]}" history-substring-search-up
-bindkey "${terminfo[kcud1]}" history-substring-search-down
-bindkey -M vicmd 'k' history-substring-search-up
-bindkey -M vicmd 'j' history-substring-search-down
-
 # these should be available if there's need
 have brew && antigen bundle brew
 have php && antigen bundle php
diff --git a/local/bin/x-load-configs b/local/bin/x-load-configs
index 8c74a7c..9eea63e 100755
--- a/local/bin/x-load-configs
+++ b/local/bin/x-load-configs
@@ -5,19 +5,27 @@
 : "${DOTFILES:=$HOME/.dotfiles}"
 source "$DOTFILES/scripts/shared.sh"
 
+CONFIG_PATH="$DOTFILES/config"
+
 # Load the shell dotfiles, and then some:
-for FILENAME in $DOTFILES/config/{exports,alias,functions}; do
-  HOST="$(hostname -s)"
-  # global (exports|alias|functions) FILENAME for all hosts
-  # shellcheck source=../config/exports
-  [ -r "$FILENAME" ] && source "$FILENAME"
-  # global secret FILENAME, git ignored
-  # shellcheck source=../config/exports-secret
-  [ -r "$FILENAME-secret" ] && source "$FILENAME-secret"
-  # host specific (exports|alias|functions) FILENAME
-  # shellcheck source=../config/exports
-  [ -r "$FILENAME-$HOST" ] && source "$FILENAME-$HOST"
-  # host specific (exports|alias|functions) FILENAME, git ignored
-  # shellcheck source=../config/exports
-  [ -r "$FILENAME-$HOST-secret" ] && source "$FILENAME-$HOST-secret"
-done
+function load()
+{
+  for FILE in $CONFIG_PATH/{exports,alias,functions}; do
+    FILENAME="$FILE"
+    HOST="$(hostname -s)"
+    # global (exports|alias|functions) FILENAME for all hosts
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME" ] && source "$FILENAME"
+    # global secret FILENAME, git ignored
+    # shellcheck source=../config/exports-secret
+    [ -r "$FILENAME-secret" ] && source "$FILENAME-secret"
+    # host specific (exports|alias|functions) FILENAME
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME-$HOST" ] && source "$FILENAME-$HOST"
+    # host specific (exports|alias|functions) FILENAME, git ignored
+    # shellcheck source=../config/exports
+    [ -r "$FILENAME-$HOST-secret" ] && source "$FILENAME-$HOST-secret"
+  done
+}
+
+load
diff --git a/scripts/install-cargo-packages.sh b/scripts/install-cargo-packages.sh
index d1641dd..11daa28 100755
--- a/scripts/install-cargo-packages.sh
+++ b/scripts/install-cargo-packages.sh
@@ -14,6 +14,8 @@ msg "Starting to install rust/cargo packages"
 source "$CARGO_HOME/env"
 
 packages=(
+  # starship.rs
+  "starship"
   # An incremental parsing system for programming tools
   "tree-sitter-cli"
   # a subprocess caching utility
diff --git a/scripts/install-go-packages.sh b/scripts/install-go-packages.sh
index a8c51d5..9b6b47b 100755
--- a/scripts/install-go-packages.sh
+++ b/scripts/install-go-packages.sh
@@ -27,6 +27,8 @@ packages=(
   github.com/charmbracelet/glow@latest
   # Static checker for GitHub Actions workflow files
   github.com/rhysd/actionlint/cmd/actionlint@latest
+  # simple terminal UI for git commands
+  github.com/jesseduffield/lazygit@latest
 )
 
 for pkg in "${packages[@]}"; do