3 files changed, 22 insertions, 18 deletions
diff --git a/Common/nvim/init.lua b/Common/nvim/init.lua
index 34a38fe..4b99e7b 100755
--- a/Common/nvim/init.lua
+++ b/Common/nvim/init.lua
@@ -1,6 +1,10 @@
 -- Use a mapleader
 vim.g.mapleader   = ","
 
+-- To debug
+-- vim.opt.verbosefile = ~/nvim.log
+-- vim.opt.verbose = 15
+
 require("helper_functions")
 require("basic")
 require("plugins")
diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua
index d24fbc9..4c09fa6 100755
--- a/Common/nvim/lua/basic.lua
+++ b/Common/nvim/lua/basic.lua
@@ -24,7 +24,8 @@ vim.api.nvim_create_user_command(
 )
 
 -- Disable the auto line wrap
-vim.cmd [[ set formatoptions-=t ]]
+-- vim.cmd [[ set formatoptions-=t ]]
+vim.opt.formatoptions:remove("t")
 
 --[[
 VIM User interface
@@ -78,24 +79,22 @@ vim.opt.showcmd = true
 
 -- Show colour column
 vim.opt.colorcolumn = '80,120'
-vim.cmd [[ highlight ColorColumn ctermbg=16 ]]
+vim.api.nvim_set_hl(0, "ColorColumn", { ctermbg = 16 })
+
 
 -- Colorscheme
--- default
 vim.cmd [[ colorscheme default ]]
-vim.cmd [[ set background=light ]]
-
--- Workaround for gutter color
-vim.cmd [[
-highlight! link SignColumn LineNr
-autocmd ColorScheme * highlight! link SignColumn LineNr
-]]
-
--- Change git colors
---vim.api.nvim_set_hl(0, "DiffAdd", {fg = "#bada9f", bg = "None"})
---vim.api.nvim_set_hl(0, "DiffChange", {fg = "Purple", bg = "None"})
---vim.api.nvim_set_hl(0, "DiffDelete", {fg = "Red", bg = "None"})
---vim.api.nvim_set_hl(0, "DiffText", {fg = "Yellow", bg = "None"})
+vim.opt.background = "light"
+vim.opt.termguicolors = true
+
+-- Workaround for gutter color, to remove background?
+vim.api.nvim_set_hl(0, "SignColumn", {link = "LineNr"})
+vim.api.nvim_create_autocmd("ColorScheme", {
+    pattern = "*",
+    callback = function()
+        vim.api.nvim_set_hl(0, "SignColumn", {link = "LineNr"})
+    end
+})
 
 -- Set utf8 as standard encoding
 vim.opt.encoding = 'utf8'
diff --git a/Common/nvim/lua/plugins.lua b/Common/nvim/lua/plugins.lua
index 6b8cbbf..d9ae65f 100755
--- a/Common/nvim/lua/plugins.lua
+++ b/Common/nvim/lua/plugins.lua
@@ -149,10 +149,11 @@ return require('packer').startup(function(use)
   }
   use { 'smithbm2316/centerpad.nvim' }
 
-  -- Color preview
+  -- Color picker
   use {
-    'lilydjwg/colorizer',
+    "ziontee113/color-picker.nvim",
     config = function()
+      require("color-picker")
     end,
   }