Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fish/conf.d/25-rbenv.fish
Original file line number Diff line number Diff line change
@@ -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

Expand Down
14 changes: 8 additions & 6 deletions fish/conf.d/50-asdf.fish
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion nvim/lua/plugins/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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" } },
}