diff --git a/lua/lsp/config/pylsp.lua b/lua/lsp/config/pylsp.lua index a4c425b..9ca6660 100644 --- a/lua/lsp/config/pylsp.lua +++ b/lua/lsp/config/pylsp.lua @@ -6,18 +6,19 @@ return { dependencies = { "python3", }, - py_module_deps = { - "venv", - }, mason = { name = "python-lsp-server", post_install = { { command = "./venv/bin/pip", + -- command = "sh", args = { - "install", - "python-lsp-black", - "python-lsp-isort", + -- "install", + -- "python-lsp-black", + -- "python-lsp-isort", + "--version", + -- "-c", + -- "./venv/bin/pip --version", }, }, -- { diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index 701981f..a88ddd3 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -6,44 +6,47 @@ local function has_words_before() unpack = unpack or table.unpack local line, col = unpack(vim.api.nvim_win_get_cursor(0)) return col ~= 0 - and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1] - :sub(col, col) - :match(word_pattern) ~= nil + and vim.api + .nvim_buf_get_lines(0, line - 1, line, true)[1] + :sub(col, col) + :match(word_pattern) + ~= nil end local function has_words_after() unpack = unpack or table.unpack local line, col = unpack(vim.api.nvim_win_get_cursor(0)) return col ~= 0 - and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1] - :sub(col + 1, col + 1) - :match(word_pattern) ~= nil + and vim.api + .nvim_buf_get_lines(0, line - 1, line, true)[1] + :sub(col + 1, col + 1) + :match(word_pattern) + ~= nil end local function setup() - local module_name = "plugins.config.cmp" local utils = require("utils") local cmp = require("cmp") local luasnip = require("luasnip") - local lspkind = utils.try_require("lspkind", module_name) + local lspkind = utils.try_require("lspkind") local opt = { preselect = cmp.PreselectMode.None, - completion = { keyword_length = 0, }, + completion = { keyword_length = 0 }, snippet = { - expand = function (args) + expand = function(args) luasnip.lsp_expand(args.body) end, }, formatting = { - format = function (entry, vim_item) + format = function(entry, vim_item) if lspkind then vim_item = lspkind.cmp_format({ mode = "symbol", maxwidth = 50, ellipsis_char = "...", - before = function (_, item) - item.dup = 0 -- remove duplicates, see nvim-cmp #511 + before = function(_, item) + item.dup = 0 -- remove duplicates, see nvim-cmp #511 return item end, })(entry, vim_item) @@ -59,36 +62,36 @@ local function setup() [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Select, }), - [""] = function (fallback) + [""] = function(fallback) if cmp.visible() then - cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, }) + cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace }) else fallback() end end, [""] = cmp.mapping.complete(), - [""] = function (fallback) + [""] = function(fallback) if luasnip.expand_or_locally_jumpable() then luasnip.expand_or_jump() else fallback() end end, - [""] = function (fallback) + [""] = function(fallback) if luasnip.locally_jumpable(-1) then luasnip.jump(-1) else fallback() end end, - [""] = function (fallback) + [""] = function(fallback) if cmp.visible_docs() then cmp.scroll_docs(-4) else fallback() end end, - [""] = function (fallback) + [""] = function(fallback) if cmp.visible_docs() then cmp.scroll_docs(4) else @@ -97,47 +100,39 @@ local function setup() end, }, sources = { - { name = "nvim_lsp", }, + { name = "nvim_lsp" }, -- { name = "luasnip", }, - { name = "orgmode", }, - { name = "path", }, + { name = "orgmode" }, + { name = "path" }, }, } - utils.try_require("moonfly", module_name, function (_) + if utils.try_require("moonfly") then local winhighlight = { - winhighlight = - "Normal:NormalFloat,FloatBorder:FloatBorder,CursorLine:PmenuSel", + winhighlight = "Normal:NormalFloat,FloatBorder:FloatBorder,CursorLine:PmenuSel", } opt.window = { completion = cmp.config.window.bordered(winhighlight), documentation = cmp.config.window.bordered(winhighlight), } - end) + end cmp.setup(opt) - cmp.setup.cmdline( - "/", - { - mapping = cmp.mapping.preset.cmdline(), - sources = { { name = "buffer", }, }, - } - ) + cmp.setup.cmdline("/", { + mapping = cmp.mapping.preset.cmdline(), + sources = { { name = "buffer" } }, + }) - cmp.setup.cmdline( - ":", - { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources( - { { name = "path", }, }, - { { - name = "cmdline", - option = { ignore_cmds = { "Man", "!", }, }, - }, } - ), - } - ) + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ { name = "path" } }, { + { + name = "cmdline", + option = { ignore_cmds = { "Man", "!" } }, + }, + }), + }) end return setup