Merge branch 'master' of https://github.com/mightypanders/dotfiles

nvim/lua/cmp_config.lua

@@ -2,64 +2,83 @@ local cmp = require("cmp")
 local luasnip = require("luasnip")
 
 local has_words_before = function()
-	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("%s") == nil
+  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("%s") == nil
 end
 cmp.setup({
-    snippet = {
-      expand = function(args)
-        require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
-      end,
-    },
-    mapping = {
-			['<C-k>'] = cmp.mapping.select_prev_item(),
-			['<C-j>'] = cmp.mapping.select_next_item(),
-      ['<C-d>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
-      ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
-      ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
-      ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
-      ['<C-e>'] = cmp.mapping({
-        i = cmp.mapping.abort(),
-        c = cmp.mapping.close(),
-      }),
-      ['<CR>'] = cmp.mapping.confirm({ select = true }),
-			['<Tab>'] = cmp.mapping(function(fallback)
-				if cmp.visible() then
-					cmp.select_next_item()
-				elseif luasnip.expand_or_jumpable() then
-					luasnip.expand_or_jump()
-				elseif has_words_before() then
-					cmp.complete()
-				else
-					fallback()
-				end
-			end,{"i","s"}),
-			['<S-Tab>'] = cmp.mapping(function(fallback)
-				if cmp.visible() then
-					cmp.select_prev_item()
-				elseif luasnip.jumpable(-1) then
-					luasnip.jump(-1)
-				else
-					fallback()
-				end
-			end,{"i","s"})
-    },
-    sources = cmp.config.sources({
-      { name = 'nvim_lsp' },
-      { name = 'luasnip' }, -- For luasnip users.
-    }, {
-      { name = 'buffer' },
-    })
-  })
-
-cmp.setup.cmdline('/',{
-sources = {
-	{ name = 'buffer' }
-	}
+  snippet = {
+    expand = function(args)
+      require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+    end,
+  },
+  mapping = {
+    ['<C-k>'] = cmp.mapping.select_prev_item(),
+    ['<C-p>'] = cmp.mapping.select_prev_item(),
+    ['<C-j>'] = cmp.mapping.select_next_item(),
+    ['<C-n>'] = cmp.mapping.select_next_item(),
+    ['<C-d>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
+    ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
+    ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
+    ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
+    ['<C-e>'] = cmp.mapping({
+      i = cmp.mapping.abort(),
+      c = cmp.mapping.close(),
+    }),
+    ['<CR>'] = cmp.mapping.confirm({ select = true }),
+    ['<Tab>'] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_next_item()
+      elseif luasnip.expand_or_jumpable() then
+        luasnip.expand_or_jump()
+      elseif has_words_before() then
+        cmp.complete()
+      else
+        fallback()
+      end
+    end, { "i", "s" }),
+    ['<S-Tab>'] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_prev_item()
+      elseif luasnip.jumpable(-1) then
+        luasnip.jump(-1)
+      else
+        fallback()
+      end
+    end, { "i", "s" })
+  },
+  sources = cmp.config.sources({
+    { name = 'path' },
+    { name = 'nvim_lsp' },
+    { name = 'nvim_lsp_signature_help' },
+    { name = 'nvim_lua' },
+    { name = 'buffer' },
+    { name = 'luasnip' }, -- For luasnip users.
+  }),
+  window = {
+    completion = cmp.config.window.bordered(),
+    documentation = cmp.config.window.bordered(),
+  },
+  formatting = {
+    fields = { 'menu', 'abbr', 'kind' },
+    format = function(entry, item)
+      local menu_icon = {
+        nvim_lsp = 'λ',
+        buffer = 'Ω'
+      }
+      item.menu = menu_icon[entry.source.name]
+      return item
+    end
+  }
 })
 
-cmp.setup.cmdline(':',{
-sources = cmp.config.sources({
-{name = 'path'}
-},{{name='cmdline'}})
+cmp.setup.cmdline('/', {
+  sources = {
+    { name = 'buffer' }
+  }
+})
+
+cmp.setup.cmdline(':', {
+  sources = cmp.config.sources({
+    { name = 'path' }
+  }, { { name = 'cmdline' } })
 })

nvim/lua/keymap.lua

@@ -22,6 +22,12 @@ nmap("<SPACE>","<Nop>")
 nmap("<Esc><Esc>", ":noh<cr>")
 
 
+nmap("<C-f>",":ToggleTerm direction=float<cr>")
+imap("<C-f>",":ToggleTerm direction=float<cr>")
+
+nmap("<C-l>",":ToggleTerm direction=horizontal size=10<cr>")
+imap("<C-l>",":ToggleTerm direction=horizontal size=10<cr>")
+
 xmap("p",'\"_dP')
 nmap("<leader>fg", "<cmd>lua require('telescope.builtin').live_grep()<cr>")
 nmap("<leader>fb", "<cmd>lua require('telescope.builtin').buffers()<cr>")

nvim/lua/new_lsp_conf.lua

@@ -29,24 +29,57 @@ local on_attach = function(client, bufnr)
   vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, bufopts)
   vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, bufopts)
   vim.keymap.set('n', '<leader>gr', vim.lsp.buf.references, bufopts)
-  vim.keymap.set('n', '<leader>f', vim.lsp.buf.formatting, bufopts)
+  vim.keymap.set('n', '<leader>f', vim.lsp.buf.format, bufopts)
 end
 
 local lsp_flags = {
   -- This is the default in Nvim 0.7+
   debounce_text_changes = 150,
 }
+local capabilities = require('cmp_nvim_lsp').default_capabilities(
+  vim.lsp.protocol.make_client_capabilities()
+)
 require('mason-lspconfig').setup_handlers {
   function(server_name)
     require('lspconfig')[server_name].setup {
       on_attach = on_attach,
       flags = lsp_flags,
+      capabilities = capabilities
     }
   end,
   ['rust_analyzer'] = function()
-    require('rust-tools').setup {
+    local rustToolsOpts = {
+      tools = {
+        inlay_hints = {
+          auto = true,
+          only_current_line = false,
+          show_parameter_hints = true,
+          parameter_hints_prefix = "<-",
+        }
+      },
+      server = {
+        on_attach = on_attach,
+        capabilities = capabilities,
+        flags = lsp_flags,
+        settings = {
+          ["rust_analyzer"] = {
+            checkOnSave = {
+              command = "clippy"
+            }
+          }
+        }
+      }
+    }
+    require('rust-tools').setup(rustToolsOpts)
+    --on_attach = on_attach,
+    --flags = lsp_flags,
+    require('lspconfig')['rust_analyzer'].setup {
       on_attach = on_attach,
       flags = lsp_flags,
+      -- server-specific settings...
+      settings = {
+        ["rust-analyzer"] = {}
+      }
     }
   end,
   ['sumneko_lua'] = function()
@@ -63,11 +96,11 @@ require('mason-lspconfig').setup_handlers {
     }
   end,
 }
-require('lspconfig')['rust_analyzer'].setup {
-  on_attach = on_attach,
-  flags = lsp_flags,
-  -- Server-specific settings...
-  settings = {
-    ["rust-analyzer"] = {}
-  }
-}
+--require('lspconfig')['rust_analyzer'].setup {
+--  on_attach = on_attach,
+--  flags = lsp_flags,
+--  -- Server-specific settings...
+--  settings = {
+--    ["rust-analyzer"] = {}
+--  }
+--}

nvim/lua/plugins.lua

@@ -25,8 +25,12 @@ require("packer").startup(function(use)
     "kosayoda/nvim-lightbulb",
   })
   use("hrsh7th/cmp-nvim-lsp")
+  use("hrsh7th/cmp-nvim-lsp-signature-help")
+  use("hrsh7th/cmp-nvim-lua")
   use("hrsh7th/cmp-buffer")
   use("hrsh7th/cmp-path")
+  use("hrsh7th/cmp-vsnip")
+  use("hrsh7th/vim-vsnip")
   use("hrsh7th/nvim-cmp")
   use("hrsh7th/cmp-cmdline")
   use("saadparwaiz1/cmp_luasnip")

nvim/lua/toggleterm_config.lua

@@ -1,7 +1,7 @@
 require"toggleterm".setup{
   open_mapping = [[<c-y>]],
   hide_numbers = true,
-  direction = 'float',
+  --direction = 'float',
   float_opts = {
     border = 'curved'
   },
@@ -9,3 +9,5 @@ require"toggleterm".setup{
     enabled = false
   }
 }
+
+