From dbb104cf21c8953e55b0e61fd160057a1191898a Mon Sep 17 00:00:00 2001
From: mequidis <that2tl@gmail.com>
Date: Thu, 12 May 2022 08:30:50 +0300
Subject: [PATCH] nvim: run a formatted and update autocmds to new 0.7 api

---
 .config/nvim/lua/colors.lua                   |   2 +-
 .config/nvim/lua/disablebuiltin.lua           |   2 +-
 .config/nvim/lua/mappings.lua                 | 170 +++++----
 .config/nvim/lua/options.lua                  |  54 ++-
 .config/nvim/lua/plugins.lua                  | 341 ++++++++++--------
 .config/nvim/lua/plugins/autopairs.lua        |   8 +-
 .config/nvim/lua/plugins/cmp.lua              |  28 +-
 .config/nvim/lua/plugins/dap-go.lua           |   2 +-
 .config/nvim/lua/plugins/dap-virtual-text.lua |   2 +-
 .config/nvim/lua/plugins/dap.lua              |  38 +-
 .config/nvim/lua/plugins/lint.lua             |   6 +-
 .config/nvim/lua/plugins/lsp.lua              |  22 +-
 .config/nvim/lua/plugins/lspsignature.lua     |   4 +-
 .config/nvim/lua/plugins/lualine.lua          |  14 +-
 .config/nvim/lua/plugins/neoformat.lua        |   2 +-
 .config/nvim/lua/plugins/nvim-tree.lua        |  10 +-
 .config/nvim/lua/plugins/telescope.lua        |  10 +-
 .config/nvim/lua/plugins/toggleterm.lua       |   2 +-
 .config/nvim/lua/plugins/treesitter.lua       |   4 +-
 .config/nvim/lua/plugins/vimtex.lua           |   4 +-
 .config/nvim/lua/plugins/whichkey.lua         |  10 +-
 21 files changed, 402 insertions(+), 333 deletions(-)

diff --git a/.config/nvim/lua/colors.lua b/.config/nvim/lua/colors.lua
index 2fed113..3946826 100644
--- a/.config/nvim/lua/colors.lua
+++ b/.config/nvim/lua/colors.lua
@@ -1 +1 @@
-vim.cmd 'colorscheme wal'
+vim.cmd("colorscheme wal")
diff --git a/.config/nvim/lua/disablebuiltin.lua b/.config/nvim/lua/disablebuiltin.lua
index 6d465f6..598589d 100644
--- a/.config/nvim/lua/disablebuiltin.lua
+++ b/.config/nvim/lua/disablebuiltin.lua
@@ -16,7 +16,7 @@ local disabled_built_ins = {
 	"logipat",
 	"rrhelper",
 	"spellfile_plugin",
-	"matchit"
+	"matchit",
 }
 
 for _, plugin in pairs(disabled_built_ins) do
diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index 7277cbd..4873b0a 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -1,101 +1,131 @@
 -- leader
-vim.g.mapleader = ' '
+vim.g.mapleader = " "
 
 -- visual block indenting
-vim.keymap.set('v', '<',			'<gv')
-vim.keymap.set('v', '>',			'>gv')
+vim.keymap.set("v", "<", "<gv")
+vim.keymap.set("v", ">", ">gv")
 
 -- centered cursor
-vim.keymap.set('n', 'n',			'nzz')
-vim.keymap.set('n', 'N',			'Nzz')
-vim.keymap.set('n', 'J',			'mzJ`z')
+vim.keymap.set("n", "n", "nzz")
+vim.keymap.set("n", "N", "Nzz")
+vim.keymap.set("n", "J", "mzJ`z")
 
 -- escape terminal mode
-vim.keymap.set('t', '<Esc>',		'<C-\\><C-n>')
+vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
 
 -- newline without entering insert mode
-vim.keymap.set('n', '<C-J>',		'o<Esc>')
-vim.keymap.set('n', '<C-K>',		'O<Esc>')
+vim.keymap.set("n", "<C-J>", "o<Esc>")
+vim.keymap.set("n", "<C-K>", "O<Esc>")
 
 -- movement
-vim.keymap.set('n', '<leader>h',	':wincmd h<cr>')
-vim.keymap.set('n', '<leader>j',	':wincmd j<cr>')
-vim.keymap.set('n', '<leader>k',	':wincmd k<cr>')
-vim.keymap.set('n', '<leader>l',	':wincmd l<cr>')
+vim.keymap.set("n", "<leader>h", ":wincmd h<cr>")
+vim.keymap.set("n", "<leader>j", ":wincmd j<cr>")
+vim.keymap.set("n", "<leader>k", ":wincmd k<cr>")
+vim.keymap.set("n", "<leader>l", ":wincmd l<cr>")
 
 -- splits and buffers
-vim.keymap.set('n', '<leader>sv',	':vsplit<CR>')
-vim.keymap.set('n', '<leader>sz',	':split<CR>')
-vim.keymap.set('n', '<leader>st',	':tabnew<CR>')
-vim.keymap.set('n', '<leader>sb',	':Telescope buffers<CR>')
-vim.keymap.set('n', '<leader>sh',	':tabprevious<cr>')
-vim.keymap.set('n', '<leader>sl',	':tabnext<cr>')
+vim.keymap.set("n", "<leader>sv", ":vsplit<CR>")
+vim.keymap.set("n", "<leader>sz", ":split<CR>")
+vim.keymap.set("n", "<leader>st", ":tabnew<CR>")
+vim.keymap.set("n", "<leader>sb", ":Telescope buffers<CR>")
+vim.keymap.set("n", "<leader>sh", ":tabprevious<cr>")
+vim.keymap.set("n", "<leader>sl", ":tabnext<cr>")
 
 -- basics
-vim.keymap.set('n', '<leader>q',	':q<CR>')
-vim.keymap.set('n', '<leader>Q',	':qa<CR>')
-vim.keymap.set('n', '<leader>x',	':q!<CR>')
-vim.keymap.set('n', '<leader>X',	':qa!<CR>')
-vim.keymap.set('n', '<leader>w',	':w<CR>')
-vim.keymap.set('n', '<leader>W',	':wa<CR>')
-vim.keymap.set('n', '<leader>f',	':NvimTreeToggle<CR>')
-vim.keymap.set('n', '<leader>F',	':Telescope find_files<CR>')
+vim.keymap.set("n", "<leader>q", ":q<CR>")
+vim.keymap.set("n", "<leader>Q", ":qa<CR>")
+vim.keymap.set("n", "<leader>x", ":q!<CR>")
+vim.keymap.set("n", "<leader>X", ":qa!<CR>")
+vim.keymap.set("n", "<leader>w", ":w<CR>")
+vim.keymap.set("n", "<leader>W", ":wa<CR>")
+vim.keymap.set("n", "<leader>f", ":NvimTreeToggle<CR>")
+vim.keymap.set("n", "<leader>F", ":Telescope find_files<CR>")
 
 -- toggle term
-vim.keymap.set('n', '<leader>c',	':ToggleTermToggleAll<CR>')
-vim.keymap.set('n', '<leader>C',	':ToggleTerm<CR>')
+vim.keymap.set("n", "<leader>c", ":ToggleTermToggleAll<CR>")
+vim.keymap.set("n", "<leader>C", ":ToggleTerm<CR>")
 
 -- frequent actions
-vim.keymap.set('n', '<leader>ar',	':source ~/.config/nvim/init.lua<CR>')
-vim.keymap.set('n', '<leader>ac',	':cd ~/.config/nvim/<CR>')
+vim.keymap.set("n", "<leader>ar", ":source ~/.config/nvim/init.lua<CR>")
+vim.keymap.set("n", "<leader>ac", ":cd ~/.config/nvim/<CR>")
 
 -- keymap switches
-vim.keymap.set('i', '<C-x>',		'<Esc>:set keymap=<CR>a')
-vim.keymap.set('i', '<C-z>',		'<Esc>:set keymap=hebrew<CR>a')
+vim.keymap.set("i", "<C-x>", "<Esc>:set keymap=<CR>a")
+vim.keymap.set("i", "<C-z>", "<Esc>:set keymap=hebrew<CR>a")
 
 -- telescope
-vim.keymap.set('n', '<leader>tt',	':Telescope<CR>')
-vim.keymap.set('n', '<leader>tl',	':Telescope lsp_dynamic_workspace_symbols<CR>')
-vim.keymap.set('n', '<leader>to',	':Telescope oldfiles<CR>')
-vim.keymap.set('n', '<leader>tg',	':Telescope live_grep<CR>')
-vim.keymap.set('n', '<leader>ts',	':Telescope treesitter<CR>')
+vim.keymap.set("n", "<leader>tt", ":Telescope<CR>")
+vim.keymap.set("n", "<leader>tl", ":Telescope lsp_dynamic_workspace_symbols<CR>")
+vim.keymap.set("n", "<leader>to", ":Telescope oldfiles<CR>")
+vim.keymap.set("n", "<leader>tg", ":Telescope live_grep<CR>")
+vim.keymap.set("n", "<leader>ts", ":Telescope treesitter<CR>")
 
 -- code
-vim.keymap.set('n', '<leader>gf',	':Neoformat<CR>')
-vim.keymap.set('n', '<leader>gd', 	':Telescope lsp_definitions<CR>')
-vim.keymap.set('n', '<leader>gi', 	':Telescope lsp_implementations<CR>')
-vim.keymap.set('n', '<leader>gr', 	':Telescope lsp_references<CR>')
-vim.keymap.set('n', '<leader>ga', 	':Telescope lsp_code_actions<CR>')
-vim.keymap.set('n', '<leader>gq', 	':Telescope diagnostics<CR>')
-vim.keymap.set('n', '<leader>gD', 	function() vim.lsp.buf.declaration() end)
-vim.keymap.set('n', '<leader>gk', 	function() vim.lsp.buf.hover() end)
-vim.keymap.set('n', '<leader>gt', 	function() vim.lsp.buf.type_definition() end)
-vim.keymap.set('n', '<leader>gn', 	function() vim.lsp.buf.rename() end)
-vim.keymap.set('n', '<leader>ge', 	function() vim.lsp.diagnostic.show_line_diagnostics() end)
-vim.keymap.set('n', '[d',         	function() vim.lsp.diagnostic.goto_prev() end)
-vim.keymap.set('n', ']d',         	function() vim.lsp.diagnostic.goto_next() end)
+vim.keymap.set("n", "<leader>gf", ":Neoformat<CR>")
+vim.keymap.set("n", "<leader>gd", ":Telescope lsp_definitions<CR>")
+vim.keymap.set("n", "<leader>gi", ":Telescope lsp_implementations<CR>")
+vim.keymap.set("n", "<leader>gr", ":Telescope lsp_references<CR>")
+vim.keymap.set("n", "<leader>ga", ":Telescope lsp_code_actions<CR>")
+vim.keymap.set("n", "<leader>gq", ":Telescope diagnostics<CR>")
+vim.keymap.set("n", "<leader>gD", function()
+	vim.lsp.buf.declaration()
+end)
+vim.keymap.set("n", "<leader>gk", function()
+	vim.lsp.buf.hover()
+end)
+vim.keymap.set("n", "<leader>gt", function()
+	vim.lsp.buf.type_definition()
+end)
+vim.keymap.set("n", "<leader>gn", function()
+	vim.lsp.buf.rename()
+end)
+vim.keymap.set("n", "<leader>ge", function()
+	vim.lsp.diagnostic.show_line_diagnostics()
+end)
+vim.keymap.set("n", "[d", function()
+	vim.lsp.diagnostic.goto_prev()
+end)
+vim.keymap.set("n", "]d", function()
+	vim.lsp.diagnostic.goto_next()
+end)
 
 -- debug mappings
-vim.keymap.set('n', '<leader>dc',	function() require'dap'.continue() end)
-vim.keymap.set('n', '<leader>dn',	function() require'dap'.step_over() end)
-vim.keymap.set('n', '<leader>di',	function() require'dap'.step_into() end)
-vim.keymap.set('n', '<leader>do',	function() require'dap'.step_out() end)
-vim.keymap.set('n', '<leader>db',	function() require'dap'.toggle_breakpoint() end)
-vim.keymap.set('n', '<leader>dl',	function() require'dap'.run_last() end)
-vim.keymap.set('n', '<leader>dq',	function() require'dap'.close() end)
-vim.keymap.set('n', '<leader>du',	function() require'dapui'.toggle() end)
-vim.keymap.set('n', '<leader>dv',	':Telescope dap variables<CR>')
-vim.keymap.set('n', '<leader>dh',	':Telescope dap commands<CR>')
-vim.keymap.set('n', '<leader>dp',	':Telescope dap list_breakpoints<CR>')
+vim.keymap.set("n", "<leader>dc", function()
+	require("dap").continue()
+end)
+vim.keymap.set("n", "<leader>dn", function()
+	require("dap").step_over()
+end)
+vim.keymap.set("n", "<leader>di", function()
+	require("dap").step_into()
+end)
+vim.keymap.set("n", "<leader>do", function()
+	require("dap").step_out()
+end)
+vim.keymap.set("n", "<leader>db", function()
+	require("dap").toggle_breakpoint()
+end)
+vim.keymap.set("n", "<leader>dl", function()
+	require("dap").run_last()
+end)
+vim.keymap.set("n", "<leader>dq", function()
+	require("dap").close()
+end)
+vim.keymap.set("n", "<leader>du", function()
+	require("dapui").toggle()
+end)
+vim.keymap.set("n", "<leader>dv", ":Telescope dap variables<CR>")
+vim.keymap.set("n", "<leader>dh", ":Telescope dap commands<CR>")
+vim.keymap.set("n", "<leader>dp", ":Telescope dap list_breakpoints<CR>")
 
 -- git
-vim.keymap.set('n', '<leader>vs',	':Git<CR>')
-vim.keymap.set('n', '<leader>vb',	':Telescope git_branches<CR>')
-vim.keymap.set('n', '<leader>vc',	':Telescope git_commits<CR>')
-vim.keymap.set('n', '<leader>vf',	':Telescope git_files<CR>')
+vim.keymap.set("n", "<leader>vs", ":Git<CR>")
+vim.keymap.set("n", "<leader>vb", ":Telescope git_branches<CR>")
+vim.keymap.set("n", "<leader>vc", ":Telescope git_commits<CR>")
+vim.keymap.set("n", "<leader>vf", ":Telescope git_files<CR>")
 
 -- vsnip jumpable mappings
-vim.keymap.set('i', '<Tab>',		"vsnip#jumpable(1)  ? '<Plug>(vsnip-jump-next)' : '<Tab>'",   {expr = true})
-vim.keymap.set('s', '<Tab>',   		"vsnip#jumpable(1)  ? '<Plug>(vsnip-jump-next)' : '<Tab>'",   {expr = true})
-vim.keymap.set('i', '<S-Tab>', 		"vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<S-Tab>'", {expr = true})
-vim.keymap.set('s', '<S-Tab>', 		"vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<S-Tab>'", {expr = true})
+vim.keymap.set("i", "<Tab>", "vsnip#jumpable(1)  ? '<Plug>(vsnip-jump-next)' : '<Tab>'", { expr = true })
+vim.keymap.set("s", "<Tab>", "vsnip#jumpable(1)  ? '<Plug>(vsnip-jump-next)' : '<Tab>'", { expr = true })
+vim.keymap.set("i", "<S-Tab>", "vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<S-Tab>'", { expr = true })
+vim.keymap.set("s", "<S-Tab>", "vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<S-Tab>'", { expr = true })
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index 9dbdd38..c5abc38 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -1,32 +1,30 @@
-local cmd = vim.cmd
-local opt = vim.opt
-local g = vim.g
-
 -- sensible settings
-opt.autoread     = true
-opt.clipboard    = 'unnamedplus'
-opt.conceallevel = 0
-opt.hlsearch     = false
-opt.lazyredraw   = true
-opt.mouse        = 'a'
-opt.nu           = true
-opt.rnu          = true
-opt.scrolloff    = 10
-opt.shortmess    = 'c'
-opt.showcmd      = true
-opt.showmode     = false
-opt.sw           = 4
-opt.swapfile     = false
-opt.timeoutlen   = 500
-opt.ts           = 4
-opt.laststatus	 = 3
--- opt.wrap		 = false
+vim.opt.autoread = true
+vim.opt.clipboard = "unnamedplus"
+vim.opt.conceallevel = 0
+vim.opt.hlsearch = false
+vim.opt.lazyredraw = true
+vim.opt.mouse = "a"
+vim.opt.nu = true
+vim.opt.rnu = true
+vim.opt.scrolloff = 10
+vim.opt.shortmess = "c"
+vim.opt.showcmd = true
+vim.opt.showmode = false
+vim.opt.sw = 4
+vim.opt.swapfile = false
+vim.opt.timeoutlen = 500
+vim.opt.ts = 4
+vim.opt.laststatus = 3
 
--- :JsonFormat command using jq
-cmd 'autocmd FileType json :command! JsonFormat %!jq .'
+-- :jq command using jq
+vim.api.nvim_create_autocmd("FileType", {
+	pattern = "json",
+	command = ":command! JsonFormat %!jq",
+})
 
 -- trigger autoread on file change
-cmd "autocmd FocusGained,BufEnter,CursorHold,CursorHoldI * if mode() != 'c' | checktime | endif"
-
--- neovim-qt font
-opt.guifont = 'DejaVu\\ Sans\\ Mono:h14'
+vim.api.nvim_create_autocmd({ "FocusGained", "BufEnter", "CursorHold", "CursorHoldI" }, {
+	pattern = "*",
+	command = "if mode() != 'c' | checktime | endif",
+})
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 163d6cc..8db2e13 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -1,231 +1,268 @@
-require('packer').startup(function()
-	use 'wbthomason/packer.nvim'
+require("packer").startup(function()
+	use("wbthomason/packer.nvim")
 
 	--
 	-- LSP
 	--
-	
+
 	-- lspconfig
-	use {
-		'neovim/nvim-lspconfig',
-		event = 'BufEnter',
-		config = function() require('plugins.lsp') end
-	}
+	use({
+		"neovim/nvim-lspconfig",
+		event = "BufEnter",
+		config = function()
+			require("plugins.lsp")
+		end,
+	})
 
 	-- nvim lint
-	use {
-		'mfussenegger/nvim-lint',
-		event = 'BufWrite',
-		config = function() require('plugins.lint') end
-	}
+	use({
+		"mfussenegger/nvim-lint",
+		event = "BufWrite",
+		config = function()
+			require("plugins.lint")
+		end,
+	})
 
 	--
 	-- completion
 	--
 
 	-- cmp
-	use {
-		'hrsh7th/nvim-cmp',
-		event = 'InsertEnter',
-		config = function() require('plugins.cmp') end
-	}
-	use {
-		'hrsh7th/cmp-nvim-lsp',
-		after = 'nvim-cmp'
-	}
-	use {
-		'hrsh7th/cmp-vsnip',
-		after = 'nvim-cmp'
-	}
-	use {
-		'hrsh7th/cmp-buffer',
-		after = 'nvim-cmp'
-	}
-	use {
-		'hrsh7th/cmp-path',
-		after = 'nvim-cmp'
-	}
+	use({
+		"hrsh7th/nvim-cmp",
+		event = "InsertEnter",
+		config = function()
+			require("plugins.cmp")
+		end,
+	})
+	use({
+		"hrsh7th/cmp-nvim-lsp",
+		after = "nvim-cmp",
+	})
+	use({
+		"hrsh7th/cmp-vsnip",
+		after = "nvim-cmp",
+	})
+	use({
+		"hrsh7th/cmp-buffer",
+		after = "nvim-cmp",
+	})
+	use({
+		"hrsh7th/cmp-path",
+		after = "nvim-cmp",
+	})
 
 	-- snippets
-	use {
-		'hrsh7th/vim-vsnip',
-		after = 'nvim-cmp'
-	}
+	use({
+		"hrsh7th/vim-vsnip",
+		after = "nvim-cmp",
+	})
 
-	use {
-		'rafamadriz/friendly-snippets',
-		after = 'vim-vsnip'
-	}
+	use({
+		"rafamadriz/friendly-snippets",
+		after = "vim-vsnip",
+	})
 
 	-- lsp signature
-	use {
-		'ray-x/lsp_signature.nvim',
-		config = function() require('plugins.lspsignature') end
-	}
+	use({
+		"ray-x/lsp_signature.nvim",
+		config = function()
+			require("plugins.lspsignature")
+		end,
+	})
 
 	-- autopairs
-	use {
-		'windwp/nvim-autopairs',
-		after = 'nvim-cmp',
-		config = function() require('plugins.autopairs') end
-	}
+	use({
+		"windwp/nvim-autopairs",
+		after = "nvim-cmp",
+		config = function()
+			require("plugins.autopairs")
+		end,
+	})
 
 	-- treesitter
-	use {
-		'nvim-treesitter/nvim-treesitter',
-		event = 'BufEnter',
-		config = function() require('plugins.treesitter') end
-	}
+	use({
+		"nvim-treesitter/nvim-treesitter",
+		event = "BufEnter",
+		config = function()
+			require("plugins.treesitter")
+		end,
+	})
 
 	-- dap
-	use {
-		'mfussenegger/nvim-dap',
-		module = 'dap',
-		config = function() require('plugins.dap') end
-	}
-	use {
-		'nvim-telescope/telescope-dap.nvim',
-		after = 'nvim-dap'
-	}
-	use {
-		'rcarriga/nvim-dap-ui',
-		after = 'nvim-dap',
-		config = function() require('plugins.dapui') end
-	}
-	use {
-		'leoluz/nvim-dap-go',
-		after = 'nvim-dap',
-		config = function() require('plugins.dap-go') end
-	}
-	use {
-		'theHamsta/nvim-dap-virtual-text',
-		after = 'nvim-dap',
-		config = function() require('plugins.dap-virtual-text') end
-	}
+	use({
+		"mfussenegger/nvim-dap",
+		module = "dap",
+		config = function()
+			require("plugins.dap")
+		end,
+	})
+	use({
+		"nvim-telescope/telescope-dap.nvim",
+		after = "nvim-dap",
+	})
+	use({
+		"rcarriga/nvim-dap-ui",
+		after = "nvim-dap",
+		config = function()
+			require("plugins.dapui")
+		end,
+	})
+	use({
+		"leoluz/nvim-dap-go",
+		after = "nvim-dap",
+		config = function()
+			require("plugins.dap-go")
+		end,
+	})
+	use({
+		"theHamsta/nvim-dap-virtual-text",
+		after = "nvim-dap",
+		config = function()
+			require("plugins.dap-virtual-text")
+		end,
+	})
 
 	-- toggleterm
-	use {
-		'akinsho/toggleterm.nvim',
-		cmd = 'ToggleTerm*',
-		config = function() require('plugins.toggleterm') end
-	}
+	use({
+		"akinsho/toggleterm.nvim",
+		cmd = "ToggleTerm*",
+		config = function()
+			require("plugins.toggleterm")
+		end,
+	})
 
 	-- neoformat
-	use {
-		'sbdchd/neoformat', 
-		cmd = 'Neoformat',
-		config = function() require('plugins.neoformat') end
-	}
+	use({
+		"sbdchd/neoformat",
+		cmd = "Neoformat",
+		config = function()
+			require("plugins.neoformat")
+		end,
+	})
 
 	-- comment.nvim
-	use {
-		'numToStr/Comment.nvim',
-		event = 'BufRead',
-		config = function() require('plugins.comment') end
-	}
+	use({
+		"numToStr/Comment.nvim",
+		event = "BufRead",
+		config = function()
+			require("plugins.comment")
+		end,
+	})
 
 	-- fugitive
-	use {
-		'tpope/vim-fugitive', 
-	}
+	use({
+		"tpope/vim-fugitive",
+	})
 
 	--
 	-- files (and more)
 	--
 
 	-- telescope
-	use {
-		'nvim-telescope/telescope.nvim',
-		cmd = 'Telescope',
-		requires = {'nvim-lua/plenary.nvim'},
-		config = function() require('plugins.telescope') end
-	}
+	use({
+		"nvim-telescope/telescope.nvim",
+		cmd = "Telescope",
+		requires = { "nvim-lua/plenary.nvim" },
+		config = function()
+			require("plugins.telescope")
+		end,
+	})
 
 	-- nvim tree
-	use {
-		'kyazdani42/nvim-tree.lua',
-		requires = 'kyazdani42/nvim-web-devicons',
-		config = function() require('plugins.nvim-tree') end
-	}
+	use({
+		"kyazdani42/nvim-tree.lua",
+		requires = "kyazdani42/nvim-web-devicons",
+		config = function()
+			require("plugins.nvim-tree")
+		end,
+	})
 
 	--
 	-- looks
 	--
 
 	-- lualine
-	use {
-		'hoob3rt/lualine.nvim',
-		config = function() require('plugins.lualine') end
-	}
+	use({
+		"hoob3rt/lualine.nvim",
+		config = function()
+			require("plugins.lualine")
+		end,
+	})
 
 	--
 	-- colorscheme
 	--
 
-	use {
-		-- 'crusoexia/vim-monokai', 
-		'dylanaraps/wal.vim',
-		after = 'nvim-treesitter'
-	}
+	use({
+		-- 'crusoexia/vim-monokai',
+		"dylanaraps/wal.vim",
+		after = "nvim-treesitter",
+	})
 
 	--
 	-- qol
 	--
 
 	-- blankline
-	use {
-		'lukas-reineke/indent-blankline.nvim',
-		event = 'VimEnter'
-	}
+	use({
+		"lukas-reineke/indent-blankline.nvim",
+		event = "VimEnter",
+	})
 
 	-- highlight yank
-	use {
-		'machakann/vim-highlightedyank', 
-		event = 'TextYankPost'
-	}
+	use({
+		"machakann/vim-highlightedyank",
+		event = "TextYankPost",
+	})
 
 	-- tabular
-	use {
-		'godlygeek/tabular', 
-		cmd = 'Tabularize'
-	}
+	use({
+		"godlygeek/tabular",
+		cmd = "Tabularize",
+	})
 
 	-- maximizer
-	use {
-		'szw/vim-maximizer', 
-		cmd = 'MaximizerToggle'
-	}
+	use({
+		"szw/vim-maximizer",
+		cmd = "MaximizerToggle",
+	})
 
 	-- whichkey
-	use {
-		'folke/which-key.nvim',
-		config = function() require('plugins.whichkey') end
-	}
+	use({
+		"folke/which-key.nvim",
+		config = function()
+			require("plugins.whichkey")
+		end,
+	})
 
 	--
 	-- filetype specific
 	--
 
 	-- csv
-	use {
-		'chrisbra/csv.vim', 
-		ft = 'csv'
-	}
+	use({
+		"chrisbra/csv.vim",
+		ft = "csv",
+	})
 
 	-- latex
-	use {
-		'lervag/vimtex', 
-		ft = 'tex',
-		config = function() require('plugins.vimtex') end
-	}
+	use({
+		"lervag/vimtex",
+		ft = "tex",
+		config = function()
+			require("plugins.vimtex")
+		end,
+	})
 
 	--
 	-- misc
 	--
 
-	use {
-		'vimwiki/vimwiki',
-		config = function() require('plugins.vimwiki') end
-	}
-
+	use({
+		"vimwiki/vimwiki",
+		config = function()
+			require("plugins.vimwiki")
+		end,
+	})
 end)
diff --git a/.config/nvim/lua/plugins/autopairs.lua b/.config/nvim/lua/plugins/autopairs.lua
index 701c0ee..f188c46 100644
--- a/.config/nvim/lua/plugins/autopairs.lua
+++ b/.config/nvim/lua/plugins/autopairs.lua
@@ -1,6 +1,6 @@
 -- autopairs
-require('nvim-autopairs').setup{}
+require("nvim-autopairs").setup({})
 -- insert () after selecting functions
-local cmp_autopairs = require('nvim-autopairs.completion.cmp')
-local cmp = require('cmp')
-cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = '' } }))
+local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+local cmp = require("cmp")
+cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))
diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
index 85bb0ae..671f31d 100644
--- a/.config/nvim/lua/plugins/cmp.lua
+++ b/.config/nvim/lua/plugins/cmp.lua
@@ -1,6 +1,6 @@
-vim.opt.completeopt = { 'menuone', 'noselect' }
+vim.opt.completeopt = { "menuone", "noselect" }
 
-local cmp = require'cmp'
+local cmp = require("cmp")
 
 cmp.setup({
 	snippet = {
@@ -11,19 +11,19 @@ cmp.setup({
 	mapping = {
 		-- ['<C-n>'] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
 		-- ['<C-p>'] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
-		['<C-n>'] = cmp.mapping.select_next_item(),
-		['<C-p>'] = cmp.mapping.select_prev_item(),
-		['<C-Space>'] = cmp.mapping.complete(),
-		['<C-e>'] = cmp.mapping.close(),
-		['<CR>'] = cmp.mapping.confirm({
+		["<C-n>"] = cmp.mapping.select_next_item(),
+		["<C-p>"] = cmp.mapping.select_prev_item(),
+		["<C-Space>"] = cmp.mapping.complete(),
+		["<C-e>"] = cmp.mapping.close(),
+		["<CR>"] = cmp.mapping.confirm({
 			behavior = cmp.ConfirmBehavior.Replace,
-			select = false
-		})
+			select = false,
+		}),
 	},
 	sources = {
-		{ name = 'path' },
-		{ name = 'nvim_lsp' },
-		{ name = 'buffer' },
-		{ name = 'vsnip' }
-	}
+		{ name = "path" },
+		{ name = "nvim_lsp" },
+		{ name = "buffer" },
+		{ name = "vsnip" },
+	},
 })
diff --git a/.config/nvim/lua/plugins/dap-go.lua b/.config/nvim/lua/plugins/dap-go.lua
index 94ba7d5..1ec449a 100644
--- a/.config/nvim/lua/plugins/dap-go.lua
+++ b/.config/nvim/lua/plugins/dap-go.lua
@@ -1 +1 @@
-require ('dap-go').setup()
+require("dap-go").setup()
diff --git a/.config/nvim/lua/plugins/dap-virtual-text.lua b/.config/nvim/lua/plugins/dap-virtual-text.lua
index 731af1d..4870599 100644
--- a/.config/nvim/lua/plugins/dap-virtual-text.lua
+++ b/.config/nvim/lua/plugins/dap-virtual-text.lua
@@ -1 +1 @@
-require'nvim-dap-virtual-text'.setup()
+require("nvim-dap-virtual-text").setup()
diff --git a/.config/nvim/lua/plugins/dap.lua b/.config/nvim/lua/plugins/dap.lua
index 8bebde3..bf54675 100644
--- a/.config/nvim/lua/plugins/dap.lua
+++ b/.config/nvim/lua/plugins/dap.lua
@@ -1,32 +1,32 @@
-local dap = require('dap')
+local dap = require("dap")
 
 --
 -- python
 --
 
 dap.adapters.python = {
-	type = 'executable';
-	command = 'python';
-	args = { '-m', 'debugpy.adapter' };
+	type = "executable",
+	command = "python",
+	args = { "-m", "debugpy.adapter" },
 }
 
 dap.configurations.python = {
 	{
-		type = 'python';
-		request = 'launch';
-		name = "Launch file";
+		type = "python",
+		request = "launch",
+		name = "Launch file",
 
-		program = "${file}";
+		program = "${file}",
 		pythonPath = function()
 			local cwd = vim.fn.getcwd()
-			if vim.fn.executable(cwd .. '/venv/bin/python') == 1 then
-				return cwd .. '/venv/bin/python'
-			elseif vim.fn.executable(cwd .. '/.venv/bin/python') == 1 then
-				return cwd .. '/.venv/bin/python'
+			if vim.fn.executable(cwd .. "/venv/bin/python") == 1 then
+				return cwd .. "/venv/bin/python"
+			elseif vim.fn.executable(cwd .. "/.venv/bin/python") == 1 then
+				return cwd .. "/.venv/bin/python"
 			else
-				return '/usr/bin/python'
+				return "/usr/bin/python"
 			end
-		end;
+		end,
 	},
 }
 
@@ -35,9 +35,9 @@ dap.configurations.python = {
 --
 
 dap.adapters.lldb = {
-	type = 'executable',
-	command = '/usr/bin/lldb-vscode',
-	name = "lldb"
+	type = "executable",
+	command = "/usr/bin/lldb-vscode",
+	name = "lldb",
 }
 
 dap.configurations.c = {
@@ -46,9 +46,9 @@ dap.configurations.c = {
 		type = "lldb",
 		request = "launch",
 		program = function()
-			return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
+			return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
 		end,
-		cwd = '${workspaceFolder}',
+		cwd = "${workspaceFolder}",
 		stopOnEntry = false,
 		args = {},
 
diff --git a/.config/nvim/lua/plugins/lint.lua b/.config/nvim/lua/plugins/lint.lua
index 80c8b40..64888fa 100644
--- a/.config/nvim/lua/plugins/lint.lua
+++ b/.config/nvim/lua/plugins/lint.lua
@@ -1,5 +1,5 @@
-require('lint').linters_by_ft = {    
-	python = {'mypy'}    
-}       
+require("lint").linters_by_ft = {
+	python = { "mypy" },
+}
 
 vim.cmd("au BufWrite <buffer> lua require('lint').try_lint()")
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index e6ff25d..3fd673c 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -1,16 +1,16 @@
-local lsp = require('lspconfig')
+local lsp = require("lspconfig")
 
 -- language servers
-lsp.pyright.setup{
+lsp.pyright.setup({
 	settings = {
 		python = {
 			analysis = {
-				typeCheckingMode = "off"
-			}
-		}
-	}
-}
-lsp.gopls.setup{}
-lsp.clangd.setup{}
-lsp.texlab.setup{}
-lsp.rust_analyzer.setup{}
+				typeCheckingMode = "off",
+			},
+		},
+	},
+})
+lsp.gopls.setup({})
+lsp.clangd.setup({})
+lsp.texlab.setup({})
+lsp.rust_analyzer.setup({})
diff --git a/.config/nvim/lua/plugins/lspsignature.lua b/.config/nvim/lua/plugins/lspsignature.lua
index 1293752..d9348ff 100644
--- a/.config/nvim/lua/plugins/lspsignature.lua
+++ b/.config/nvim/lua/plugins/lspsignature.lua
@@ -1,8 +1,8 @@
 cfg = {
 	hint_prefix = " ",
 	handler_opts = {
-		border = "none"
+		border = "none",
 	},
 }
 
-require "lsp_signature".setup(cfg)
+require("lsp_signature").setup(cfg)
diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
index 78971f3..35f8193 100644
--- a/.config/nvim/lua/plugins/lualine.lua
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -1,8 +1,8 @@
 -- lualine colorscheme
-require('lualine').setup{
-	options = { 
-		theme = 'auto',
-		section_separators = {'', ''},
-		component_separators = {'', ''}
-	}
-}
+require("lualine").setup({
+	options = {
+		theme = "auto",
+		section_separators = { "", "" },
+		component_separators = { "", "" },
+	},
+})
diff --git a/.config/nvim/lua/plugins/neoformat.lua b/.config/nvim/lua/plugins/neoformat.lua
index ab69712..ee8dd1a 100644
--- a/.config/nvim/lua/plugins/neoformat.lua
+++ b/.config/nvim/lua/plugins/neoformat.lua
@@ -1 +1 @@
-vim.g.neoformat_enabled_python = {'yapf'}
+vim.g.neoformat_enabled_python = { "yapf" }
diff --git a/.config/nvim/lua/plugins/nvim-tree.lua b/.config/nvim/lua/plugins/nvim-tree.lua
index ebedcca..3be86c8 100644
--- a/.config/nvim/lua/plugins/nvim-tree.lua
+++ b/.config/nvim/lua/plugins/nvim-tree.lua
@@ -1,9 +1,13 @@
 -- nvim tree
-require'nvim-tree'.setup{
+require("nvim-tree").setup({
 	update_cwd = true,
 	diagnostics = {
 		enable = true,
 	},
-}
+})
 
-vim.cmd("autocmd BufEnter * ++nested if winnr('$') == 1 && bufname() == 'NvimTree_' . tabpagenr() | quit | endif")
+-- close tab/vim when nvim-tree is the last window in the tab
+vim.api.nvim_create_autocmd("BufEnter", {
+	pattern = "*",
+	command = "if winnr('$') == 1 && bufname() == 'NvimTree_' . tabpagenr() | quit | endif",
+})
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index 9d513ea..49599b1 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -1,8 +1,8 @@
 -- telescope settings
-require('telescope').setup{
+require("telescope").setup({
 	defaults = {
 		-- sorting
-		file_sorter = require'telescope.sorters'.get_fzy_sorter,
-		generic_sorter = require'telescope.sorters'.get_fzy_sorter,
-	}
-}
+		file_sorter = require("telescope.sorters").get_fzy_sorter,
+		generic_sorter = require("telescope.sorters").get_fzy_sorter,
+	},
+})
diff --git a/.config/nvim/lua/plugins/toggleterm.lua b/.config/nvim/lua/plugins/toggleterm.lua
index 3809e0e..760ba3e 100644
--- a/.config/nvim/lua/plugins/toggleterm.lua
+++ b/.config/nvim/lua/plugins/toggleterm.lua
@@ -1,2 +1,2 @@
 vim.o.hidden = true
-require("toggleterm").setup{}
+require("toggleterm").setup({})
diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
index 218f51b..7592aa4 100644
--- a/.config/nvim/lua/plugins/treesitter.lua
+++ b/.config/nvim/lua/plugins/treesitter.lua
@@ -1,5 +1,5 @@
-require'nvim-treesitter.configs'.setup {
+require("nvim-treesitter.configs").setup({
 	highlight = {
 		enable = true,
 	},
-}
+})
diff --git a/.config/nvim/lua/plugins/vimtex.lua b/.config/nvim/lua/plugins/vimtex.lua
index 4071b87..16eb7cf 100644
--- a/.config/nvim/lua/plugins/vimtex.lua
+++ b/.config/nvim/lua/plugins/vimtex.lua
@@ -1,5 +1,5 @@
 -- ignore certain errors
-vim.g.vimtex_quickfix_ignore_filters = { 'Underfull', 'Overfull', 'babel' }
+vim.g.vimtex_quickfix_ignore_filters = { "Underfull", "Overfull", "babel" }
 
 -- use zathura as the pdf viewer
-vim.g.vimtex_view_general_viewer = 'zathura'
+vim.g.vimtex_view_general_viewer = "zathura"
diff --git a/.config/nvim/lua/plugins/whichkey.lua b/.config/nvim/lua/plugins/whichkey.lua
index a6d91e2..e09d890 100644
--- a/.config/nvim/lua/plugins/whichkey.lua
+++ b/.config/nvim/lua/plugins/whichkey.lua
@@ -2,7 +2,7 @@ local wk = require("which-key")
 wk.register({
 	a = {
 		name = "Actions",
-		r = "Reload Config"
+		r = "Reload Config",
 	},
 	d = {
 		name = "Debug",
@@ -16,7 +16,7 @@ wk.register({
 		p = "List Breakpoints",
 		q = "Stop",
 		u = "Toggle UI",
-		v = "Show Variables"
+		v = "Show Variables",
 	},
 	g = {
 		name = "Language",
@@ -30,7 +30,7 @@ wk.register({
 		n = "Rename",
 		q = "Show Diagnostics",
 		r = "Show References",
-		t = "Show Type Definition"
+		t = "Show Type Definition",
 	},
 	s = {
 		name = "Splits & Buffers",
@@ -68,6 +68,6 @@ wk.register({
 	l = "Right Split",
 	q = "Quit",
 	s = "Save",
-	x = "Quit Without Saving"
+	x = "Quit Without Saving",
 }, { prefix = "<leader>" })
-wk.setup{}
+wk.setup({})