Skip to content

Commit f855935

Browse files
authored
Update nvim plugins rustaceanvim and venv-selector (#86)
* Update nvim plugins rustaceanvim and venv-selector * Update fszf-lua, mason and nvim-lspconfig
1 parent 1670666 commit f855935

File tree

9 files changed

+81
-36
lines changed

9 files changed

+81
-36
lines changed

.config/mpd/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ sticker.sql
22
database
33
playlists/
44
mpd.conf
5+
pid

.config/nvim/lazy-lock.json

Lines changed: 27 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.config/nvim/lua/plugins/avante-nvim.lua

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,13 @@ return {
3838
"nvim-telescope/telescope.nvim",
3939
"ibhagwan/fzf-lua",
4040
"nvim-tree/nvim-web-devicons",
41-
"zbirenbaum/copilot.lua",
41+
{
42+
"zbirenbaum/copilot.lua",
43+
requires = { "copilotlsp-nvim/copilot-lsp" },
44+
config = function()
45+
require("copilot").setup({})
46+
end,
47+
},
4248
{
4349
-- support for image pasting
4450
"HakonHarnes/img-clip.nvim",
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
return {
2+
"copilotlsp-nvim/copilot-lsp",
3+
init = function()
4+
vim.g.copilot_nes_debounce = 500
5+
vim.lsp.enable("copilot_ls")
6+
vim.keymap.set("n", "<tab>", function()
7+
local bufnr = vim.api.nvim_get_current_buf()
8+
local state = vim.b[bufnr].nes_state
9+
if state then
10+
-- Try to jump to the start of the suggestion edit.
11+
-- If already at the start, then apply the pending suggestion and jump to the end of the edit.
12+
local _ = require("copilot-lsp.nes").walk_cursor_start_edit()
13+
or (
14+
require("copilot-lsp.nes").apply_pending_nes()
15+
and require("copilot-lsp.nes").walk_cursor_end_edit()
16+
)
17+
return nil
18+
else
19+
-- Resolving the terminal's inability to distinguish between `TAB` and `<C-i>` in normal mode
20+
return "<C-i>"
21+
end
22+
end, { desc = "Accept Copilot NES suggestion", expr = true })
23+
end,
24+
}

.config/nvim/lua/plugins/lsp/lspsaga.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
return {
22
"nvimdev/lspsaga.nvim",
33
event = "LspAttach",
4-
lazy = true,
54
config = function(_, opts)
6-
return require("lspsaga").setup(opts)
5+
require("lspsaga").setup(opts)
76
end,
87
dependencies = {
98
"nvim-treesitter/nvim-treesitter",

.config/nvim/lua/plugins/lsp/nvim-lspconfig.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ return {
99
config = function()
1010
local capabilities = require("blink.cmp").get_lsp_capabilities()
1111

12-
vim.lsp.config("*", { capabilities = capabilities })
12+
vim.lsp.config("*", { capabilities })
1313

1414
-- Servers with custom config
1515
local custom_servers = {
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
return {
22
"williamboman/mason-lspconfig.nvim",
3-
dependencies = "williamboman/mason.nvim",
4-
lazy = true,
3+
dependencies = {
4+
{ "mason-org/mason.nvim", opts = {} },
5+
"neovim/nvim-lspconfig",
6+
},
57
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
return {
22
"mrcjkb/rustaceanvim",
3-
version = "^5", -- Recommended
3+
version = "^6", -- Recommended
44
lazy = false, -- This plugin is already lazy
55
}

.config/nvim/lua/plugins/venv-selector.lua

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,32 @@ return {
22
"linux-cultist/venv-selector.nvim",
33
dependencies = {
44
"neovim/nvim-lspconfig",
5-
"mfussenegger/nvim-dap",
6-
"mfussenegger/nvim-dap-python", --optional
75
{
86
"nvim-telescope/telescope.nvim",
97
branch = "0.1.x",
108
dependencies = { "nvim-lua/plenary.nvim" },
119
},
10+
"mfussenegger/nvim-dap",
11+
{
12+
"mfussenegger/nvim-dap-python",
13+
build = {
14+
type = "builtin",
15+
copy_directories = {
16+
"doc",
17+
},
18+
},
19+
}, -- optional
20+
"ibhagwan/fzf-lua", -- optional
1221
},
1322
ft = "python", -- Load when opening Python files
1423
keys = {
1524
{ ",v", "<cmd>VenvSelect<cr>" }, -- Open picker on keymap
1625
},
1726
opts = { -- this can be an empty lua table - just showing below for clarity.
1827
search = {}, -- if you add your own searches, they go here.
19-
options = {}, -- if you add plugin options, they go here.
28+
options = {
29+
-- debug = true,
30+
-- notify_user_on_venv_activation = true,
31+
}, -- if you add plugin options, they go here.
2032
},
2133
}

0 commit comments

Comments
 (0)