aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore9
-rw-r--r--fish/config.fish9
-rw-r--r--fish/fish_plugins3
-rw-r--r--fish/fish_variables6
-rw-r--r--fish/functions/bat.fish2
-rw-r--r--fish/functions/git_aliases.fish1
6 files changed, 20 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 07eb676..6927840 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,11 @@ librewolf
helix/runtime
-tmux/plugins/*
+tmux/plugins/
+
+fish/fish_variables
+fish/conf.d
+fish/functions/_*
+fish/functions/fzf_*
+fish/functions/fisher*
+fish/completions
diff --git a/fish/config.fish b/fish/config.fish
index 9424121..95088d2 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -65,18 +65,15 @@ source /opt/asdf-vm/asdf.fish
abbr -a hx helix
abbr -a pare "paru -Rcs"
-
-abbr -a gs "git status"
-abbr -a ga "git add"
-abbr -a gc "git commit"
-abbr -a gl "git log --oneline"
abbr -a man /usr/bin/batman
git_aliases
docker_aliases
+fzf_configure_bindings --directory=\ct --variables= --git_log=\el --git_status=\e\cs --history=\cr --processes=\e\cp
+
set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME
-set -gx PATH $HOME/.cabal/bin $PATH /home/bombom/.ghcup/bin
+fish_add_path $HOME/.cabal/bin $HOME/.ghcup/bin
if test (tty) = /dev/tty1
dbus-run-session river
diff --git a/fish/fish_plugins b/fish/fish_plugins
index 3db7d2c..02d2479 100644
--- a/fish/fish_plugins
+++ b/fish/fish_plugins
@@ -1,5 +1,4 @@
jorgebucaran/fisher
-edc/bass
-jethrokuan/fzf
franciscolourenco/done
jorgebucaran/autopair.fish
+patrickf1/fzf.fish
diff --git a/fish/fish_variables b/fish/fish_variables
index 9108f74..6013ecf 100644
--- a/fish/fish_variables
+++ b/fish/fish_variables
@@ -13,6 +13,12 @@ SETUVAR _fish_abbr_gl:git\x20log\x20\x2d\x2doneline
SETUVAR _fish_abbr_gs:git\x20status
SETUVAR _fish_abbr_hx:helix
SETUVAR _fish_abbr_pare:paru\x20\x2dRcs
+SETUVAR _fisher_franciscolourenco_2F_done_files:\x7e/\x2econfig/fish/conf\x2ed/done\x2efish
+SETUVAR _fisher_jorgebucaran_2F_autopair_2E_fish_files:\x7e/\x2econfig/fish/functions/_autopair_backspace\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_left\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_right\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_same\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_tab\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/autopair\x2efish
+SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish
+SETUVAR _fisher_patrickf1_2F_fzf_2E_fish_files:\x7e/\x2econfig/fish/functions/_fzf_configure_bindings_help\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_extract_var_info\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_changed_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_diff_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_file_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_directory\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_log\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_status\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_history\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_processes\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_variables\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_wrapper\x2efish\x1e\x7e/\x2econfig/fish/functions/fzf_configure_bindings\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fzf\x2efish\x1e\x7e/\x2econfig/fish/completions/fzf_configure_bindings\x2efish
+SETUVAR _fisher_plugins:jorgebucaran/fisher\x1efranciscolourenco/done\x1ejorgebucaran/autopair\x2efish\x1epatrickf1/fzf\x2efish
+SETUVAR _fisher_upgraded_to_4_4:\x1d
SETUVAR fish_color_autosuggestion:555
SETUVAR fish_color_cancel:\x2d\x2dreverse
SETUVAR fish_color_command:blue
diff --git a/fish/functions/bat.fish b/fish/functions/bat.fish
index 4102d0e..b3d0c20 100644
--- a/fish/functions/bat.fish
+++ b/fish/functions/bat.fish
@@ -1,3 +1,3 @@
function bat
- /usr/bin/bat --style header,rule,numbers --force-colorization $argv
+ /usr/bin/bat --style header,rule,numbers $argv
end
diff --git a/fish/functions/git_aliases.fish b/fish/functions/git_aliases.fish
index 6c205b3..c3b6f79 100644
--- a/fish/functions/git_aliases.fish
+++ b/fish/functions/git_aliases.fish
@@ -67,6 +67,7 @@ function git_aliases
abbr -a gdw 'git diff --word-diff'
abbr -a gf 'git fetch'
+ abbr -a gfa 'git fetch --all'
abbr -a gfo 'git fetch origin'
abbr -a gfg 'git ls-files | grep'