diff --git a/init.lua b/init.lua
index 7fb0316..c6e2766 100644
--- a/init.lua
+++ b/init.lua
@@ -20,6 +20,7 @@ vim.o.hlsearch = true
 
 -- Highlight current line
 vim.o.cursorline = true
+vim.o.cursorlineopt = "number"
 
 -- Increase speed for terminals
 vim.o.ttyfast = true
@@ -64,3 +65,10 @@ vim.filetype.add({
 })
 
 require("plugins")
+vim.o.cmdheight = 0
+
+vim.cmd([[
+  highlight Normal guibg=none ctermbg=none
+  highlight NonText guibg=none ctermbg=none
+  highlight LineNr guifg=#606060
+]])
diff --git a/lazy-lock.json b/lazy-lock.json
index 56a4fa2..d17ae04 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -19,6 +19,7 @@
   "incline.nvim": { "branch": "main", "commit": "16fc9c073e3ea4175b66ad94375df6d73fc114c0" },
   "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
   "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
+  "lsp-zero.nvim": { "branch": "v4.x", "commit": "b8411704591ae8e1501f1b9b31c801c09927baac" },
   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "nerdcommenter": { "branch": "master", "commit": "3f860f2d981547c18f2c9599e3c358ea488c3be4" },
   "nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" },
diff --git a/lua/nvim-cmp-config.lua b/lua/nvim-cmp-config.lua
index 41f7b28..c9d1406 100644
--- a/lua/nvim-cmp-config.lua
+++ b/lua/nvim-cmp-config.lua
@@ -30,7 +30,6 @@ cmp.setup({
 		{ name = "path" }, -- file paths
 		{ name = "nvim_lsp", keyword_length = 1 }, -- from language server
 		{ name = "nvim_lsp_signature_help" }, -- display function signatures with current parameter emphasized
-		{ name = "nvim_lua", keyword_length = 2 }, -- complete neovim's Lua runtime API such vim.lsp.*
 		{ name = "buffer", keyword_length = 2 }, -- source current buffer
 		{ name = "vsnip", keyword_length = 2 }, -- nvim-cmp source for vim-vsnip
 		{ name = "calc" }, -- source for math calculation
@@ -76,10 +75,3 @@ cmp.setup.cmdline(":", {
 		{ name = "cmdline" },
 	}),
 })
-
--- Set up lspconfig.
-local capabilities = require("cmp_nvim_lsp").default_capabilities()
--- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
-require("lspconfig")["pyright"].setup({
-	capabilities = capabilities,
-})
diff --git a/lua/nvim-lsp-config.lua b/lua/nvim-lsp-config.lua
index ddf24b8..d26bea9 100644
--- a/lua/nvim-lsp-config.lua
+++ b/lua/nvim-lsp-config.lua
@@ -1,106 +1,33 @@
--- Mappings.
--- See `:help vim.diagnostic.*` for documentation on any of the below functions
-local opts = { noremap = true, silent = true }
-vim.keymap.set("n", "<space>e", vim.diagnostic.open_float, opts)
-vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
-vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts)
-vim.keymap.set("n", "<space>q", vim.diagnostic.setloclist, opts)
+local lsp_zero = require("lsp-zero")
+local lspconfig = require("lspconfig")
 
--- Use an on_attach function to only map the following keys
--- after the language server attaches to the current buffer
-local on_attach = function(_, bufnr)
-	-- Enable completion triggered by <c-x><c-o>
-	vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
+-- https://lsp-zero.netlify.app/v3.x/language-server-configuration.html
 
-	-- Mappings.
-	-- See `:help vim.lsp.*` for documentation on any of the below functions
-	local bufopts = { noremap = true, silent = true, buffer = bufnr }
-	vim.keymap.set("n", "gD", vim.lsp.buf.declaration, bufopts)
-	vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)
-	vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts)
-	vim.keymap.set("n", "gi", vim.lsp.buf.implementation, bufopts)
-	vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, bufopts)
-	vim.keymap.set("n", "<space>wa", vim.lsp.buf.add_workspace_folder, bufopts)
-	vim.keymap.set("n", "<space>wr", vim.lsp.buf.remove_workspace_folder, bufopts)
-	vim.keymap.set("n", "<space>wl", function()
-		print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-	end, bufopts)
-	vim.keymap.set("n", "<space>D", vim.lsp.buf.type_definition, bufopts)
-	vim.keymap.set("n", "<space>rn", vim.lsp.buf.rename, bufopts)
-	vim.keymap.set("n", "<space>ca", vim.lsp.buf.code_action, bufopts)
-	vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts)
-	vim.keymap.set("n", "<space>f", function()
-		vim.lsp.buf.format({ async = true })
-	end, bufopts)
-end
+lsp_zero.on_attach(function(_, bufnr)
+	-- see :help lsp-zero-keybindings
+	-- to learn the available actions
+	lsp_zero.default_keymaps({ buffer = bufnr })
+end)
+
+-- set up language servers
 
 vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
 	virtual_text = true,
 })
 
-local lsp_flags = {
-	-- This is the default in Nvim 0.7+
-	debounce_text_changes = 150,
-}
-
-local lspconfig = require("lspconfig")
-
-lspconfig.pyright.setup({
-	on_attach = on_attach,
-	flags = lsp_flags,
-})
+lspconfig.pyright.setup({})
 
 lspconfig.clangd.setup({})
 
-lspconfig.rust_analyzer.setup({
-	settings = {
-		["rust-analyzer"] = {
-			diagnostics = {
-				enable = false,
-			},
-			check = { allTargets = false, extraArgs = { "--target", "xtensa-esp32s3-none-elf" } },
-		},
-	},
-})
+lspconfig.rust_analyzer.setup({})
 
 lspconfig.nil_ls.setup({})
 
 lspconfig.r_language_server.setup({})
 
 --lspconfig.qmlls.setup({})
-require("lspconfig").lua_ls.setup({
-	on_init = function(client)
-		if client.workspace_folders then
-			local path = client.workspace_folders[1].name
-			if vim.loop.fs_stat(path .. "/.luarc.json") or vim.loop.fs_stat(path .. "/.luarc.jsonc") then
-				return
-			end
-		end
 
-		client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, {
-			runtime = {
-				-- Tell the language server which version of Lua you're using
-				-- (most likely LuaJIT in the case of Neovim)
-				version = "LuaJIT",
-			},
-			-- Make the server aware of Neovim runtime files
-			workspace = {
-				checkThirdParty = false,
-				library = {
-					vim.env.VIMRUNTIME,
-					-- Depending on the usage, you might want to add additional paths here.
-					-- "${3rd}/luv/library"
-					-- "${3rd}/busted/library",
-				},
-				-- or pull in all of 'runtimepath'. NOTE: this is a lot slower
-				-- library = vim.api.nvim_get_runtime_file("", true)
-			},
-		})
-	end,
-	settings = {
-		Lua = {},
-	},
-})
+lspconfig.lua_ls.setup(lsp_zero.nvim_lua_ls())
 
 lspconfig.bashls.setup({})
 
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 2d7463a..5bc974b 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -16,6 +16,7 @@ vim.opt.rtp:prepend(lazypath)
 require("lazy").setup({
 	--: Behaviour {{{
 	{
+		"VonHeikemen/lsp-zero.nvim",
 		"nvim-tree/nvim-tree.lua",
 		dependencies = {
 			"nvim-tree/nvim-web-devicons", -- optional, for file icons
@@ -122,8 +123,8 @@ require("lazy").setup({
 					theme = "ivy",
 					hijack_netrw = true,
 					auto_depth = true,
-                    no_ignore = false,
-                     hidden = { file_browser = true, folder_browser = true },
+					no_ignore = false,
+					hidden = { file_browser = true, folder_browser = true },
 				},
 			},
 		},