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
1 change: 1 addition & 0 deletions .config/mpd/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ sticker.sql
database
playlists/
mpd.conf
pid
53 changes: 27 additions & 26 deletions .config/nvim/lazy-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion .config/nvim/lua/plugins/avante-nvim.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@ return {
"nvim-telescope/telescope.nvim",
"ibhagwan/fzf-lua",
"nvim-tree/nvim-web-devicons",
"zbirenbaum/copilot.lua",
{
"zbirenbaum/copilot.lua",
requires = { "copilotlsp-nvim/copilot-lsp" },
config = function()
require("copilot").setup({})
end,
},
{
-- support for image pasting
"HakonHarnes/img-clip.nvim",
Expand Down
24 changes: 24 additions & 0 deletions .config/nvim/lua/plugins/lsp/copilot-lsp.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
return {
"copilotlsp-nvim/copilot-lsp",
init = function()
vim.g.copilot_nes_debounce = 500
vim.lsp.enable("copilot_ls")
vim.keymap.set("n", "<tab>", function()
local bufnr = vim.api.nvim_get_current_buf()
local state = vim.b[bufnr].nes_state
if state then
-- Try to jump to the start of the suggestion edit.
-- If already at the start, then apply the pending suggestion and jump to the end of the edit.
local _ = require("copilot-lsp.nes").walk_cursor_start_edit()
or (
require("copilot-lsp.nes").apply_pending_nes()
and require("copilot-lsp.nes").walk_cursor_end_edit()
)
return nil
else
-- Resolving the terminal's inability to distinguish between `TAB` and `<C-i>` in normal mode
return "<C-i>"
end
end, { desc = "Accept Copilot NES suggestion", expr = true })
end,
}
3 changes: 1 addition & 2 deletions .config/nvim/lua/plugins/lsp/lspsaga.lua
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
return {
"nvimdev/lspsaga.nvim",
event = "LspAttach",
lazy = true,
config = function(_, opts)
return require("lspsaga").setup(opts)
require("lspsaga").setup(opts)
end,
dependencies = {
"nvim-treesitter/nvim-treesitter",
Expand Down
2 changes: 1 addition & 1 deletion .config/nvim/lua/plugins/lsp/nvim-lspconfig.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ return {
config = function()
local capabilities = require("blink.cmp").get_lsp_capabilities()

vim.lsp.config("*", { capabilities = capabilities })
vim.lsp.config("*", { capabilities })

-- Servers with custom config
local custom_servers = {
Expand Down
6 changes: 4 additions & 2 deletions .config/nvim/lua/plugins/mason-lspconfig.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
return {
"williamboman/mason-lspconfig.nvim",
dependencies = "williamboman/mason.nvim",
lazy = true,
dependencies = {
{ "mason-org/mason.nvim", opts = {} },
"neovim/nvim-lspconfig",
},
}
2 changes: 1 addition & 1 deletion .config/nvim/lua/plugins/rustaceanvim.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
return {
"mrcjkb/rustaceanvim",
version = "^5", -- Recommended
version = "^6", -- Recommended
lazy = false, -- This plugin is already lazy
}
18 changes: 15 additions & 3 deletions .config/nvim/lua/plugins/venv-selector.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,32 @@ return {
"linux-cultist/venv-selector.nvim",
dependencies = {
"neovim/nvim-lspconfig",
"mfussenegger/nvim-dap",
"mfussenegger/nvim-dap-python", --optional
{
"nvim-telescope/telescope.nvim",
branch = "0.1.x",
dependencies = { "nvim-lua/plenary.nvim" },
},
"mfussenegger/nvim-dap",
{
"mfussenegger/nvim-dap-python",
build = {
type = "builtin",
copy_directories = {
"doc",
},
},
}, -- optional
"ibhagwan/fzf-lua", -- optional
},
ft = "python", -- Load when opening Python files
keys = {
{ ",v", "<cmd>VenvSelect<cr>" }, -- Open picker on keymap
},
opts = { -- this can be an empty lua table - just showing below for clarity.
search = {}, -- if you add your own searches, they go here.
options = {}, -- if you add plugin options, they go here.
options = {
-- debug = true,
-- notify_user_on_venv_activation = true,
}, -- if you add plugin options, they go here.
},
}