From bf43ddb8e421cfac96d82033a5c9904911774b4c Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Wed, 21 Feb 2024 13:55:22 +0100
Subject: [PATCH] Move shell sourcing up

---
 .void.bashrc | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.void.bashrc b/.void.bashrc
index 20fe314..495ccb7 100644
--- a/.void.bashrc
+++ b/.void.bashrc
@@ -27,7 +27,20 @@
 
 # set PS1 from file
 # USE ONLY AFTER GIT PROMPT
-[[ -r ~/.ps1 ]] && . ~/.ps1
+[[ -r ~/.ps1 ]] &&\
+    source ~/.ps1
+
+#################################
+# Optional source files
+
+# BEGIN_KITTY_SHELL_INTEGRATION
+[[ -n "$KITTY_INSTALLATION_DIR" ]] &&\
+    [[ -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash" ]] &&\
+    source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"
+# END_KITTY_SHELL_INTEGRATION
+
+# Google CLI
+[[ -r ~/.googlerc ]] && source ~/.googlerc
 
 #################################
 # don't put duplicate lines or lines starting with space in the history.
@@ -58,6 +71,3 @@ command -v starship &>/dev/null && eval "$(starship init bash)"
 export XBPS_DISTDIR="$HOME/git/void-packages"
 export SVDIR="$HOME/sv"
 
-# BEGIN_KITTY_SHELL_INTEGRATION
-if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
-# END_KITTY_SHELL_INTEGRATION