Последние изменения в конфигах

config/fish/config.fish

@@ -5,6 +5,7 @@ set -gx BROWSER /usr/bin/vivaldi
 set -gx TERMINAL kitty
 set -gx PAGER /usr/bin/bat
 set -gx GTK_THEME Colloid-Green-Dark-Compact-Gruvbox
+set -gx AUR_HELPER yay # fish
 
 
 #starship init fish | source
@@ -26,7 +27,10 @@ alias yy="yay --editmenu"
 alias pkginfo="pacman -Qq | fzf --preview 'pacman -Qil {} | bat -fpl yml' --layout=reverse --bind 'enter:execute(pacman -Qil {} | less)'"
 #alias cat="bat -p --theme gruvbox-dark"
 alias cat="bat"
-alias rm="trash-put"
+#alias rm="trash-put"
+alias rm="vx -f"
+alias vxs="vx -s"
+alias vxl="vx -l"
 #alias rm="trashy put"
 #alias rl="trashy list | fzf --multi | awk '{$1=$1;print}' | rev | cut -d ' ' -f1 | rev | xargs trashy restore --match=exact --force"
 #alias re="trashy empty --all"

config/fish/fish_variables

@@ -1,34 +1,7 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR EDITOR:nvim
-SETUVAR __fish_initialized:3800
-SETUVAR fish_color_autosuggestion:747369
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:99cc99
-SETUVAR fish_color_comment:ffcc66
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:cc99cc
-SETUVAR fish_color_error:f2777a
-SETUVAR fish_color_escape:66cccc
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_match:6699cc
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:6699cc
-SETUVAR fish_color_param:d3d0c8
-SETUVAR fish_color_quote:ffcc66
-SETUVAR fish_color_redirection:d3d0c8
-SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR __fish_initialized:4300
+SETUVAR _fisher_upgraded_to_4_4:\x1d
 SETUVAR fish_greeting:\x1d
 SETUVAR fish_key_bindings:fish_default_key_bindings
-SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow
-SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_pager_color_selected_background:\x2dr

config/fish/functions/fish_user_key_bindings.fish

@@ -1,3 +1,8 @@
 function fish_user_key_bindings
-	fzf_key_bindings
+    if functions -q fzf_key_bindings
+        fzf_key_bindings
+    else
+        source /usr/share/fish/vendor_functions.d/fzf_key_bindings.fish
+        fzf_key_bindings
+    end
 end