From 220ff632e9bea1233a2b4627e5ef759910628543 Mon Sep 17 00:00:00 2001 From: tastypawns Date: Tue, 18 Feb 2025 13:16:15 -0600 Subject: [PATCH] added pylsp servers & keymaps --- init.lua | 19 +++++++++++++------ remap.lua => lua/custom/plugins/remap.lua | 2 ++ 2 files changed, 15 insertions(+), 6 deletions(-) rename remap.lua => lua/custom/plugins/remap.lua (99%) diff --git a/init.lua b/init.lua index 0a479227..d9f0855b 100644 --- a/init.lua +++ b/init.lua @@ -157,8 +157,15 @@ vim.opt.cursorline = true -- Minimal number of screen lines to keep above and below the cursor. vim.opt.scrolloff = 10 +--turn off virtual lines ect. +vim.diagnostic.config { + virtual_text = false, + virtual_lines = true, + underline = false, +} + --pull in remaps -require 'remap' +--require 'remap' -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` @@ -600,7 +607,6 @@ require('lazy').setup({ -- clangd = {}, -- gopls = {}, pylsp = {}, - -- pyright = {}, -- rust_analyzer = {}, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- @@ -771,18 +777,19 @@ require('lazy').setup({ -- Accept ([y]es) the completion. -- This will auto-import if your LSP supports it. -- This will expand snippets if the LSP sent a snippet. - [''] = cmp.mapping.confirm { select = true }, + --[''] = cmp.mapping.confirm { select = true }, + [''] = cmp.mapping.confirm { select = true }, -- If you prefer more traditional completion keymaps, -- you can uncomment the following lines --[''] = cmp.mapping.confirm { select = true }, - --[''] = cmp.mapping.select_next_item(), + --[''] = cmp.mapping.confim(), --[''] = cmp.mapping.select_prev_item(), -- Manually trigger a completion from nvim-cmp. -- Generally you don't need this, because nvim-cmp will display -- completions whenever it has completion options available. - [''] = cmp.mapping.complete {}, + --[''] = cmp.mapping.complete {}, -- Think of as moving to the right of your snippet expansion. -- So if you have a snippet that's like: @@ -923,7 +930,7 @@ require('lazy').setup({ -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/remap.lua b/lua/custom/plugins/remap.lua similarity index 99% rename from remap.lua rename to lua/custom/plugins/remap.lua index dd1d92dd..51107afd 100644 --- a/remap.lua +++ b/lua/custom/plugins/remap.lua @@ -34,3 +34,5 @@ vim.keymap.set('n', 'o', '', { desc = 'Move focus to the upper --split window maps vim.keymap.set('n', 'xs', ':close', { desc = 'Close current window' }) vim.keymap.set('n', 's', ':vsplit', { desc = 'Split window vertically' }) + +return {}