Skip to content

Commit c7a0860

Browse files
authored
Merge pull request #254 from djensenius/only-mise-if-mise
Only mise if mise / load copilot on read
2 parents b4bcd4a + 8495619 commit c7a0860

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

fish/conf.d/25-rbenv.fish

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# rbenv only outside Codespaces
2-
if not test -d /workspaces
1+
# rbenv only outside Codespaces and only if mise is not installed
2+
if not test -d /workspaces; and not command -q mise
33
status is-interactive; and command -q rbenv; and rbenv init - fish | source
44
end
55

fish/conf.d/50-asdf.fish

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
# asdf completions and Golang plugin env
2-
if test -d /home/linuxbrew/.linuxbrew/opt/asdf
3-
source /home/linuxbrew/.linuxbrew/opt/asdf/share/fish/vendor_completions.d/asdf.fish
4-
end
1+
# asdf completions and Golang plugin env (only if mise is not installed)
2+
if not command -q mise
3+
if test -d /home/linuxbrew/.linuxbrew/opt/asdf
4+
source /home/linuxbrew/.linuxbrew/opt/asdf/share/fish/vendor_completions.d/asdf.fish
5+
end
56

6-
if test -d ~/.asdf/plugins/golang
7-
source ~/.asdf/plugins/golang/set-env.fish
7+
if test -d ~/.asdf/plugins/golang
8+
source ~/.asdf/plugins/golang/set-env.fish
9+
end
810
end

nvim/lua/plugins/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ return {
33
{ "tpope/vim-endwise", event = { "BufReadPost", "BufNewFile" } },
44
{ "tpope/vim-repeat", event = { "BufReadPost", "BufNewFile" } },
55
{ "kosayoda/nvim-lightbulb", event = { "BufReadPost", "BufNewFile" } },
6-
{ "github/copilot.vim", event = { "LSPAttach" } },
6+
{ "github/copilot.vim", event = { "BufReadPost", "BufNewFile" } },
77
{ "lukoshkin/trailing-whitespace", event = { "BufReadPost", "BufNewFile" } },
88
}

0 commit comments

Comments
 (0)