diff --git a/.config/mpd/.gitignore b/.config/mpd/.gitignore index ed06d84..f1175b4 100644 --- a/.config/mpd/.gitignore +++ b/.config/mpd/.gitignore @@ -2,3 +2,4 @@ sticker.sql database playlists/ mpd.conf +pid diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 1a1b68c..81a3a28 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,42 +1,43 @@ { - "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "alpha-nvim": { "branch": "main", "commit": "2b3cbcdd980cae1e022409289245053f62fb50f6" }, - "avante.nvim": { "branch": "main", "commit": "44db8eba870f6c123da5efa70384b2889f3e3495" }, + "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, + "alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" }, + "avante.nvim": { "branch": "main", "commit": "ca95e0386433da2077184719886fa658257261a3" }, "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, - "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, - "copilot.lua": { "branch": "master", "commit": "304fc5f2dadb5067ed26c60fa69fb7ba8a57eaf3" }, + "conform.nvim": { "branch": "master", "commit": "cde4da5c1083d3527776fee69536107d98dae6c9" }, + "copilot-lsp": { "branch": "main", "commit": "884034b23c3716d55b417984ad092dc2b011115b" }, + "copilot.lua": { "branch": "master", "commit": "5bde2cfe01f049f522eeb8b52c5c723407db8bdf" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, - "fzf-lua": { "branch": "main", "commit": "2388dcd61731ae158bf7dad2ae0419291837e557" }, - "gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" }, - "img-clip.nvim": { "branch": "main", "commit": "f33f3af9ba50f99d70f8fcb1a8575750ada4ea4a" }, + "fzf-lua": { "branch": "main", "commit": "9fa87eab38e74763d0a86475a62a14e95e901427" }, + "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" }, + "img-clip.nvim": { "branch": "main", "commit": "e7e29f0d07110405adecd576b602306a7edd507a" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lsp-progress.nvim": { "branch": "main", "commit": "ae52979ad412371ea6dc39ff70c8dfc681fb42b8" }, "lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" }, - "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a1067cf84b4ff81b66d2bf4d01f4cbdb5de40bd0" }, - "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, + "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "b1d9a914b02ba5660f1e272a03314b31d4576fe2" }, + "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" }, "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" }, - "nvim-dap-python": { "branch": "master", "commit": "bfe572e4458e0ac876b9539a1e9f301c72db8ea0" }, - "nvim-lint": { "branch": "master", "commit": "0864f81c681e15d9bdc1156fe3a17bd07db5a3ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "aafecf5b8bc0a768f1a97e3a6d5441e64dee79f9" }, + "nvim-dap": { "branch": "master", "commit": "b38f7d30366d9169d0a623c4c85fbcf99d8d58bb" }, + "nvim-dap-python": { "branch": "master", "commit": "64652d1ae1db80870d9aac7132d76e37acd86a26" }, + "nvim-lint": { "branch": "master", "commit": "2536f1b18ea389e6b078b3a47a5e273c74a46a34" }, + "nvim-lspconfig": { "branch": "master", "commit": "95fe3c170753238d3ca4f760e79a991400677abc" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, - "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" }, + "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, + "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" }, "org-bullets.nvim": { "branch": "main", "commit": "21437cfa99c70f2c18977bffd423f912a7b832ea" }, "org-roam.nvim": { "branch": "main", "commit": "cf00a0b3797ee3370c2ca2bdedbc04b2f5309a1e" }, - "orgmode": { "branch": "master", "commit": "eb61f39ddc65e577aee1ae121596cae82e0316e6" }, - "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, + "orgmode": { "branch": "master", "commit": "b7bcb90ef446a3e846ac7e0a84391fd737e9b793" }, + "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "render-markdown.nvim": { "branch": "main", "commit": "9ab9dade85d8c7d411cc89b592028da3d1b7955a" }, - "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, - "sniprun": { "branch": "master", "commit": "f65bdf6f6ab47511bce67885cae7e3bb2e88cd55" }, + "render-markdown.nvim": { "branch": "main", "commit": "f58c05f349d6e7650f4b40b0df1514400f0c10de" }, + "rustaceanvim": { "branch": "master", "commit": "88575b98bb9937fb9983ddec5e532b67e75ce677" }, + "sniprun": { "branch": "master", "commit": "94ca2a7ff33f9dbe9bef093a2efb2aa12ad64aeb" }, "statuscol.nvim": { "branch": "main", "commit": "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "venv-selector.nvim": { "branch": "main", "commit": "2b49d1f8b8fcf5cfbd0913136f48f118225cca5d" }, - "which-key.nvim": { "branch": "main", "commit": "904308e6885bbb7b60714c80ab3daf0c071c1492" } + "venv-selector.nvim": { "branch": "main", "commit": "1ef6564d0bd0d9c4194711cfb696357a6119abd7" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/.config/nvim/lua/plugins/avante-nvim.lua b/.config/nvim/lua/plugins/avante-nvim.lua index f83a19d..d590551 100644 --- a/.config/nvim/lua/plugins/avante-nvim.lua +++ b/.config/nvim/lua/plugins/avante-nvim.lua @@ -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", diff --git a/.config/nvim/lua/plugins/lsp/copilot-lsp.lua b/.config/nvim/lua/plugins/lsp/copilot-lsp.lua new file mode 100644 index 0000000..674698a --- /dev/null +++ b/.config/nvim/lua/plugins/lsp/copilot-lsp.lua @@ -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", "", 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 `` in normal mode + return "" + end + end, { desc = "Accept Copilot NES suggestion", expr = true }) + end, +} diff --git a/.config/nvim/lua/plugins/lsp/lspsaga.lua b/.config/nvim/lua/plugins/lsp/lspsaga.lua index ac94d2d..b809f30 100644 --- a/.config/nvim/lua/plugins/lsp/lspsaga.lua +++ b/.config/nvim/lua/plugins/lsp/lspsaga.lua @@ -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", diff --git a/.config/nvim/lua/plugins/lsp/nvim-lspconfig.lua b/.config/nvim/lua/plugins/lsp/nvim-lspconfig.lua index 0e9b7b0..4518500 100644 --- a/.config/nvim/lua/plugins/lsp/nvim-lspconfig.lua +++ b/.config/nvim/lua/plugins/lsp/nvim-lspconfig.lua @@ -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 = { diff --git a/.config/nvim/lua/plugins/mason-lspconfig.lua b/.config/nvim/lua/plugins/mason-lspconfig.lua index d40d3f2..1ea8a33 100644 --- a/.config/nvim/lua/plugins/mason-lspconfig.lua +++ b/.config/nvim/lua/plugins/mason-lspconfig.lua @@ -1,5 +1,7 @@ return { "williamboman/mason-lspconfig.nvim", - dependencies = "williamboman/mason.nvim", - lazy = true, + dependencies = { + { "mason-org/mason.nvim", opts = {} }, + "neovim/nvim-lspconfig", + }, } diff --git a/.config/nvim/lua/plugins/rustaceanvim.lua b/.config/nvim/lua/plugins/rustaceanvim.lua index cbce793..34b1ae2 100644 --- a/.config/nvim/lua/plugins/rustaceanvim.lua +++ b/.config/nvim/lua/plugins/rustaceanvim.lua @@ -1,5 +1,5 @@ return { "mrcjkb/rustaceanvim", - version = "^5", -- Recommended + version = "^6", -- Recommended lazy = false, -- This plugin is already lazy } diff --git a/.config/nvim/lua/plugins/venv-selector.lua b/.config/nvim/lua/plugins/venv-selector.lua index 7e7baad..ee9e14b 100644 --- a/.config/nvim/lua/plugins/venv-selector.lua +++ b/.config/nvim/lua/plugins/venv-selector.lua @@ -2,13 +2,22 @@ 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 = { @@ -16,6 +25,9 @@ return { }, 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. }, }