lytedev/dotfiles
Archived
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Push

Browse source
This commit is contained in:
Daniel Flanagan 2023-07-12 11:30:38 -05:00
parent 95379f40e6
commit 20064853fa
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/bin/poll
View file

@ -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

35
common/fish/config.fish
View file

@ -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