diff --git a/dot_config/private_fish/config.fish b/dot_config/private_fish/config.fish index 6a230f6..7e889db 100644 --- a/dot_config/private_fish/config.fish +++ b/dot_config/private_fish/config.fish @@ -10,8 +10,13 @@ if status is-interactive if test -f ~/.config/fish/config.fish.local source ~/.config/fish/config.fish.local end + if test -f ~/.config/fish/config.local.fish + source ~/.config/fish/config.local.fish + end end +alias ls="lsd" + fish_add_path $HOME/.webman/bin set -gx EDITOR nvim diff --git a/dot_config/private_fish/dot_on_install.fish b/dot_config/private_fish/dot_on_install.fish index bf533ff..32f500f 100644 --- a/dot_config/private_fish/dot_on_install.fish +++ b/dot_config/private_fish/dot_on_install.fish @@ -1,11 +1,18 @@ -curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher - -fisher install IlanCosman/tide@v6 -fisher install PatrickF1/fzf.fish +# if fisher is not installed, install it +if not functions -q fisher + curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher +end +if functions -q fisher + fisher install IlanCosman/tide@v6 + fisher install PatrickF1/fzf.fish +end fish_add_path ~/.webman/bin/ -bash (curl https://raw.githubusercontent.com/atuinsh/atuin/main/install.sh | psub) -if type -q $atuin +# if atuin is not installed, install it +if not type -q atuin + bash (curl https://raw.githubusercontent.com/atuinsh/atuin/main/install.sh | psub) +end +if type -q atuin atuin import auto end