diff --git a/sheldon.toml b/sheldon.toml index c131a27..af57878 100644 --- a/sheldon.toml +++ b/sheldon.toml @@ -86,10 +86,6 @@ apply = ["defer"] local = "~/.zsh/plugins" apply = ["defer"] -[plugins.thefuck] -local = "~/.zsh/plugins" -apply = ["defer"] - # This works best if it is placed last. [plugins.compinit] local = "~/.zsh/plugins" @@ -98,10 +94,6 @@ apply = ["defer"] # Plugins that are even more deferred # ----------------------------------- -[plugins.github-copilot] -local = "~/.zsh/plugins" -apply = ["defer-more"] - [plugins.ngrok] local = "~/.zsh/plugins" apply = ["defer-more"] diff --git a/zsh/plugins/fnm.plugin.zsh b/zsh/plugins/fnm.plugin.zsh index da0daad..e93876a 100644 --- a/zsh/plugins/fnm.plugin.zsh +++ b/zsh/plugins/fnm.plugin.zsh @@ -2,5 +2,5 @@ # Setup Fast Node Manager if (( ${+commands[fnm]} )); then - eval "$(fnm env --use-on-cd)" + eval "$(fnm env --use-on-cd --shell zsh)" fi diff --git a/zsh/plugins/github-copilot.plugin.zsh b/zsh/plugins/github-copilot.plugin.zsh deleted file mode 100644 index 677ad77..0000000 --- a/zsh/plugins/github-copilot.plugin.zsh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env zsh - -# Setup GitHub Copilot -# first check we even have the genereic `gh` command -if (( ${+commands[gh]} )); then - # Now check we have the copilot plugin installed with `gh` - if gh extension list | rg copilot -c > /dev/null; then - eval "$(gh copilot alias -- zsh)" - fi -fi diff --git a/zsh/plugins/thefuck.plugin.zsh b/zsh/plugins/thefuck.plugin.zsh deleted file mode 100644 index ce9f8e0..0000000 --- a/zsh/plugins/thefuck.plugin.zsh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env zsh - -# Init the fuck -if (( ${+commands[thefuck]} )); then - eval "$(thefuck --alias)" -fi diff --git a/zshrc.zsh b/zshrc.zsh index c4c6bad..a1899df 100644 --- a/zshrc.zsh +++ b/zshrc.zsh @@ -142,8 +142,11 @@ zstyle ':vcs_info:git*' stagedstr '+' # but can be slow on large repos zstyle ':vcs_info:*:*' check-for-changes true -# Set the right prompt to the vcs_info message -RPROMPT='%F{8}${vcs_info_msg_0_}' +# First show the Loading indicator in the right prompt if shell plugins are still loading +RPROMPT='%F{8}$(if [[ -n $SHELL_LOADING ]]; then echo "Loading... "; fi)' + +# Then we can also show the git branch +RPROMPT+='${vcs_info_msg_0_}' # First set a dot that changes colour on success/fail or previous command PROMPT='%(?.%F{blue}⏺.%F{red}⏺)%f '