Updated neovim config for v0.12

bootstrap.sh

@@ -38,6 +38,8 @@ echo "Setting up NeoVim"
 test -d $HOME/.config/nvim || mkdir -p $HOME/.config/nvim
 test -d $HOME/.local/share/nvim || mkdir -p $HOME/.local/share/nvim
 test -L $HOME/.config/nvim/init.lua || ln -f -s $BASEDIR/neovim/init.lua $HOME/.config/nvim/init.lua
+test -d $HOME/.config/nvim/lua || mkdir -p $HOME/.config/nvim/lua
+test -L $HOME/.config/nvim/lua/config || ln -f -s $BASEDIR/neovim/config $HOME/.config/nvim/lua/config
 test -d $HOME/.config/nvim/lsp || mkdir -p $HOME/.config/nvim/lsp
 test -L $HOME/.config/nvim/lsp/phpactor.lua || ln -f -s $BASEDIR/neovim/lsp/phpactor.lua $HOME/.config/nvim/lsp/phpactor.lua
 

neovim/config/diagnostics.lua

@@ -0,0 +1,18 @@
+local sev = vim.diagnostic.severity
+
+vim.diagnostic.config({
+  severity_sort = true,
+  update_in_insert = false,
+  float = {
+    border = 'rounded',
+    source = true,
+  },
+  signs = {
+    text = {
+      [sev.ERROR] = 'E',
+      [sev.WARN]  = 'W',
+      [sev.INFO]  = 'I',
+      [sev.HINT]  = 'H',
+    },
+  },
+})

neovim/config/init.lua

@@ -0,0 +1,3 @@
+require('config.options')
+require('config.diagnostics')
+require('config.lsp')

neovim/config/lsp.lua

@@ -0,0 +1 @@
+vim.lsp.enable('phpactor')

neovim/config/options.lua

@@ -0,0 +1,8 @@
+vim.o.autocomplete = true
+vim.o.pumborder = 'rounded'
+vim.o.pummaxwidth = 40
+vim.o.completeopt = 'menu,menuone,noinsert,nearest'
+vim.o.number = true
+vim.o.spelllang = 'en_gb'
+vim.o.spell = true
+vim.o.termguicolors = true

neovim/init.lua

@@ -1,26 +1 @@
---[[
+require('config')
-My NeoVim configuration
---]]
-
--- Plugins
-vim.pack.add({"https://github.com/lewis6991/gitsigns.nvim"})
-
--- nvim-tree recommends disabling netrw (vim’s file explorer)
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
-vim.pack.add({"https://github.com/nvim-tree/nvim-tree.lua"})
-require("nvim-tree").setup()
-
--- Editor options
--- show line numbers
-vim.opt.number = true
-
--- set spelling to British English
-vim.opt.spelllang = 'en_gb'
-vim.opt.spell = true
-
--- 24-bit colour support
-vim.opt.termguicolors = true
-
--- LSP/PHP setup
-vim.lsp.enable('phpactor')