diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
new file mode 100644
index 00000000..5ec97d39
--- /dev/null
+++ b/.config/nvim/init.lua
@@ -0,0 +1,290 @@
+-- Set mapleader
+vim.g.mapleader = ","
+
+-- Check and install vim-plug if not present
+local plug_path = vim.fn.stdpath('config') .. '/autoload/plug.vim'
+if vim.fn.filereadable(plug_path) == 0 then
+	print("Downloading junegunn/vim-plug to manage plugins...")
+	vim.fn.mkdir(vim.fn.stdpath('config') .. '/autoload', 'p')
+	vim.fn.system('curl -fLo ' .. plug_path .. ' --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim')
+	vim.api.nvim_create_autocmd("VimEnter", { command = "PlugInstall" })
+end
+
+-- Mappings for ,,
+vim.keymap.set("n", ",,", ":keepp /<++><CR>ca<", { noremap = true })
+vim.keymap.set("i", ",,", "<Esc>:keepp /<++><CR>ca<", { noremap = true })
+
+-- Plugin setup with vim-plug
+local Plug = vim.fn["plug#"]
+vim.fn['plug#begin'](vim.fn.stdpath('config') .. '/plugged')
+Plug('tpope/vim-surround')
+Plug('preservim/nerdtree')
+Plug('junegunn/goyo.vim')
+Plug('jreybert/vimagit')
+Plug('vimwiki/vimwiki')
+Plug('vim-airline/vim-airline')
+Plug('nvim-tree/nvim-web-devicons')
+Plug('tpope/vim-commentary')
+Plug('ap/vim-css-color')
+-- New Plugins for LSP Server
+Plug('neovim/nvim-lspconfig')
+Plug('hrsh7th/nvim-cmp')
+Plug('hrsh7th/cmp-nvim-lsp')
+Plug('hrsh7th/cmp-buffer')
+Plug('hrsh7th/cmp-path')
+vim.fn['plug#end']()
+
+-- General settings
+vim.opt.title = true
+vim.opt.background = "light"
+-- vim.opt.background = "dark"
+vim.opt.mouse = "a"
+vim.opt.hlsearch = false
+vim.opt.clipboard:append("unnamedplus")
+vim.opt.showmode = false
+vim.opt.ruler = false
+vim.opt.laststatus = 0
+vim.opt.showcmd = false
+vim.cmd.colorscheme("vim")
+
+-- Basic settings
+vim.keymap.set("n", "c", '"_c', { noremap = true })
+vim.cmd("filetype plugin on")
+vim.cmd("syntax on")
+vim.opt.encoding = "utf-8"
+vim.opt.number = true
+vim.opt.relativenumber = true
+vim.opt.wildmode = "longest,list,full"
+vim.api.nvim_create_autocmd("FileType", {
+	callback = function()
+		vim.opt_local.formatoptions:remove({"c", "r", "o"})
+	end,
+})
+vim.keymap.set("v", ".", ":normal .<CR>", { noremap = true })
+
+-- Goyo and spell-check mappings
+vim.keymap.set("n", "<leader>f", ":Goyo | set background=light | set linebreak<CR>", { noremap = true })
+--vim.keymap.set("n", "<leader>f", ":Goyo | set background=dark | set linebreak<CR>", { noremap = true })
+vim.keymap.set("n", "<leader>o", ":setlocal spell! spelllang=en_us<CR>", { noremap = true })
+
+-- Split settings
+vim.opt.splitbelow = true
+vim.opt.splitright = true
+
+-- NERDTree
+vim.keymap.set("n", "<leader>n", ":NERDTreeToggle<CR>", { noremap = true })
+vim.api.nvim_create_autocmd("BufEnter", {
+	callback = function()
+		if vim.fn.winnr("$") == 1 and vim.b.NERDTree and vim.b.NERDTree.isTabTree() then
+			vim.cmd("q")
+		end
+	end,
+})
+vim.g.NERDTreeBookmarksFile = vim.fn.stdpath('data') .. '/NERDTreeBookmarks'
+
+-- vim-airline configuration
+
+local airline_conf = vim.g.airline_symbols or {}
+airline_conf.colnr = " C:"
+airline_conf.linenr = " L:"
+airline_conf.maxlinenr = "☰ "
+vim.g.airline_symbols = airline_conf
+vim.g['airline#extensions#whitespace#symbol'] = '!'
+
+-- Split navigation
+vim.keymap.set("n", "<C-h>", "<C-w>h", { noremap = true })
+vim.keymap.set("n", "<C-j>", "<C-w>j", { noremap = true })
+vim.keymap.set("n", "<C-k>", "<C-w>k", { noremap = true })
+vim.keymap.set("n", "<C-l>", "<C-w>l", { noremap = true })
+
+-- Replace ex mode with gq
+vim.keymap.set("n", "Q", "gq", { noremap = true })
+
+-- Shellcheck
+vim.keymap.set("n", "<leader>s", ":!clear && shellcheck -x %<CR>", { noremap = true })
+
+-- Bibliography and reference files
+vim.keymap.set("n", "<leader>b", ":vsp $BIB<CR>", { noremap = true })
+vim.keymap.set("n", "<leader>r", ":vsp $REFER<CR>", { noremap = true })
+
+-- Replace all
+vim.keymap.set("n", "S", ":%s//g<Left><Left>", { noremap = true })
+
+-- Compile and preview
+vim.keymap.set("n", "<leader>c", ":w! | !compiler %:p<CR>", { noremap = true })
+vim.keymap.set("n", "<leader>p", ":!opout %:p<CR>", { noremap = true })
+
+-- Clean tex build files on exit
+vim.api.nvim_create_autocmd("VimLeave", {
+	pattern = "*.tex",
+	command = "!latexmk -c %",
+})
+
+-- Filetype settings
+vim.g.vimwiki_ext2syntax = {
+	['.Rmd'] = 'markdown',
+	['.rmd'] = 'markdown',
+	['.md'] = 'markdown',
+	['.markdown'] = 'markdown',
+	['.mdown'] = 'markdown',
+}
+vim.keymap.set("n", "<leader>v", ":VimwikiIndex<CR>", { noremap = true })
+vim.g.vimwiki_list = {{path = '~/.local/share/nvim/vimwiki', syntax = 'markdown', ext = '.md'}}
+vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
+	pattern = {"/tmp/calcurse*", "~/.calcurse/notes/*"},
+	command = "set filetype=markdown",
+})
+vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
+	pattern = {"*.ms", "*.me", "*.mom", "*.man"},
+	command = "set filetype=groff",
+})
+vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
+	pattern = "*.tex",
+	command = "set filetype=tex",
+})
+
+-- Sudo write
+vim.keymap.set("ca", "w!!", "execute 'silent! write !sudo tee % >/dev/null' | edit!")
+
+-- Goyo for mutt
+vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
+	pattern = "/tmp/neomutt*",
+	callback = function()
+		vim.cmd("Goyo 80")
+		vim.api.nvim_feedkeys("jk", "n", false)
+		vim.keymap.set("n", "ZZ", ":Goyo!|x!<CR>", { buffer = true, noremap = true })
+		vim.keymap.set("n", "ZQ", ":Goyo!|q!<CR>", { buffer = true, noremap = true })
+	end,
+})
+
+-- Clean trailing whitespace and newlines on save
+vim.api.nvim_create_autocmd("BufWritePre", {
+	callback = function()
+		local currPos = vim.fn.getpos(".")
+		vim.cmd("%s/\\s\\+$//e")
+		vim.cmd("%s/\\n\\+\\%$//e")
+		if vim.bo.filetype == "c" or vim.bo.filetype == "h" then
+			vim.cmd("%s/\\%$/\r/e")
+		end
+		if vim.fn.expand("%"):match("neomutt") then
+			vim.cmd("%s/^--$/-- /e")
+		end
+		vim.fn.setpos(".", currPos)
+	end,
+})
+
+-- Update shortcuts and configs
+vim.api.nvim_create_autocmd("BufWritePost", {
+	pattern = {"bm-files", "bm-dirs"},
+	command = "!shortcuts",
+})
+vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, {
+	pattern = {"Xresources", "Xdefaults", "xresources", "xdefaults"},
+	command = "set filetype=xdefaults",
+})
+vim.api.nvim_create_autocmd("BufWritePost", {
+	pattern = {"Xresources", "Xdefaults", "xresources", "xdefaults"},
+	command = "!xrdb %",
+})
+vim.api.nvim_create_autocmd("BufWritePost", {
+	pattern = "~/.local/src/dwmblocks/config.h",
+	command = "!cd ~/.local/src/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid -f dwmblocks }",
+})
+
+-- Diff highlighting
+if vim.opt.diff:get() then
+	vim.cmd("highlight! link DiffText MatchParen")
+end
+
+-- Toggle statusbar
+
+local hidden_all = false
+local function toggle_hidden_all()
+	vim.opt.showmode = hidden_all
+	vim.opt.ruler = hidden_all
+	vim.opt.showcmd = hidden_all
+	vim.opt.laststatus = hidden_all and 2 or 0
+	hidden_all = not hidden_all
+end
+
+vim.keymap.set("n", "<leader>h", toggle_hidden_all, { noremap = true })
+
+-- Load shortcuts
+pcall(vim.cmd, "source ~/.config/nvim/shortcuts.vim")
+
+-- Syntax Highlighting - LSP setup
+local lspconfig = require'lspconfig'
+-- These language servers are in pacman or the AUR with the same name as given below, unless otherwise noted.
+local servers = {
+	--	'server_name',		-- Language name	-- Pacman/AUR name
+	'pyright',		-- Python		-- pyright
+	'ts_ls',		-- TypeScript		-- typescript-language-server
+	'gopls',		-- Go			-- gopls
+	'clangd',		-- C			-- clang
+	'rust_analyzer',	-- Rust			-- rust_analyzer
+	'texlab',		-- LaTeX		-- texlab
+	'marksman',		-- Markdown		-- marksman
+	'r_language_server',	-- R			-- Run `install.packages("languageserver")` inside R
+	'csharp_ls',		-- C#			-- csharp-ls
+	--	'omnisharp',		-- C# (legacy)		-- omnisharp-roslyn-bin
+	'lua_ls',		-- Lua			-- lua-language-server
+	'yamlls',		-- YAML			-- yaml-language-server
+	'bashls',		-- bash			-- bash-language-server
+}
+-- Automatically set up each LSP server in the list
+for _, server in ipairs(servers) do
+	lspconfig[server].setup {}
+end
+
+local cmp = require'cmp'
+cmp.setup({
+	mapping = {
+		['<C-n>'] = cmp.mapping.select_next_item(), -- Next suggestion
+		['<C-j>'] = cmp.mapping.select_next_item(), -- Next suggestion (vim-style bind)
+		['<C-p>'] = cmp.mapping.select_prev_item(), -- Previous suggestion
+		['<C-k>'] = cmp.mapping.select_prev_item(), -- Previous suggestion (vim-style bind)
+		['<C-y>'] = cmp.mapping.confirm({ select = true }), -- Confirm completion
+		['<CR>'] = cmp.mapping.confirm({ select = true }), -- Confirm completion
+		['<C-Space>'] = cmp.mapping.complete(), -- Trigger completion manually
+	},
+	sources = {
+		{ name = 'nvim_lsp' },  -- Use LSP as a completion source
+		{ name = 'buffer' },    -- Suggest words from open buffers
+		{ name = 'path' },      -- Suggest file paths
+	}
+})
+
+-- Diagnostic navigation mappings
+vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = "Go to next diagnostic" })
+vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic" })
+
+local diagnostics_auto_enabled = false
+local diagnostics_autocmd_id = nil
+
+-- Function to toggle diagnostic auto-display
+local function toggle_diagnostics_auto()
+	if diagnostics_auto_enabled then
+		-- Remove the autocommand if it exists
+		if diagnostics_autocmd_id then
+			vim.api.nvim_del_autocmd(diagnostics_autocmd_id)
+			diagnostics_autocmd_id = nil
+		end
+		diagnostics_auto_enabled = false
+		print("Diagnostic auto-display disabled")
+	else
+		-- Create the autocommand
+		diagnostics_autocmd_id = vim.api.nvim_create_autocmd("CursorHold", {
+			callback = function()
+				vim.diagnostic.open_float(nil, { focusable = false, scope = "cursor" })
+			end,
+		})
+		diagnostics_auto_enabled = true
+		print("Diagnostic auto-display enabled")
+	end
+end
+
+-- Keybinding to toggle diagnostic auto-display
+vim.keymap.set('n', '<leader>e', toggle_diagnostics_auto, { desc = "Toggle diagnostic auto-display" })
+
+-- Optional: Manual trigger to show diagnostics immediately
+vim.keymap.set('n', '<leader>E', vim.diagnostic.open_float, { desc = "Show diagnostic under cursor" })
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
deleted file mode 100644
index a7523062..00000000
--- a/.config/nvim/init.vim
+++ /dev/null
@@ -1,155 +0,0 @@
-let mapleader =","
-
-if ! filereadable(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim"'))
-	echo "Downloading junegunn/vim-plug to manage plugins..."
-	silent !mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/
-	silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim
-	autocmd VimEnter * PlugInstall
-endif
-
-map ,, :keepp /<++><CR>ca<
-imap ,, <esc>:keepp /<++><CR>ca<
-
-call plug#begin(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/plugged"'))
-Plug 'tpope/vim-surround'
-Plug 'preservim/nerdtree'
-Plug 'junegunn/goyo.vim'
-Plug 'jreybert/vimagit'
-Plug 'vimwiki/vimwiki'
-Plug 'vim-airline/vim-airline'
-Plug 'tpope/vim-commentary'
-Plug 'ap/vim-css-color'
-call plug#end()
-
-set title
-set bg=light
-set mouse=a
-set nohlsearch
-set clipboard+=unnamedplus
-set noshowmode
-set noruler
-set laststatus=0
-set noshowcmd
-colorscheme vim
-
-" Some basics:
-	nnoremap c "_c
-	filetype plugin on
-	syntax on
-	set encoding=utf-8
-	set number relativenumber
-" Enable autocompletion:
-	set wildmode=longest,list,full
-" Disables automatic commenting on newline:
-	autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
-" Perform dot commands over visual blocks:
-	vnoremap . :normal .<CR>
-" Goyo plugin makes text more readable when writing prose:
-	map <leader>f :Goyo \| set bg=light \| set linebreak<CR>
-" Spell-check set to <leader>o, 'o' for 'orthography':
-	map <leader>o :setlocal spell! spelllang=en_us<CR>
-" Splits open at the bottom and right, which is non-retarded, unlike vim defaults.
-	set splitbelow splitright
-
-" Nerd tree
-	map <leader>n :NERDTreeToggle<CR>
-	autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
-	let NERDTreeBookmarksFile = stdpath('data') . '/NERDTreeBookmarks'
-
-" vim-airline
-	if !exists('g:airline_symbols')
-		let g:airline_symbols = {}
-	endif
-	let g:airline_symbols.colnr = ' C:'
-	let g:airline_symbols.linenr = ' L:'
-	let g:airline_symbols.maxlinenr = ' '
-	let g:airline#extensions#whitespace#symbol = '!'
-
-" Shortcutting split navigation, saving a keypress:
-	map <C-h> <C-w>h
-	map <C-j> <C-w>j
-	map <C-k> <C-w>k
-	map <C-l> <C-w>l
-
-" Replace ex mode with gq
-	map Q gq
-
-" Check file in shellcheck:
-	map <leader>s :!clear && shellcheck -x %<CR>
-
-" Open my bibliography file in split
-	map <leader>b :vsp<space>$BIB<CR>
-	map <leader>r :vsp<space>$REFER<CR>
-
-" Replace all is aliased to S.
-	nnoremap S :%s//g<Left><Left>
-
-" Compile document, be it groff/LaTeX/markdown/etc.
-	map <leader>c :w! \| !compiler "%:p"<CR>
-
-" Open corresponding .pdf/.html or preview
-	map <leader>p :!opout "%:p"<CR>
-
-" Runs a script that cleans out tex build files whenever I close out of a .tex file.
-	autocmd VimLeave *.tex !latexmk -c %
-
-" Ensure files are read as what I want:
-	let g:vimwiki_ext2syntax = {'.Rmd': 'markdown', '.rmd': 'markdown','.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'}
-	map <leader>v :VimwikiIndex<CR>
-	let g:vimwiki_list = [{'path': '~/.local/share/nvim/vimwiki', 'syntax': 'markdown', 'ext': '.md'}]
-	autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown
-	autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff
-	autocmd BufRead,BufNewFile *.tex set filetype=tex
-
-" Save file as sudo on files that require root permission
-	cabbrev w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit!
-
-" Enable Goyo by default for mutt writing
-	autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo 80 | call feedkeys("jk")
-	autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo!\|x!<CR>
-	autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo!\|q!<CR>
-
-" Automatically deletes all trailing whitespace and newlines at end of file on save. & reset cursor position
- 	autocmd BufWritePre * let currPos = getpos(".")
-	autocmd BufWritePre * %s/\s\+$//e
-	autocmd BufWritePre * %s/\n\+\%$//e
-  autocmd BufWritePre *.[ch] %s/\%$/\r/e " add trailing newline for ANSI C standard
-  autocmd BufWritePre *neomutt* %s/^--$/-- /e " dash-dash-space signature delimiter in emails
-  	autocmd BufWritePre * cal cursor(currPos[1], currPos[2])
-
-" When shortcut files are updated, renew bash and ranger configs with new material:
-	autocmd BufWritePost bm-files,bm-dirs !shortcuts
-" Run xrdb whenever Xdefaults or Xresources are updated.
-	autocmd BufRead,BufNewFile Xresources,Xdefaults,xresources,xdefaults set filetype=xdefaults
-	autocmd BufWritePost Xresources,Xdefaults,xresources,xdefaults !xrdb %
-" Recompile dwmblocks on config edit.
-	autocmd BufWritePost ~/.local/src/dwmblocks/config.h !cd ~/.local/src/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid -f dwmblocks }
-
-" Turns off highlighting on the bits of code that are changed, so the line that is changed is highlighted but the actual text that has changed stands out on the line and is readable.
-if &diff
-    highlight! link DiffText MatchParen
-endif
-
-" Function for toggling the bottom statusbar:
-let s:hidden_all = 0
-function! ToggleHiddenAll()
-    if s:hidden_all  == 0
-        let s:hidden_all = 1
-        set noshowmode
-        set noruler
-        set laststatus=0
-        set noshowcmd
-    else
-        let s:hidden_all = 0
-        set showmode
-        set ruler
-        set laststatus=2
-        set showcmd
-    endif
-endfunction
-nnoremap <leader>h :call ToggleHiddenAll()<CR>
-" Load command shortcuts generated from bm-dirs and bm-files via shortcuts script.
-" Here leader is ";".
-" So ":vs ;cfz" will expand into ":vs /home/<user>/.config/zsh/.zshrc"
-" if typed fast without the timeout.
-silent! source ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/shortcuts.vim