From 20064853fae9cfbff4e8b317854335b3ccb30573 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Wed, 12 Jul 2023 11:30:38 -0500
Subject: [PATCH] Push

---
 common/bin/poll         |  3 ++-
 common/fish/config.fish | 35 ++++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/common/bin/poll b/common/bin/poll
index ebbb069..63a7210 100755
--- a/common/bin/poll
+++ b/common/bin/poll
@@ -5,7 +5,8 @@ source ~/.config/fish/config.fish
 
 while true
 	clear
+	sleep 2 &
 	echo (tput setaf 0)(date) polled (tput setaf 4)"'"$argv"'"(tput setaf 7)
 	eval $argv
-	sleep 2
+	wait
 end
\ No newline at end of file
diff --git a/common/fish/config.fish b/common/fish/config.fish
index 7e3f827..a9cc563 100755
--- a/common/fish/config.fish
+++ b/common/fish/config.fish
@@ -8,13 +8,7 @@ for f in vars colors functions
 	source $FISH_PATH/$f.fish
 end
 
-status --is-interactive || exit
-
-for f in prompt key-bindings
-	source $FISH_PATH/$f.fish
-end
-
-if has_command rtx
+if has_command rtx && not set --query RTX_SHELL
 	rtx activate fish | source
 else if has_command brew && test -f (brew --prefix asdf)/libexec/asdf.fish
 	set --universal --export ASDF_DIR (brew --prefix asdf)
@@ -25,10 +19,6 @@ else if test -f /opt/asdf-vm/asdf.fish
 	source /opt/asdf-vm/asdf.fish
 end
 
-if test -f /usr/share/password-store/extensions/otp.bash
-	source $FISH_PATH/pass-otp-completions.fish
-end
-
 if test -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
 	set nix_profiles /nix/var/nix/profiles/default $HOME/.nix-profile
 	set --export --universal NIX_PROFILES "$nix_profiles"
@@ -47,27 +37,38 @@ if test -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
 	set --prepend --export --global fish_user_paths $HOME/.nix-profile/bin /nix/var/nix/profiles/default/bin
 end
 
+if has_command nnn
+	source $DOTFILES_PATH/common/nnn/config.fish
+end
+
+# everything after this is ONLY relevant to interactive shells
+status --is-interactive || exit
+
+for f in prompt key-bindings
+	source $FISH_PATH/$f.fish
+end
+
+if test -f /usr/share/password-store/extensions/otp.bash
+	source $FISH_PATH/pass-otp-completions.fish
+end
+
 if set -q KITTY_INSTALLATION_DIR
 	set --global KITTY_SHELL_INTEGRATION enabled
 	source "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish"
 	set --prepend fish_complete_path "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_completions.d"
 end
 
-if has_command nnn
-	source $DOTFILES_PATH/common/nnn/config.fish
-end
-
 test $PWD = $HOME && begin
 	cd $NICE_HOME || cd
 end
 
 # If we're running the shell interactively from inside Kitty, assume that we will be using Kitty's multiplexing features
 # Otherwise, assume we're in a context that is not capable of "native" multiplexing features and run everything inside Zellij
-if not set --query ZELLIJ && set --query FISH_START_ZELLIJ && status is-interactive
+if not set --query ZELLIJ && set --query FISH_START_ZELLIJ
 	# simulate auto attach
   zellij attach -c
 	# simulate auto kill
   kill $fish_pid
-else if not set --query TMUX && set --query FISH_START_TMUX && status is-interactive
+else if not set --query TMUX && set --query FISH_START_TMUX
 	tmux att -t default || tmux new -s default
 end
\ No newline at end of file