diff --git a/fish/.config/fish/conf.d/asdf.fish b/fish/.config/fish/conf.d/asdf.fish deleted file mode 100644 index 941a839..0000000 --- a/fish/.config/fish/conf.d/asdf.fish +++ /dev/null @@ -1 +0,0 @@ -source ~/.asdf/asdf.fish diff --git a/fish/.config/fish/conf.d/homebrew.fish b/fish/.config/fish/conf.d/homebrew.fish new file mode 100644 index 0000000..d225275 --- /dev/null +++ b/fish/.config/fish/conf.d/homebrew.fish @@ -0,0 +1 @@ +eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index fb9d939..ddd7ff5 100755 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -1,14 +1,14 @@ ## Set values # Hide welcome message & ensure we are reporting fish as shell 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 MANROFFOPT "-c" +set -xU MANROFFOPT -c set -x SHELL /usr/bin/fish ## Export variable need for qt-theme -if type "qtile" >> /dev/null 2>&1 - set -x QT_QPA_PLATFORMTHEME "qt5ct" +if type qtile >>/dev/null 2>&1 + set -x QT_QPA_PLATFORMTHEME qt5ct end # Set settings for https://github.com/franciscolourenco/done @@ -19,7 +19,7 @@ set -U __done_notification_urgency_level low ## Environment setup # Apply .profile: use this to put fish compatible .profile stuff in if test -f ~/.fish_profile - source ~/.fish_profile + source ~/.fish_profile end # Add ~/.local/bin to PATH @@ -31,8 +31,8 @@ end ## Starship prompt if status --is-interactive - set -l starship_path (which starship) - source ("$starship_path" init fish --print-full-init | psub) + set -l starship_path (which starship) + source ($starship_path init fish --print-full-init | psub) end ## Advanced command-not-found hook @@ -50,30 +50,31 @@ end ## Functions # Functions needed for !! and !$ https://github.com/oh-my-fish/plugin-bang-bang function __history_previous_command - switch (commandline -t) - case "!" - commandline -t $history[1]; commandline -f repaint - case "*" - commandline -i ! - end + switch (commandline -t) + case "!" + commandline -t $history[1] + commandline -f repaint + case "*" + commandline -i ! + end end function __history_previous_command_arguments - switch (commandline -t) - case "!" - commandline -t "" - commandline -f history-token-search-backward - case "*" - commandline -i '$' - end + switch (commandline -t) + case "!" + commandline -t "" + commandline -f history-token-search-backward + case "*" + commandline -i '$' + end end -if [ "$fish_key_bindings" = fish_vi_key_bindings ]; - bind -Minsert ! __history_previous_command - bind -Minsert '$' __history_previous_command_arguments +if [ "$fish_key_bindings" = fish_vi_key_bindings ] + bind -Minsert ! __history_previous_command + bind -Minsert '$' __history_previous_command_arguments else - bind ! __history_previous_command - bind '$' __history_previous_command_arguments + bind ! __history_previous_command + bind '$' __history_previous_command_arguments end # Fish command history @@ -89,8 +90,8 @@ end function copy set count (count $argv | tr -d \n) if test "$count" = 2; and test -d "$argv[1]" - set from (echo $argv[1] | string trim --right --chars=/) - set to (echo $argv[2]) + set from (echo $argv[1] | string trim --right --chars=/) + set to (echo $argv[2]) command cp -r $from $to else command cp $argv @@ -116,12 +117,21 @@ function tmux-session --argument session_name 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 # Replace ls with eza alias ls 'eza --color=always --group-directories-first --icons' # preferred listing -alias la 'eza -a --color=always --group-directories-first --icons' # all files and dirs -alias ll 'eza -l --color=always --group-directories-first --icons' # long format +alias la 'eza -a --color=always --group-directories-first --icons' # all files and dirs +alias ll 'eza -l --color=always --group-directories-first --icons' # long format alias lt 'eza -aT --color=always --group-directories-first --icons' # tree listing alias l. 'eza -ald --color=always --group-directories-first --icons .*' # show only dotfiles @@ -142,7 +152,7 @@ alias grep 'ugrep --color=auto' alias egrep 'ugrep -E --color=auto' alias fgrep 'ugrep -F --color=auto' alias grubup 'sudo update-grub' -alias hw 'hwinfo --short' # Hardware Info +alias hw 'hwinfo --short' # Hardware Info alias ip 'ip -color' alias psmem 'ps auxf | sort -nr -k 4' alias psmem10 'ps auxf | sort -nr -k 4 | head -10' @@ -150,9 +160,8 @@ alias tarnow 'tar -acf ' alias untar 'tar -zxvf ' alias vdir 'vdir --color=auto' alias wget 'wget -c ' -alias vi 'nvim' +alias vi nvim alias stow 'stow --dotfiles -d ~/.dotfiles ' # Get the error messages from journalctl alias jctl 'journalctl -p 3 -xb' - diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables index cb310b5..3dcab06 100755 --- a/fish/.config/fish/fish_variables +++ b/fish/.config/fish/fish_variables @@ -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_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan 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 diff --git a/fish/.config/fish/functions/yazi.fish b/fish/.config/fish/functions/yazi.fish deleted file mode 100644 index 4f47c66..0000000 --- a/fish/.config/fish/functions/yazi.fish +++ /dev/null @@ -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