diff --git a/coc-settings.json b/coc-settings.json index 0e891f7..c7766a0 100644 --- a/coc-settings.json +++ b/coc-settings.json @@ -19,6 +19,10 @@ "coc-sh", "coc-go" ], + "pyright.enable": true, + "python.analysis.autoImportCompletions": true, + "python.analysus.autoSearchPaths": true, + "python.analysis.diagnosticMode": "workspace", "languageserver": { "zig": { "command": "zls", diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 4e49c9e..a391a68 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -106,13 +106,7 @@ vim.keymap.set("n", "", ":nohlsearch", { desc = "Clear Search Highlight" vim.keymap.set("n", "", ":UndotreeToggle", { desc = "Undo Tree Toggle"}) vim.keymap.set("n", "", ":Ranger", { desc = "Ranger"}) vim.keymap.set("n", "", ":RangerNewTab", { desc = "Ranger New Tab"}) --- vim.keymap.set("n", "", ":q", { desc = "Quit"}) --- vim.keymap.set("n", "", ":bd", { desc = "Close Buffer"}) --- vim.keymap.set("n", "", ":tabnew", { desc = "New Tab"}) --- vim.keymap.set("n", "", ":tabclose", { desc = "Close Tab"}) --- vim.keymap.set("n", "", ":tabnext", { desc = "Next Tab"}) -vim.keymap.set("n", "", ":Telescope live_grep", { desc = "Live Grep"}) --- vim.keymap.set("n", "", ":b#", { desc = "Last Buffer"}) +vim.keymap.set("n", "", ":Telescope live_grep", { desc = "live grep"}) vim.keymap.set("n", "", ":setlocal spell! spelllang=en_us", { desc = "Toggle Spell Check"}) vim.keymap.set("n", "", ":setlocal wrap!", { desc = "Toggle Line Wrap"}) @@ -136,3 +130,19 @@ vim.api.nvim_create_autocmd("FileType", { }) end, }) + +-- COC Keybindings +function ShowDocumentation() + if CocAction("hasProvier", "hover") then + CocActionAsync("doHover") + else + vim.cmd("h " .. vim.bo.filetype) + end +end + +vim.keymap.set( "n", "K", ":call ShowDocumentation()", { noremap = true, silent = true, desc = "Show Documentation" }) +vim.keymap.set( "n", "l", "", {desc = "LSP" }) +vim.keymap.set( "n", "lc", "", {desc = "Completions" }) +vim.keymap.set( "n", "lch", "CocCommand document.toggleInlayHint", {desc = "Toggle Inline Hints" }) +vim.keymap.set( "n", "lcs", "CocOutline", {desc = "Show Symbol Outline" }) +vim.keymap.set( "n", "lcl", "CocCommand document.toggleCodeLens", {desc = "Show Code Lens" }) diff --git a/lua/options.lua b/lua/options.lua index 8412a31..96bc697 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -12,7 +12,7 @@ vim.o.wildmode = "longest:full,full" vim.o.wildoptions = "pum" vim.g.mapleader = " " vim.o.termguicolors = true -vim.o.winborder = "shadow" +vim.o.winborder = "rounded" vim.o.clipboard = "unnamedplus" vim.o.completeopt = "menuone" -- vim.o.completeopt = "menuone,noinsert,noselect" diff --git a/lua/plugins.lua b/lua/plugins.lua index b74d30c..a9b5cc0 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -19,6 +19,7 @@ vim.pack.add({ { src = "https://github.com/L3MON4D3/LuaSnip" }, { src = "https://github.com/neovim/nvim-lspconfig" }, { src = "https://github.com/neoclide/coc.nvim" }, + { src = "https://github.com/fannheyward/coc-pyright" }, -- { src = "https://github.com/hrsh7th/nvim-cmp" }, -- { src = "https://github.com/hrsh7th/cmp-nvim-lsp" }, -- { src = "https://github.com/hrsh7th/cmp-buffer" },