Merge changes from work

nvim/base.lua

@@ -39,8 +39,6 @@ vim.opt.scrolloff = 8
 vim.opt.background = 'light'
 vim.opt.wrap = true
 vim.opt.showbreak = '..'
--- vim.opt.clipboard = vim.opt.clipboard + 'unnamedplus'
--- vim.opt.clipboard = 'unnamedplus'
 vim.opt.errorbells = false
 vim.opt.visualbell = false
 vim.opt.title = true
@@ -49,10 +47,19 @@ vim.opt.syntax = 'on'
 vim.opt.encoding = 'utf-8'
 vim.opt.completeopt = 'menu,menuone,noselect'
 
+
 ----------------------------
--------- COMMANDS --------
+-------- CLIPBOARD ---------
 ----------------------------
---
+if vim.fn.has("wsl") == 1 then
+  vim.opt.clipboard = vim.opt.clipboard + 'unnamedplus'
+end
+
+
+----------------------------
+-------- COMMANDS ----------
+----------------------------
+
 vim.cmd('filetype plugin indent on')
 
 -- vim.cmd('colorscheme lucius')
@@ -60,7 +67,7 @@ vim.cmd('filetype plugin indent on')
 
 
 ----------------------------
--------- AUTOGROUPs --------
+-------- AUTOGROUPS --------
 ----------------------------
 
 vim.api.nvim_create_augroup('VimIntern', { clear = true })

nvim/plugins.lua

@@ -41,7 +41,6 @@ cmp.setup({
     { name = 'buffer', keyword_length = 2 },
   }),
 
-  formatting = {
   formatting = {
     format = lspkind.cmp_format({
       -- mode = "symbol_text",