Fix Fish shell configuration

- Remove loading asdf env variables
- Add loading Homebrew
- Move Yazi function to config.fish
- Fix Go binary path
This commit is contained in:
Fabio Scotto di Santolo
2024-07-24 09:12:14 +02:00
parent ac9881b7f8
commit 543a9c8241
5 changed files with 43 additions and 42 deletions

View File

@@ -1 +0,0 @@
source ~/.asdf/asdf.fish

View File

@@ -0,0 +1 @@
eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"

View File

@@ -1,14 +1,14 @@
## Set values ## Set values
# Hide welcome message & ensure we are reporting fish as shell # Hide welcome message & ensure we are reporting fish as shell
set fish_greeting set fish_greeting
set VIRTUAL_ENV_DISABLE_PROMPT "1" set VIRTUAL_ENV_DISABLE_PROMPT 1
set -xU MANPAGER "sh -c 'col -bx | bat -l man -p'" set -xU MANPAGER "sh -c 'col -bx | bat -l man -p'"
set -xU MANROFFOPT "-c" set -xU MANROFFOPT -c
set -x SHELL /usr/bin/fish set -x SHELL /usr/bin/fish
## Export variable need for qt-theme ## Export variable need for qt-theme
if type "qtile" >> /dev/null 2>&1 if type qtile >>/dev/null 2>&1
set -x QT_QPA_PLATFORMTHEME "qt5ct" set -x QT_QPA_PLATFORMTHEME qt5ct
end end
# Set settings for https://github.com/franciscolourenco/done # Set settings for https://github.com/franciscolourenco/done
@@ -32,7 +32,7 @@ end
## Starship prompt ## Starship prompt
if status --is-interactive if status --is-interactive
set -l starship_path (which starship) set -l starship_path (which starship)
source ("$starship_path" init fish --print-full-init | psub) source ($starship_path init fish --print-full-init | psub)
end end
## Advanced command-not-found hook ## Advanced command-not-found hook
@@ -52,7 +52,8 @@ end
function __history_previous_command function __history_previous_command
switch (commandline -t) switch (commandline -t)
case "!" case "!"
commandline -t $history[1]; commandline -f repaint commandline -t $history[1]
commandline -f repaint
case "*" case "*"
commandline -i ! commandline -i !
end end
@@ -68,7 +69,7 @@ function __history_previous_command_arguments
end end
end end
if [ "$fish_key_bindings" = fish_vi_key_bindings ]; if [ "$fish_key_bindings" = fish_vi_key_bindings ]
bind -Minsert ! __history_previous_command bind -Minsert ! __history_previous_command
bind -Minsert '$' __history_previous_command_arguments bind -Minsert '$' __history_previous_command_arguments
else else
@@ -116,6 +117,15 @@ function tmux-session --argument session_name
end end
end end
function yy
set tmp (mktemp -t "yazi-cwd.XXXXXX")
yazi $argv --cwd-file="$tmp"
if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
cd -- "$cwd"
end
rm -f -- "$tmp"
end
## Useful aliases ## Useful aliases
# Replace ls with eza # Replace ls with eza
@@ -150,9 +160,8 @@ alias tarnow 'tar -acf '
alias untar 'tar -zxvf ' alias untar 'tar -zxvf '
alias vdir 'vdir --color=auto' alias vdir 'vdir --color=auto'
alias wget 'wget -c ' alias wget 'wget -c '
alias vi 'nvim' alias vi nvim
alias stow 'stow --dotfiles -d ~/.dotfiles ' alias stow 'stow --dotfiles -d ~/.dotfiles '
# Get the error messages from journalctl # Get the error messages from journalctl
alias jctl 'journalctl -p 3 -xb' alias jctl 'journalctl -p 3 -xb'

View File

@@ -44,4 +44,4 @@ SETUVAR fish_pager_color_description:yellow\x1e\x2di
SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
SETUVAR fish_pager_color_selected_background:\x2dr SETUVAR fish_pager_color_selected_background:\x2dr
SETUVAR fish_user_paths:/var/home/fscotto/\x2elocal/share/go SETUVAR fish_user_paths:/home/fscotto/\x2elocal/share/go/bin

View File

@@ -1,8 +0,0 @@
function yy
set tmp (mktemp -t "yazi-cwd.XXXXXX")
yazi $argv --cwd-file="$tmp"
if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
cd -- "$cwd"
end
rm -f -- "$tmp"
end