Skip to content

Commit

Permalink
[fish] Update fisher to 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Princesseuh committed Jan 15, 2021
1 parent 491d840 commit 45caf39
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 17 deletions.
2 changes: 1 addition & 1 deletion fish/conf.d/fisher.fish
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set -g fisher_path $HOME/.config/fish/fisher
set fish_function_path $fish_function_path[1] $fisher_path/functions $fish_function_path[2..-1]
set fish_complete_path $fish_complete_path[1] $fisher_path/completions $fish_complete_path[2..-1]

# Plugins need to be loaded last so we load them in config.fish
# Plugins need to be loaded last so we load them in config.fish
20 changes: 5 additions & 15 deletions fish/config.fish
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if status --is-interactive
cat ~/.cache/wal/sequences &
end

# Start Sway at login
if status is-login
if test -z "$DISPLAY" -a $XDG_VTNR = 1
Expand All @@ -24,19 +20,13 @@ set fish_pager_color_completion d1b9b9
set fish_pager_color_progress d1b9b9 --background='48425D'

if status --is-interactive
if not functions -q fisher
set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
curl https://git.io/fisher --create-dirs -sLo $XDG_CONFIG_HOME/fish/functions/fisher.fish
fish -c fisher
else
# Load Fisher plugins
for file in $fisher_path/conf.d/*.fish
builtin source $file 2> /dev/null
end
cat ~/.cache/wal/sequences &

# Load Fisher plugins
for file in $fisher_path/conf.d/*.fish
builtin source $file 2>/dev/null
end

# Load local config
source $HOME/.config/fish/local.fish

starship init fish | source
end
4 changes: 3 additions & 1 deletion fish/fishfile → fish/fish_plugins
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
jorgebucaran/fish-bax

This comment has been minimized.

Copy link
@jorgebucaran
patrickf3139/fzf-fish-integration

This comment has been minimized.

Copy link
@jorgebucaran

jorgebucaran Jan 19, 2021

This one is PatrickF1/fzf.fish now.

jorgebucaran/fisher
jethrokuan/z
laughedelic/pisces

This comment has been minimized.

Copy link
@jorgebucaran

jorgebucaran Jan 19, 2021

I shamelessly recommend my own jorgebucaran/autopair.fish instead. Here is why.

This comment has been minimized.

Copy link
@Princesseuh

Princesseuh Jan 19, 2021

Author Owner

I was actually in the process of using autopair instead of pisces before submitting the performance issue haha. I completely agree with your reasoning on why your project is better. Thanks for the comments

patrickf3139/fzf-fish-integration
IlanCosman/tide

0 comments on commit 45caf39

Please sign in to comment.