diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua
index d352c0f..9cf2d13 100644
--- a/neovim/.config/nvim/init.lua
+++ b/neovim/.config/nvim/init.lua
@@ -1,8 +1,8 @@
 --set some aliases to make typing this faster.
-local cmd=vim.cmd
-local opt=vim.opt
-local fn=vim.fn
-local map=vim.api.nvim_set_keymap
+local cmd = vim.cmd
+local opt = vim.opt
+local fn = vim.fn
+local map = vim.api.nvim_set_keymap
 
 --leader key is set through a variable, for some reason.
 vim.g.mapleader = ';'
@@ -13,63 +13,63 @@ require('impatient')
 require('packages')
 
 --helper functions
-	local function keyCode(string)
-		return vim.api.nvim_replace_termcodes(str, true, true, true, true)
-	end
+local function keyCode(string)
+	return vim.api.nvim_replace_termcodes(str, true, true, true, true)
+end
 
 --options using vim.opt (aliased, of course.)
-	opt.mouse='a'
-	opt.lazyredraw=true
-	opt.termguicolors=true
-	opt.autoread=true
-	opt.swapfile=false
-	opt.history=500
-	opt.formatoptions='rojq'
-	--disable hard text wrapping, will only wrap visually.
-	opt.textwidth=0
-	opt.wrapmargin=0
-	opt.wrap=true
-	opt.linebreak=true
-	opt.breakindent=true
-	--add ruler to side of screen.
-	opt.number=true
-	--displays cordinates of your cursor in statusbar
-	opt.ruler=true
-	--always leave 5 cells between cursor and side of window.
-	opt.scrolloff=5
-	opt.sidescrolloff=5
-	--better command line completion
-	opt.wildmenu=true
-	--ignore case in search if search is all lowercase.
-	opt.ignorecase=true
-	opt.smartcase=true
-	--show unfinished commands in statusbar.
-	opt.showcmd=true
-	--regex stuff
-	opt.magic=true
-	--always have a status line
-	opt.laststatus=2
-	--tab stuff
-	opt.tabstop=4
-	opt.shiftwidth=0 --zero inherrits tabstop.
-	opt.autoindent=true
-	opt.smartindent=true
-	opt.smarttab=true
-	--space based tabs.
-	-- opt.softtabstop=-1 --negative value inherrits shiftwidth.
-	-- opt.expandtab=true
-	--highlight search results as you type.
-	opt.hlsearch=true
-	opt.incsearch=true
-	--foling stuff
-	opt.foldlevelstart=5
-	cmd([[source ~/.config/nvim/foldtext.vimrc]])
-	opt.foldmethod='indent'
-	opt.foldtext='minimal_foldtext()'
-	opt.fillchars='stl:=,stlnc: ,vert:|,fold:-'
-	opt.foldcolumn='4'
-	opt.foldenable=true
-	opt.foldignore=''
+opt.mouse = 'a'
+opt.lazyredraw = true
+opt.termguicolors = true
+opt.autoread = true
+opt.swapfile = false
+opt.history = 500
+opt.formatoptions = 'rojq'
+--disable hard text wrapping, will only wrap visually.
+opt.textwidth = 0
+opt.wrapmargin = 0
+opt.wrap = true
+opt.linebreak = true
+opt.breakindent = true
+--add ruler to side of screen.
+opt.number = true
+--displays cordinates of your cursor in statusbar
+opt.ruler = true
+--always leave 5 cells between cursor and side of window.
+opt.scrolloff = 5
+opt.sidescrolloff = 5
+--better command line completion
+opt.wildmenu = true
+--ignore case in search if search is all lowercase.
+opt.ignorecase = true
+opt.smartcase = true
+--show unfinished commands in statusbar.
+opt.showcmd = true
+--regex stuff
+opt.magic = true
+--always have a status line
+opt.laststatus = 2
+--tab stuff
+opt.tabstop = 4
+opt.shiftwidth = 0 --zero inherrits tabstop.
+opt.autoindent = true
+opt.smartindent = true
+opt.smarttab = true
+--space based tabs.
+-- opt.softtabstop=-1 --negative value inherrits shiftwidth.
+-- opt.expandtab=true
+--highlight search results as you type.
+opt.hlsearch = true
+opt.incsearch = true
+--foling stuff
+opt.foldlevelstart = 5
+cmd([[source ~/.config/nvim/foldtext.vimrc]])
+opt.foldmethod = 'indent'
+opt.foldtext = 'minimal_foldtext()'
+opt.fillchars = 'stl:=,stlnc: ,vert:|,fold:-'
+opt.foldcolumn = '4'
+opt.foldenable = true
+opt.foldignore = ''
 
 --sets colorscheme. to get a list of avalible options, do colorscheme <Space> <C-d>
 vim.cmd 'colorscheme moonfly'
@@ -77,71 +77,71 @@ vim.cmd 'colorscheme moonfly'
 --function for venn.nvim
 -- venn.nvim: enable or disable keymappings
 function _G.Toggle_venn()
-    local venn_enabled = vim.inspect(vim.b.venn_enabled)
-    if venn_enabled == "nil" then
-        vim.b.venn_enabled = true
-        vim.cmd[[setlocal ve=all]]
-        -- draw a line on HJKL keystokes
-        vim.api.nvim_buf_set_keymap(0, "n", "J", "<C-v>j:VBox<CR>", {noremap = true})
-        vim.api.nvim_buf_set_keymap(0, "n", "K", "<C-v>k:VBox<CR>", {noremap = true})
-        vim.api.nvim_buf_set_keymap(0, "n", "L", "<C-v>l:VBox<CR>", {noremap = true})
-        vim.api.nvim_buf_set_keymap(0, "n", "H", "<C-v>h:VBox<CR>", {noremap = true})
-        -- draw a box by pressing "f" with visual selection
-        vim.api.nvim_buf_set_keymap(0, "v", "f", ":VBox<CR>", {noremap = true})
-    else
-        vim.cmd[[setlocal ve=]]
-        vim.cmd[[mapclear <buffer>]]
-        vim.b.venn_enabled = nil
-    end
+	local venn_enabled = vim.inspect(vim.b.venn_enabled)
+	if venn_enabled == "nil" then
+		vim.b.venn_enabled = true
+		vim.cmd [[setlocal ve=all]]
+		-- draw a line on HJKL keystokes
+		vim.api.nvim_buf_set_keymap(0, "n", "J", "<C-v>j:VBox<CR>", { noremap = true })
+		vim.api.nvim_buf_set_keymap(0, "n", "K", "<C-v>k:VBox<CR>", { noremap = true })
+		vim.api.nvim_buf_set_keymap(0, "n", "L", "<C-v>l:VBox<CR>", { noremap = true })
+		vim.api.nvim_buf_set_keymap(0, "n", "H", "<C-v>h:VBox<CR>", { noremap = true })
+		-- draw a box by pressing "f" with visual selection
+		vim.api.nvim_buf_set_keymap(0, "v", "f", ":VBox<CR>", { noremap = true })
+	else
+		vim.cmd [[setlocal ve=]]
+		vim.cmd [[mapclear <buffer>]]
+		vim.b.venn_enabled = nil
+	end
 end
 
 --keyboard mappings
-	local opts = { noremap=true, silent=true }
-	--toggle spell check
-	map('n', '<leader>sp', ':setlocal spell!<CR>', opts)
-	--[[ --easily create splits
+local opts = { noremap = true, silent = true }
+--toggle spell check
+map('n', '<leader>sp', ':setlocal spell!<CR>', opts)
+--[[ --easily create splits
 	map('n', '<leader>|', ':vs<CR>', opts) ]]
-	--[[ map('n', '<leader>-', ':sp<CR>', opts)
+--[[ map('n', '<leader>-', ':sp<CR>', opts)
 	--use ctrl+direction to move between splits. ]]
-	map('n', '<C-h>', '<C-w>h', opts)
-	map('n', '<C-j>', '<C-w>j', opts)
-	map('n', '<C-k>', '<C-w>k', opts)
-	map('n', '<C-l>', '<C-w>l', opts)
-	--toggle folds with space.
-	map('', '<Space>', 'za', opts)
-	--clear highlighting with leader+h
-	map('', '<leader>h', ':nohls<CR>', opts)
-	--open nvim-tree with leader+t
-	map('n', '<leader>t', ':NvimTreeToggle<CR>', opts)
-	--open symbols-outline with leader+o
-	map('n', '<leader>o', ':SymbolsOutline<CR>', opts)
-	--telescope stuff
-	map('n', '<leader>ff', ':lua require "telescope".extensions.file_browser.file_browser()<CR>', opts)
-	map('n', '<leader>fg', ':Telescope live_grep<CR>', opts)
-	map('n', '<leader>fb', ':Telescope buffers<CR>', opts)
-	map('n', '<leader>fm', ':Telescope marks<CR>', opts)
-	map('n', '<leader>fp', ':Telescope registers<CR>', opts)
-	map('n', '<leader>fs', ':Telescope spell_suggest<CR>', opts)
-	map('n', '<leader>fh', ':Telescope keymaps<CR>', opts)
-	map('n', '<leader>fz', ':Telescope current_buffer_fuzzy_find<CR>', opts)
-	map('n', '<leader>fgc', ':Telescope git_commits<CR>', opts)
-	map('n', '<leader>fgb', ':Telescope git_branches<CR>', opts)
-	map('n', '<leader>fgs', ':Telescope git_stash<CR>', opts)
-	map('n', '<leader>ft', ':Telescope treesitter<CR>', opts)
-	--Treesitter context
-	map('n', '<leader>c', ':TSContextToggle<CR>', opts)
-	--tabline stuff (gt and gT are prev/next tab in stock vim)
-	map('n', 'gf', ':TablineBufferNext<CR>', opts)
-	map('n', 'gF', ':TablineBufferPrevious<CR>', opts)
-	--gitsigns
-	map('n', '<leader>bl', ':Gitsigns toggle_current_line_blame<CR>', opts)
-	--trouble plugin.
-	vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>", opts)
-	vim.keymap.set("n", "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<cr>", opts)
-	vim.keymap.set("n", "<leader>xd", "<cmd>TroubleToggle document_diagnostics<cr>", opts)
-	vim.keymap.set("n", "<leader>xl", "<cmd>TroubleToggle loclist<cr>", opts)
-	vim.keymap.set("n", "<leader>xq", "<cmd>TroubleToggle quickfix<cr>", opts)
-	vim.keymap.set("n", "<leader>lR", "<cmd>TroubleToggle lsp_references<cr>", opts)
-	vim.keymap.set("n", "<leader>lD", "<cmd>TroubleToggle lsp_definitions<cr>", opts)
-	-- toggle keymappings for venn using <leader>v
-	vim.api.nvim_set_keymap('n', '<leader>v', ":lua Toggle_venn()<CR>", { noremap = true})
+map('n', '<C-h>', '<C-w>h', opts)
+map('n', '<C-j>', '<C-w>j', opts)
+map('n', '<C-k>', '<C-w>k', opts)
+map('n', '<C-l>', '<C-w>l', opts)
+--toggle folds with space.
+map('', '<Space>', 'za', opts)
+--clear highlighting with leader+h
+map('', '<leader>h', ':nohls<CR>', opts)
+--open nvim-tree with leader+t
+map('n', '<leader>t', ':NvimTreeToggle<CR>', opts)
+--open symbols-outline with leader+o
+map('n', '<leader>o', ':SymbolsOutline<CR>', opts)
+--telescope stuff
+map('n', '<leader>ff', ':lua require "telescope".extensions.file_browser.file_browser()<CR>', opts)
+map('n', '<leader>fg', ':Telescope live_grep<CR>', opts)
+map('n', '<leader>fb', ':Telescope buffers<CR>', opts)
+map('n', '<leader>fm', ':Telescope marks<CR>', opts)
+map('n', '<leader>fp', ':Telescope registers<CR>', opts)
+map('n', '<leader>fs', ':Telescope spell_suggest<CR>', opts)
+map('n', '<leader>fh', ':Telescope keymaps<CR>', opts)
+map('n', '<leader>fz', ':Telescope current_buffer_fuzzy_find<CR>', opts)
+map('n', '<leader>fgc', ':Telescope git_commits<CR>', opts)
+map('n', '<leader>fgb', ':Telescope git_branches<CR>', opts)
+map('n', '<leader>fgs', ':Telescope git_stash<CR>', opts)
+map('n', '<leader>ft', ':Telescope treesitter<CR>', opts)
+--Treesitter context
+map('n', '<leader>c', ':TSContextToggle<CR>', opts)
+--tabline stuff (gt and gT are prev/next tab in stock vim)
+map('n', 'gf', ':TablineBufferNext<CR>', opts)
+map('n', 'gF', ':TablineBufferPrevious<CR>', opts)
+--gitsigns
+map('n', '<leader>bl', ':Gitsigns toggle_current_line_blame<CR>', opts)
+--trouble plugin.
+vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>", opts)
+vim.keymap.set("n", "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<cr>", opts)
+vim.keymap.set("n", "<leader>xd", "<cmd>TroubleToggle document_diagnostics<cr>", opts)
+vim.keymap.set("n", "<leader>xl", "<cmd>TroubleToggle loclist<cr>", opts)
+vim.keymap.set("n", "<leader>xq", "<cmd>TroubleToggle quickfix<cr>", opts)
+vim.keymap.set("n", "<leader>lR", "<cmd>TroubleToggle lsp_references<cr>", opts)
+vim.keymap.set("n", "<leader>lD", "<cmd>TroubleToggle lsp_definitions<cr>", opts)
+-- toggle keymappings for venn using <leader>v
+vim.api.nvim_set_keymap('n', '<leader>v', ":lua Toggle_venn()<CR>", { noremap = true })
diff --git a/neovim/.config/nvim/lua/LSPconfig.lua b/neovim/.config/nvim/lua/LSPconfig.lua
index 929a10d..0b8f184 100644
--- a/neovim/.config/nvim/lua/LSPconfig.lua
+++ b/neovim/.config/nvim/lua/LSPconfig.lua
@@ -2,17 +2,18 @@ local opts = {}
 
 local on_attach = function()
 	local function set_keymap(...) vim.api.nvim_set_keymap(...) end
+
 	local function set_option(...) vim.api.nvim_set_option(...) end
 
 	-- Enable completion triggered by <c-x><c-o>
 	set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
 
 	-- Mappings.
-	local opts = { noremap=true, silent=true }
+	local opts = { noremap = true, silent = true }
 
 	-- See `:help vim.lsp.*` for documentation on any of the below functions
 	set_keymap('', '<leader>lc', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-	set_keymap('', '<leader>lf', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+	set_keymap('', '<leader>ld', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
 	set_keymap('', '<leader>lh', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
 	set_keymap('', '<leader>li', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
 	set_keymap('', '<leader>ls', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
@@ -26,18 +27,18 @@ local on_attach = function()
 	set_keymap('', '<leader>lo', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
 	set_keymap('', '<leader>ln', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
 	set_keymap('', '<leader>lp', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
-	set_keymap('', '<leader>lm', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
+	set_keymap('', '<leader>lm', '<cmd>lua vim.lsp.buf.format {async=true}<CR>', opts)
 end
 require("mason-lspconfig").setup_handlers({
 	function(server_name)
-		require("lspconfig")[server_name].setup{}
+		require("lspconfig")[server_name].setup {}
 		on_attach()
 	end,
 	["rust_analyzer"] = function()
 		require('rust-tools-setup')
 		on_attach()
 	end,
-	["sumneko_lua"] = function ()
+	["sumneko_lua"] = function()
 		require('lspconfig').sumneko_lua.setup {
 			settings = {
 				Lua = {