diff --git a/fish/conf.d/25-rbenv.fish b/fish/conf.d/25-rbenv.fish index 97418fb..421687e 100644 --- a/fish/conf.d/25-rbenv.fish +++ b/fish/conf.d/25-rbenv.fish @@ -1,5 +1,5 @@ -# rbenv only outside Codespaces -if not test -d /workspaces +# rbenv only outside Codespaces and only if mise is not installed +if not test -d /workspaces; and not command -q mise status is-interactive; and command -q rbenv; and rbenv init - fish | source end diff --git a/fish/conf.d/50-asdf.fish b/fish/conf.d/50-asdf.fish index e0af902..6bbb000 100644 --- a/fish/conf.d/50-asdf.fish +++ b/fish/conf.d/50-asdf.fish @@ -1,8 +1,10 @@ -# asdf completions and Golang plugin env -if test -d /home/linuxbrew/.linuxbrew/opt/asdf - source /home/linuxbrew/.linuxbrew/opt/asdf/share/fish/vendor_completions.d/asdf.fish -end +# asdf completions and Golang plugin env (only if mise is not installed) +if not command -q mise + if test -d /home/linuxbrew/.linuxbrew/opt/asdf + source /home/linuxbrew/.linuxbrew/opt/asdf/share/fish/vendor_completions.d/asdf.fish + end -if test -d ~/.asdf/plugins/golang - source ~/.asdf/plugins/golang/set-env.fish + if test -d ~/.asdf/plugins/golang + source ~/.asdf/plugins/golang/set-env.fish + end end diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua index f0fbdf8..958f022 100644 --- a/nvim/lua/plugins/init.lua +++ b/nvim/lua/plugins/init.lua @@ -3,6 +3,6 @@ return { { "tpope/vim-endwise", event = { "BufReadPost", "BufNewFile" } }, { "tpope/vim-repeat", event = { "BufReadPost", "BufNewFile" } }, { "kosayoda/nvim-lightbulb", event = { "BufReadPost", "BufNewFile" } }, - { "github/copilot.vim", event = { "LSPAttach" } }, + { "github/copilot.vim", event = { "BufReadPost", "BufNewFile" } }, { "lukoshkin/trailing-whitespace", event = { "BufReadPost", "BufNewFile" } }, }