formatting

init.lua

@@ -1,5 +1,5 @@
-require "options"
+require("options")
-require "keymaps"
+require("keymaps")
 
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
@@ -11,7 +11,7 @@ if not vim.loop.fs_stat(lazypath) then
 		"--branch=stable", -- latest stable release
 		lazypath,
 	})
-  if vim.api.nvim_get_vvar "shell_error" ~= 0 then
+	if vim.api.nvim_get_vvar("shell_error") ~= 0 then
 		vim.api.nvim_err_writeln("Error cloning lazy.nvim repository...\n\n" .. output)
 	end
 end
@@ -20,10 +20,9 @@ vim.opt.rtp:prepend(lazypath)
 require("lazy").setup("plugins", {
 	change_detection = {
 		enabled = false,
-	}
+	},
 })
 
-vim.cmd 'colorscheme material'
+vim.cmd("colorscheme material")
-require "tools"
+require("tools")
-require "autocommands"
+require("autocommands")
-

lua/autocommands.lua

@@ -1,5 +1,7 @@
 function isEmpty()
-  return vim.api.nvim_buf_get_name(0) == "" or vim.fn.filereadable(vim.api.nvim_buf_get_name(0)) == 0 or vim.fn.line('$') == 1 and vim.fn.col('$') == 1
+	return vim.api.nvim_buf_get_name(0) == ""
+		or vim.fn.filereadable(vim.api.nvim_buf_get_name(0)) == 0
+		or vim.fn.line("$") == 1 and vim.fn.col("$") == 1
 end
 
 --vim.api.nvim_create_autocmd({ "VimEnter" }, {
@@ -10,19 +12,19 @@ end
 --  end
 --})
 
-vim.api.nvim_create_autocmd('BufRead', {
+vim.api.nvim_create_autocmd("BufRead", {
 	pattern = ".env*",
-  command = "set filetype=sh"
+	command = "set filetype=sh",
 })
 
-vim.api.nvim_create_autocmd('BufRead', {
+vim.api.nvim_create_autocmd("BufRead", {
 	pattern = ".*rc",
-  command = "set filetype=sh"
+	command = "set filetype=sh",
 })
 
-vim.api.nvim_create_autocmd('BufRead', {
+vim.api.nvim_create_autocmd("BufRead", {
 	pattern = "Dockerfile.*",
-  command = "set filetype=dockerfile"
+	command = "set filetype=dockerfile",
 })
 
 vim.api.nvim_create_autocmd("BufRead", {

lua/keymaps.lua

@@ -11,15 +11,17 @@ vim.g.maplocalleader = " "
 --   term_mode = "t",
 --   command_mode = "c",
 
-require('util').keymaps({
+require("util").keymaps({
 	n = {
 		[";"] = { ":", desc = "No shift command mode" },
 		["n"] = { "nzzzv", desc = "Next search result centered" },
 		["N"] = { "Nzzzv", desc = "Previous search result centered" },
 		["<esc>"] = { ":noh<CR><esc>", desc = "Clear search on escape" },
 		["<return>"] = { ":noh<CR><return>", desc = "Clear search on return" },
+		["<leader>a"] = { "ggVG", desc = "Select all" },
 		["<leader>w"] = { "<cmd>w<cr>", desc = "Save" },
 		["<leader>q"] = { "<cmd>confirm q<cr>", desc = "Quit" },
+		["<leader>cq"] = { "<cmd>bd<cr>", desc = "Close current buffer" },
 		["|"] = { "<cmd>vsplit<cr>", desc = "Vertical Split" },
 		["\\"] = { "<cmd>split<cr>", desc = "Horizontal Split" },
 		["<C-d>"] = { "<C-d>zz", desc = "Vertical half page down and center cursor" },
@@ -34,9 +36,24 @@ require('util').keymaps({
 		["<C-k>"] = { "<C-w>k", desc = "Move window above current" },
 		["<C-l>"] = { "<C-w>l", desc = "Move window right current" },
 		-- reformat LSP
-    ["<leader>lf"] = { function() vim.lsp.buf.format() end, desc = "Reformat file" },
+		["<leader>lf"] = {
-    ["<leader>ld"] = { function() vim.diagnostic.open_float() end, desc = "Show diagnostic message"},
+			function()
-    ["<leader>ll"] = { function() vim.diagnostic.setloclist() end, desc = "Show diagnostic list"},
+				vim.lsp.buf.format()
+			end,
+			desc = "Reformat file",
+		},
+		["<leader>ld"] = {
+			function()
+				vim.diagnostic.open_float()
+			end,
+			desc = "Show diagnostic message",
+		},
+		["<leader>ll"] = {
+			function()
+				vim.diagnostic.setloclist()
+			end,
+			desc = "Show diagnostic list",
+		},
 		["<leader>lz"] = { ":LspRestart<CR>", desc = "Restart LSP Server" },
 	},
 	v = {
@@ -69,5 +86,3 @@ require('util').keymaps({
 		["<Esc>"] = { "<C-\\><C-n>", desc = "Escape the terminal" },
 	},
 })
-
-

lua/options.lua

@@ -43,6 +43,6 @@ vim.opt.splitright = true
 
 -- Set completeopt to have a better completion experience
 vim.o.completeopt = "menuone,noselect"
-vim.diagnostic.config{
+vim.diagnostic.config({
-  float={border="single"}
+	float = { border = "single" },
-}
+})

lua/plugins/README.md

@@ -1,4 +1,5 @@
 # Plugins to look into
+
 - https://github.com/lvimuser/lsp-inlayhints.nvim/tree/anticonceal
 - https://github.com/theHamsta/nvim-dap-virtual-text/tree/inline-text
 - https://github.com/andythigpen/nvim-coverage
@@ -21,4 +22,3 @@
 - https://github.com/numToStr/Comment.nvim
 - https://github.com/windwp/nvim-autopairs
 - https://github.com/lukas-reineke/indent-blankline.nvim
-

lua/plugins/auto-save.lua

@@ -5,11 +5,14 @@ return {
 		trigger_events = { "InsertLeave", "TextChanged", "TextChangedI", "BufLeave" },
 		condition = function(buf)
 			local disallowed_filetypes = { "TelescopePrompt" }
-      local utils = require('auto-save.utils.data')
+			local utils = require("auto-save.utils.data")
-      if vim.fn.getbufvar(buf, "&modifiable") == 1 and utils.not_in(vim.fn.getbufvar(buf, "&filetype"), disallowed_filetypes) then
+			if
+				vim.fn.getbufvar(buf, "&modifiable") == 1
+				and utils.not_in(vim.fn.getbufvar(buf, "&filetype"), disallowed_filetypes)
+			then
 				return true
 			end
 			return false
-    end
+		end,
-  }
+	},
 }

lua/plugins/colorpicker_ccc.lua

@@ -2,6 +2,6 @@ return {
 	"uga-rosa/ccc.nvim",
 	event = "BufRead",
 	keys = {
-		{ "<leader>cp", ":CccPick <CR>", desc = "Color Picker" }
+		{ "<leader>cp", ":CccPick <CR>", desc = "Color Picker" },
 	},
 }

lua/plugins/comments.lua

@@ -1,10 +1,15 @@
 vim.g.NERDCreateDefaultMappings = 0
-vim.cmd('filetype plugin on')
+vim.cmd("filetype plugin on")
 
 return {
 	"preservim/nerdcommenter",
 	keys = {
 		{ "<leader>/", ':call nerdcommenter#Comment(0, "toggle")<CR>', desc = "Toggle comments on selection" },
-    { "<leader>/", ':call nerdcommenter#Comment(0, "toggle")<CR>', desc = "Toggle comments on selection", mode = "v" },
+		{
+			"<leader>/",
+			':call nerdcommenter#Comment(0, "toggle")<CR>',
+			desc = "Toggle comments on selection",
+			mode = "v",
+		},
 	},
 }

lua/plugins/http_rest.lua

@@ -3,6 +3,12 @@ return {
 	event = "BufEnter *.http",
 	requires = { "nvim-lua/plenary.nvim" },
 	keys = {
-		{ "<leader>r",  function() require("rest-nvim").run() end, desc = "Send selected http request" }
+		{
-	}
+			"<leader>r",
+			function()
+				require("rest-nvim").run()
+			end,
+			desc = "Send selected http request",
+		},
+	},
 }

lua/plugins/neo-tree.lua

@@ -2,9 +2,11 @@ return {
 	"nvim-neo-tree/neo-tree.nvim",
 	dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
 	cmd = "Neotree",
-	init = function() vim.g.neo_tree_remove_legacy_commands = true end,
+	init = function()
+		vim.g.neo_tree_remove_legacy_commands = true
+	end,
 	pin = true,
-	tag = '2.56',
+	tag = "2.56",
 	opts = {
 		auto_clean_after_session_restore = true,
 		close_if_last_window = true,
@@ -30,13 +32,16 @@ return {
 	},
 	keys = {
 		{ "<leader>e", "<cmd>Neotree toggle<CR>", desc = "Toggle Explorer" },
-		{ "<leader>o",function()
+		{
+			"<leader>o",
+			function()
 				if vim.bo.filetype == "neo-tree" then
-				vim.cmd.wincmd "p"
+					vim.cmd.wincmd("p")
 				else
-				vim.cmd.Neotree "focus"
+					vim.cmd.Neotree("focus")
 				end
-		end , desc = "Toggle Explorer Focus" },
+			end,
+			desc = "Toggle Explorer Focus",
+		},
 	},
 }
-

lua/plugins/null-ls.lua

@@ -19,7 +19,6 @@ return {
 		"jose-elias-alvarez/null-ls.nvim",
 		after = { "williamboman/mason.nvim" },
 		opts = function(_, config)
-
 			-- config variable is the default definitions table for the setup function call
 			local null_ls = require("null-ls")
 
@@ -54,7 +53,7 @@ return {
 	{
 		"jay-babu/mason-null-ls.nvim",
 		opts = {
-      ensure_installed = { "rustfmt", "stylelua", "prettier", "black" }
+			ensure_installed = { "rustfmt", "stylelua", "prettier", "black" },
-    }
+		},
-  }
+	},
 }

lua/plugins/open-github.lua

@@ -2,6 +2,6 @@ return {
 	"Almo7aya/openingh.nvim",
 	event = "BufEnter",
 	keys = {
-		{ "<leader>gf", ":OpenInGHFile <CR>", desc = "Open in git" }
+		{ "<leader>gf", ":OpenInGHFile <CR>", desc = "Open in git" },
 	},
 }

lua/plugins/telescope.lua

@@ -1,19 +1,55 @@
 return {
 	"nvim-telescope/telescope.nvim",
-  tag = '0.1.1',
+	tag = "0.1.1",
 	dependencies = {
 		{ "nvim-lua/plenary.nvim" },
-    { "nvim-telescope/telescope-fzf-native.nvim", enabled = vim.fn.executable "make" == 1, build = "make" },
+		{ "nvim-telescope/telescope-fzf-native.nvim", enabled = vim.fn.executable("make") == 1, build = "make" },
 	},
 	cmd = "Telescope",
 	keys = {
 		{ "<leader>f", "<Nop>", desc = "Find ..." },
-    { "<leader>ff", function() require('telescope.builtin').find_files() end, desc = "Find Files" },
+		{
-    { "<leader>fg", function() require('telescope.builtin').git_files() end, desc = "Find Git only Files" },
+			"<leader>ff",
-    { "<leader>fw", function() require('telescope.builtin').live_grep() end, desc = "Find Words" },
+			function()
-    { "<leader>fc", function() require('telescope.builtin').commands() end, desc = "Find Commands" },
+				require("telescope.builtin").find_files()
-    { "<leader>fk", function() require('telescope.builtin').keymaps() end, desc = "Find Commands" },
+			end,
-    { "<leader>fb", function() require('telescope.builtin').buffers() end, desc = "Find Commands" },
+			desc = "Find Files",
+		},
+		{
+			"<leader>fg",
+			function()
+				require("telescope.builtin").git_files()
+			end,
+			desc = "Find Git only Files",
+		},
+		{
+			"<leader>fw",
+			function()
+				require("telescope.builtin").live_grep()
+			end,
+			desc = "Find Words",
+		},
+		{
+			"<leader>fc",
+			function()
+				require("telescope.builtin").commands()
+			end,
+			desc = "Find Commands",
+		},
+		{
+			"<leader>fk",
+			function()
+				require("telescope.builtin").keymaps()
+			end,
+			desc = "Find Commands",
+		},
+		{
+			"<leader>fb",
+			function()
+				require("telescope.builtin").buffers()
+			end,
+			desc = "Find Commands",
+		},
 	},
 	opts = {
 		defaults = {
@@ -26,7 +62,7 @@ return {
 				"--line-number",
 				"--column",
 				"--smart-case",
-      }
+			},
-    }
+		},
 	},
 }

lua/plugins/theme_material.lua

@@ -2,7 +2,7 @@ return {
 	"marko-cerovac/material.nvim",
 	config = function()
 		vim.g.material_style = "darker"
-		require("material").setup {
+		require("material").setup({
 			plugins = {
 				"dashboard",
 				"gitsigns",
@@ -11,8 +11,8 @@ return {
 				"which-key",
 			},
 			high_visibility = {
-				darker = true
+				darker = true,
-			}
+			},
-		}
+		})
-	end
+	end,
 }

lua/plugins/undotree.lua

@@ -5,4 +5,3 @@ return {
 		{ "<leader>u", vim.cmd.UndotreeToggle, desc = "Undo Tree Toggle" },
 	},
 }
-

lua/plugins/util_plenary.lua

@@ -1,4 +1,3 @@
 return {
 	"nvim-lua/plenary.nvim",
 }
-

lua/plugins_disabled/cmp.lua

@@ -35,11 +35,9 @@ return {
 			{ "hrsh7th/cmp-nvim-lsp" },
 		},
 		config = function()
-
 			vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic message" })
 			vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { desc = "Go to next diagnostic message" })
 
-
 			local cmp = require("cmp")
 			local snip_status_ok, luasnip = pcall(require, "luasnip")
 			local lspkind_status_ok, lspkind = pcall(require, "lspkind")
@@ -133,6 +131,6 @@ return {
 	},
 	{
 		"folke/neodev.nvim",
-    opts = {}
+		opts = {},
-  }
+	},
 }

lua/plugins_disabled/lsp-zero.lua

@@ -61,7 +61,6 @@ return {
 		local config = require("lspconfig")
 		local util = require("lspconfig/util")
 
-
 		local capabilities = require("cmp_nvim_lsp").default_capabilities()
 		capabilities = vim.tbl_deep_extend("keep", capabilities, vim.lsp.protocol.make_client_capabilities())
 		capabilities.textDocument.completion.completionItem = {
@@ -89,7 +88,9 @@ return {
 			lsp.default_keymaps({ buffer = bufnr })
 
 			local opts = { buffer = bufnr }
-      local bind = function(map, cmd, mode) vim.keymap.set('n', map, cmd, opts) end
+			local bind = function(map, cmd, mode)
+				vim.keymap.set("n", map, cmd, opts)
+			end
 
 			-- diagnostics
 			bind("<leader>ld", "<cmd>lua vim.diagnostic.open_float()<CR>")
@@ -122,27 +123,27 @@ return {
 		}
 		lsp.ensure_installed(servers)
 
-    local default = require('util').spread {
+		local default = require("util").spread({
 			on_attach = on_attach,
 			capabilities = capabilities,
-    }
+		})
 
 		config.lua_ls.setup(lsp.nvim_lua_ls())
 
-		config.rust_analyzer.setup(default {})
+		config.rust_analyzer.setup(default({}))
 
-		config.tsserver.setup(default {
+		config.tsserver.setup(default({
 			root_dir = util.root_pattern("tsconfig.json", ".git"),
-		})
+		}))
-		config.html.setup(default {})
+		config.html.setup(default({}))
-		config.eslint.setup(default {})
+		config.eslint.setup(default({}))
-		config.cssls.setup(default {})
+		config.cssls.setup(default({}))
-		config.cssmodules_ls.setup(default {})
+		config.cssmodules_ls.setup(default({}))
 
-		config.pyright.setup(default {})
+		config.pyright.setup(default({}))
 
-		config.dockerls.setup(default {})
+		config.dockerls.setup(default({}))
-		config.docker_compose_language_service.setup(default {})
+		config.docker_compose_language_service.setup(default({}))
 
 		lsp.setup()
 

lua/plugins_disabled/tabstops_sleuth.lua

@@ -1,3 +1,3 @@
 return {
-  'tpope/vim-sleuth',
+	"tpope/vim-sleuth",
 }

lua/tools/init.lua

@@ -1,8 +1,7 @@
 -- Autoload all files in this tools dir, minus this init again
-for _, file in ipairs(vim.fn.readdir(vim.fn.stdpath('config')..'/lua/tools', [[v:val =~ '\.lua$']])) do
+for _, file in ipairs(vim.fn.readdir(vim.fn.stdpath("config") .. "/lua/tools", [[v:val =~ '\.lua$']])) do
 	if file ~= "init.lua" then
 		local tool = string.sub(file, 0, -5)
-		require('tools.' .. tool)
+		require("tools." .. tool)
 	end
 end
-

lua/tools/scratch-files.lua

@@ -1,37 +1,71 @@
 -- Scratch files
 local scratch = function(extension)
-  os.execute "mkdir -p ~/dev/scratches/"
+	os.execute("mkdir -p ~/dev/scratches/")
-  local date = os.date "%Y-%m-%dT%H:%M:%S"
+	local date = os.date("%Y-%m-%dT%H:%M:%S")
 	local filepath = "~/dev/scratches/scratch_" .. date .. extension
 	vim.cmd("execute 'edit " .. filepath .. "'")
 end
 
-require('util').keymaps({
+require("util").keymaps({
 	n = {
 		["<leader>fsw"] = {
 			function()
-				require("telescope.builtin").live_grep {
+				require("telescope.builtin").live_grep({
 					search_dirs = { "~/dev/scratches/" },
-				}
+				})
 			end,
 			desc = "Find Words in Scratches",
 		},
 		["<leader>fsf"] = {
 			function()
-				require("telescope.builtin").find_files{
+				require("telescope.builtin").find_files({
 					search_dirs = { "~/dev/scratches/" },
-				}
+				})
 			end,
 			desc = "Find Scratches",
 		},
 		["<leader>s"] = { "<Nop>", desc = "Scratch File" },
-		["<leader>ss"] = { function() scratch ".txt" end, desc = "New text scratch file" },
+		["<leader>ss"] = {
-		["<leader>sn"] = { function() scratch ".json" end, desc = "New json scratch file" },
+			function()
-		["<leader>sm"] = { function() scratch ".md" end, desc = "New markdown scratch file" },
+				scratch(".txt")
-		["<leader>sq"] = { function() scratch ".sql" end, desc = "New sql scratch file" },
+			end,
-		["<leader>st"] = { function() scratch ".ts" end, desc = "New ts scratch file" },
+			desc = "New text scratch file",
-		["<leader>sb"] = { function() scratch ".sh" end, desc = "New shell scratch file" },
+		},
-		["<leader>sj"] = { function() scratch ".js" end, desc = "New js scratch file" },
+		["<leader>sn"] = {
-	}
+			function()
+				scratch(".json")
+			end,
+			desc = "New json scratch file",
+		},
+		["<leader>sm"] = {
+			function()
+				scratch(".md")
+			end,
+			desc = "New markdown scratch file",
+		},
+		["<leader>sq"] = {
+			function()
+				scratch(".sql")
+			end,
+			desc = "New sql scratch file",
+		},
+		["<leader>st"] = {
+			function()
+				scratch(".ts")
+			end,
+			desc = "New ts scratch file",
+		},
+		["<leader>sb"] = {
+			function()
+				scratch(".sh")
+			end,
+			desc = "New shell scratch file",
+		},
+		["<leader>sj"] = {
+			function()
+				scratch(".js")
+			end,
+			desc = "New js scratch file",
+		},
+	},
 })
-

lua/util.lua

@@ -1,4 +1,4 @@
-local M = {};
+local M = {}
 
 function M.keymaps(mappings)
 	for mode, maps in pairs(mappings) do
@@ -35,4 +35,3 @@ function M.spread(template)
 end
 
 return M
-