From 6715c055194efa6d76bcb65f2c393cabe1984c58 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Feb 2021 19:06:05 +0200 Subject: [PATCH] require pluginmanager first + fix some lua LSP issues --- home/.config/nvim/init.lua | 2 +- home/.config/nvim/lua/pluginconf/lsp.lua | 3 +-- home/.config/nvim/lua/pluginmanager.lua | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index cef30b9c..711415bd 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -1,7 +1,7 @@ +require 'pluginmanager' require 'autocmd' require 'keybinds' require 'settings' -require 'pluginmanager' -- Plugin configurations require 'pluginconf.airline' diff --git a/home/.config/nvim/lua/pluginconf/lsp.lua b/home/.config/nvim/lua/pluginconf/lsp.lua index 5e8bb449..85d57868 100644 --- a/home/.config/nvim/lua/pluginconf/lsp.lua +++ b/home/.config/nvim/lua/pluginconf/lsp.lua @@ -4,10 +4,9 @@ require'lspconfig'.rust_analyzer.setup { } -- Lua -local sumneko_binary = '/usr/bin/lua-language-server' require'lspconfig'.sumneko_lua.setup { on_attach = require'completion'.on_attach, - cmd = {sumneko_binary}, + cmd = {'/usr/bin/lua-language-server'}, settings = { Lua = { runtime = { diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua index 7cf0540e..492d761b 100644 --- a/home/.config/nvim/lua/pluginmanager.lua +++ b/home/.config/nvim/lua/pluginmanager.lua @@ -13,6 +13,7 @@ end -- Configure packer cmd 'packadd packer.nvim' +local use = require('packer').use require('packer').startup(function() -- The plugin manager itself @@ -45,6 +46,7 @@ require('packer').startup(function() -- Formatter plugin use 'sbdchd/neoformat' + end) -- Install plugins if packer was not installed