diff --git a/nvim/colors/mine.vim b/nvim/colors/mine.vim
index 72d98c5..bad0b6c 100644
--- a/nvim/colors/mine.vim
+++ b/nvim/colors/mine.vim
@@ -20,4 +20,4 @@ highlight Comment gui=italic
 highlight Constant guifg=#999999
 highlight NormalFloat guibg=#666666
 highlight CursorLineNr guibg=NONE gui=bold
-highlight StatusLine guibg=Normal guifg=Normal
+" highlight StatusLine guibg=Normal guifg=Normal
diff --git a/nvim/init.vim b/nvim/init.vim
index 6c2428c..2d218c8 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -5,24 +5,24 @@ source ~/.vimrc
 call plug#begin()
 " Plug 'ellisonleao/gruvbox.nvim'
 " Plug 'folke/tokyonight.nvim'
-" Plug 'nvim-lua/plenary.nvim'
-" Plug 'nvim-tree/nvim-web-devicons'
-" Plug 'MunifTanjim/nui.nvim'
-" Plug 'nvim-neo-tree/neo-tree.nvim', { 'branch': 'v3.x' }
+Plug 'nvim-lua/plenary.nvim'
+Plug 'nvim-tree/nvim-web-devicons'
+Plug 'MunifTanjim/nui.nvim'
+"Plug 'nvim-neo-tree/neo-tree.nvim', { 'branch': 'v3.x' }
 Plug 'lewis6991/gitsigns.nvim' " OPTIONAL: for git status
 " Plug 'nvim-tree/nvim-web-devicons' " OPTIONAL: for file icons
 " Plug 'freddiehaddad/feline.nvim'
-" Plug 'neovim/nvim-lspconfig'
+Plug 'neovim/nvim-lspconfig'
 " main one
-" Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
+Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
 " 9000+ Snippets
-" Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'}
+Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'}
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'xiyaowong/transparent.nvim'
-" Plug 'justinhj/battery.nvim'
-" Plug 'MunifTanjim/nui.nvim'
+Plug 'justinhj/battery.nvim'
+Plug 'MunifTanjim/nui.nvim'
 " Plug 'rcarriga/nvim-notify'
-" Plug 'folke/noice.nvim'
+Plug 'folke/noice.nvim'
 Plug 'luukvbaal/statuscol.nvim'
 call plug#end()
 
@@ -30,7 +30,7 @@ if exists("g:neovide")
 	set guifont=JetBrains_Mono:h13:cANSI:qDRAFT
 endif
 
-colo gruv
+colo mine
 set noshowmode
 set laststatus=2
 set cmdheight=0
diff --git a/nvim/lua/init.lua b/nvim/lua/init.lua
index 2b58cb5..6b90aad 100644
--- a/nvim/lua/init.lua
+++ b/nvim/lua/init.lua
@@ -2,17 +2,17 @@
 --require('plugins.gruvbox')
 --require('plugins.feline')
 require('gitsigns').setup({numhl = true})
---require('plugins.matlab_ls')
+require('plugins.matlab_ls')
 require('plugins.lua_ls')
 require('plugins.treesitter')
---require('battery').setup({
---	show_status_when_no_battery = false,
---	show_percent = true
---})
+require('battery').setup({
+	show_status_when_no_battery = false,
+	show_percent = true
+})
 --require('plugins.noice')
 require('plugins.statuscol')
 vim.diagnostic.config({
-  virtual_lines = { current_line = true, },
+  virtual_text = false,
   underline = true,
   signs = {
             text = {
@@ -24,7 +24,6 @@ vim.diagnostic.config({
         }
   })
 --vim.api.nvim_set_hl(0,"DiagnosticUnderlineWarn",{undercurl=true,sp='DiagnosticWarn'})
---For Alacritty:
 vim.api.nvim_create_autocmd("ExitPre", {
 	group = vim.api.nvim_create_augroup("Exit", { clear = true }),
 	command = "set guicursor=a:ver90-blinkwait250-blinkoff250-blinkon250",
diff --git a/nvim/lua/plugins/lua_ls.lua b/nvim/lua/plugins/lua_ls.lua
index 9d844cd..fd36b83 100644
--- a/nvim/lua/plugins/lua_ls.lua
+++ b/nvim/lua/plugins/lua_ls.lua
@@ -1,8 +1,8 @@
-vim.lsp.config.lua_ls =
-    {
+local coq = require("coq")
+local util = require("lspconfig.util")
+require('lspconfig').lua_ls.setup(
+    coq.lsp_ensure_capabilities({
         cmd = { os.getenv("HOME") .. "/lua-language-server/bin/lua-language-server" },
-		root_markers = { 'init.lua' },
-		filetypes = { 'lua' },
-    }
-
-vim.lsp.enable({'lua_ls'})
+		root_dir = util.root_pattern('init.lua'),
+    })
+)
diff --git a/nvim/lua/plugins/matlab_ls.lua b/nvim/lua/plugins/matlab_ls.lua
index af6a2fa..f3b1071 100644
--- a/nvim/lua/plugins/matlab_ls.lua
+++ b/nvim/lua/plugins/matlab_ls.lua
@@ -1,6 +1,7 @@
+local coq = require("coq")
 local util = require("lspconfig.util")
 require('lspconfig').matlab_ls.setup(
-    {
+    coq.lsp_ensure_capabilities({
         cmd = { "node", os.getenv("HOME") .. "/MATLAB-language-server/out/index.js", "--stdio" },
 		root_dir = util.root_pattern('mw_anchor'),
 		single_file_support = true,
@@ -12,5 +13,5 @@ require('lspconfig').matlab_ls.setup(
                 telemetry = false
             }
         }
-    }
+    })
 )
diff --git a/nvim/lua/plugins/statusline.lua b/nvim/lua/plugins/statusline.lua
index faf57c9..9f6d9d2 100644
--- a/nvim/lua/plugins/statusline.lua
+++ b/nvim/lua/plugins/statusline.lua
@@ -24,7 +24,7 @@ GetTime = function()
 end
 
 GetLSP = function()
-	local clients = vim.lsp.get_clients()
+	local clients = vim.lsp.buf_get_clients()
 	if next(clients) ~= nil then
 		local name = string.format('%s',clients[1].name)
 		local root = clients[1].root_dir
diff --git a/zsh/custom.zsh b/zsh/custom.zsh
index b3cd52e..ef1ad5e 100644
--- a/zsh/custom.zsh
+++ b/zsh/custom.zsh
@@ -10,7 +10,7 @@ export PATH=$PATH:~/go/bin
 # export PATH=$PATH:~/.zig
 
 # neovim
-export PATH="$PATH:/opt/nvim-linux-x86_64/bin"
+export PATH=$PATH:/usr/bin/nvim-linux64/bin
 
 # picotool
 export PATH=$PATH:~/picotool/build