🦄org: now using an org document to configure nvim.

I know I messed up

12 files changed, 152 insertions, 220 deletions

diff --git a/init.lua b/init.lua
index 93a110d..b9e5a1c 100644
--- a/init.lua
+++ b/init.lua
@@ -1,15 +1,3 @@
-
---  ███╗   ██╗███████╗ ██████╗ ██╗   ██╗██╗███╗   ███╗
---  ████╗  ██║██╔════╝██╔═══██╗██║   ██║██║████╗ ████║
---  ██╔██╗ ██║█████╗  ██║   ██║██║   ██║██║██╔████╔██║
---  ██║╚██╗██║██╔══╝  ██║   ██║╚██╗ ██╔╝██║██║╚██╔╝██║     ┓     ┓┏┓╹    ┓
---  ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║  ┏┓┏┫┏┓┏┳┓┃ ┫ ┏  ┏┫┏┓╋┏
---  ╚═╝  ╚═══╝╚══════╝ ╚═════╝   ╚═══╝  ╚═╝╚═╝     ╚═╝  ┛┗┗┻┣┛┛┗┗┻┗┛ ┛  ┗┻┗┛┗┛
---                                                          ┛
--- repository: https://git.ch-naseem.com/ndpm13/dotfiles.git
--- author: Naz <ndpm13@ch-naeseem.com>
--- license: MIT
-
 require("config.options")
 require("config.lazy")
 require("config.mappings")
diff --git a/lua/config/mappings.lua b/lua/config/mappings.lua
index 379f73d..c784378 100644
--- a/lua/config/mappings.lua
+++ b/lua/config/mappings.lua
@@ -1,85 +1,39 @@
--- general keymaps
-
 vim.api.nvim_set_keymap("n", "<leader>p", ":tabnext<CR>", { noremap = true, silent = true, desc = "Next Tab" })
-vim.api.nvim_set_keymap(
-  "n",
-  "<leader>n",
-  ":vsplit<CR>:wincmd l<CR>",
-  { noremap = true, silent = true, desc = "Split Right" }
-)
-vim.api.nvim_set_keymap(
-  "n",
-  "<leader>m",
-  ":split<CR>:wincmd j<CR>",
-  { noremap = true, silent = true, desc = "Split Down" }
-)
-vim.api.nvim_set_keymap("n", "<Esc>", ":noh<CR>", { noremap = true, silent = true, desc = "Clear Search" })
-
--- bufferline keymaps
-
-vim.api.nvim_set_keymap(
-  "n",
-  "<leader>C",
-  ":BufferLineCloseOthers<CR>",
-  { noremap = true, silent = true, desc = "Close Other Buffers" }
-)
-
--- nvim-dap keymaps
-
-vim.keymap.set("n", "<Leader>db", require("dap").toggle_breakpoint, { desc = "DAP Toggle Breakpoint" })
-vim.keymap.set("n", "<Leader>dc", require("dap").continue, { desc = "DAP Continue" })
-vim.keymap.set("n", "<Leader>dsv", require("dap").step_over, { desc = "DAP Step Over" })
-vim.keymap.set("n", "<Leader>dsi", require("dap").step_into, { desc = "DAP Step Into" })
-vim.keymap.set("n", "<Leader>dso", require("dap").step_out, { desc = "DAP Step Out" })
-
--- lsp keymaps
-
-vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "LSP Hover" })
-vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "LSP Definition" })
-vim.keymap.set("n", "er", vim.diagnostic.open_float, { desc = "LSP Diagnostics" })
-vim.keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, { desc = "LSP Code Action" })
-vim.keymap.set("n", "<leader>gf", vim.lsp.buf.format, { desc = "LSP Format" })
 
--- harpoon keymaps
+vim.api.nvim_set_keymap("n", "<Esc>", ":noh<CR>", { noremap = true, silent = true, desc = "Clear Search" })
 
 vim.keymap.set("n", "<leader>a", function()
   require("harpoon"):list():add()
 end, { desc = "Harpoon Add" })
+
 vim.keymap.set("n", "<leader>h", function()
   require("harpoon").ui:toggle_quick_menu(require("harpoon"):list())
 end, { desc = "Harpoon Menu" })
 
--- Toggle previous & next buffers stored within Harpoon list
--- vim.keymap.set("n", "<leader><S-P>", function()
---   require("harpoon"):list():prev({ ui_nav_wrap = true })
--- end, { desc = "Harpoon Previous" })
 vim.keymap.set("n", "<C-p>", function()
   require("harpoon"):list():next({ ui_nav_wrap = true })
 end, { desc = "Harpoon Next" })
 
--- neotree keymaps
+vim.keymap.set("n", "K", vim.lsp.buf.hover, { desc = "LSP Hover" })
+vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "LSP Definition" })
+vim.keymap.set("n", "er", vim.diagnostic.open_float, { desc = "LSP Diagnostics" })
+vim.keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, { desc = "LSP Code Action" })
+vim.keymap.set("n", "<leader>gf", vim.lsp.buf.format, { desc = "LSP Format" })
 
 vim.keymap.set("n", "<C-n>", ":Neotree filesystem toggle float<CR>", { desc = "Toggle Neotree Filesystem" })
-vim.keymap.set("n", "<C-b>", ":Neotree buffers toggle float<CR>", { desc = "Toggle Neotree Buffers" })
 
--- silicon keymaps
+vim.keymap.set("n", "<C-b>", ":Neotree buffers toggle float<CR>", { desc = "Toggle Neotree Buffers" })
 
 vim.api.nvim_set_keymap("v", "<leader>s", ":'<,'>Silicon<CR>", { noremap = true, silent = true, desc = "Silicon" })
 
--- telescope keymaps
-
 vim.keymap.set("n", "<leader>ff", require("telescope.builtin").find_files, { desc = "Find Files" })
 vim.keymap.set("n", "<leader>fg", require("telescope.builtin").live_grep, { desc = "Live Grep" })
 vim.keymap.set("n", "<leader>fb", require("telescope.builtin").buffers, { desc = "Buffers" })
 
--- nvim-tmux-navigation keymaps
-
 vim.keymap.set("n", "<C-h>", require("nvim-tmux-navigation").NvimTmuxNavigateLeft, { desc = "Tmux Navigate Left" })
 vim.keymap.set("n", "<C-j>", require("nvim-tmux-navigation").NvimTmuxNavigateDown, { desc = "Tmux Navigate Down" })
 vim.keymap.set("n", "<C-k>", require("nvim-tmux-navigation").NvimTmuxNavigateUp, { desc = "Tmux Navigate Up" })
 vim.keymap.set("n", "<C-l>", require("nvim-tmux-navigation").NvimTmuxNavigateRight, { desc = "Tmux Navigate Right" })
 
--- ufo keymaps
-
 vim.keymap.set("n", "zR", require("ufo").openAllFolds, { desc = "Open all folds" })
 vim.keymap.set("n", "zM", require("ufo").closeAllFolds, { desc = "Close all folds" })
diff --git a/lua/config/options.lua b/lua/config/options.lua
index 15278b1..9f8372d 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -1,27 +1,25 @@
-vim.o.expandtab = true
-vim.o.tabstop = 2
-vim.o.softtabstop = 2
-vim.o.shiftwidth = 2
-vim.o.cursorline = true
--- vim.o.cursorcolumn = true
-vim.o.scrolloff = 10
-vim.o.smartindent = true
-vim.o.autoindent = true
-vim.o.number = true
-vim.o.relativenumber = true
-vim.o.wrap = false
-vim.o.mouse = "a"
-vim.o.hidden = true
-vim.o.incsearch = true
-vim.o.ignorecase = true
-vim.o.smartcase = true
-vim.o.clipboard = "unnamedplus"
-vim.o.inccommand = "split"
-vim.o.foldcolumn = "1"
-vim.o.foldlevel = 99
-vim.o.foldlevelstart = 99
-vim.o.foldenable = true
-
+vim.opt.expandtab = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.cursorline = true
+vim.opt.scrolloff = 10
+vim.opt.smartindent = true
+vim.opt.autoindent = true
+vim.opt.number = true
+vim.opt.relativenumber = true
+vim.opt.wrap = false
+vim.opt.mouse = "a"
+vim.opt.hidden = true
+vim.opt.incsearch = true
+vim.opt.ignorecase = true
+vim.opt.smartcase = true
+vim.opt.clipboard = "unnamedplus"
+vim.opt.inccommand = "split"
+vim.opt.foldcolumn = "1"
+vim.opt.foldlevel = 99
+vim.opt.foldlevelstart = 99
+vim.opt.foldenable = true
 vim.opt.fillchars = { eob = " " }
 vim.opt.swapfile = false
 vim.opt.backup = false
@@ -29,12 +27,10 @@ vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
 vim.opt.undofile = true
 vim.opt.hlsearch = true
 vim.opt.incsearch = true
+vim.opt.termguicolors = true
+vim.opt.background = "dark"
 
 vim.g.mapleader = " "
 vim.api.nvim_set_keymap("n", "<Space>", "", { desc = "Leader" })
 
-vim.o.termguicolors = true
-vim.o.background = "dark"
-
--- disable codeium by default
 vim.g.codeium_enabled = false
diff --git a/lua/plugins/autopairs.lua b/lua/plugins/autopairs.lua
index 34de81c..ee1683f 100644
--- a/lua/plugins/autopairs.lua
+++ b/lua/plugins/autopairs.lua
@@ -3,7 +3,7 @@ return {
 	event = "InsertEnter",
 	config = function()
 		require("nvim-autopairs").setup({
-			check_ts = true, -- Enable autopairs for treesitter
+			check_ts = true,
 		})
 	end,
 }
diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua
index 5aa87aa..892c193 100644
--- a/lua/plugins/completions.lua
+++ b/lua/plugins/completions.lua
@@ -38,7 +38,7 @@ return {
 					["<C-f>"] = cmp.mapping.scroll_docs(4),
 					["<C-Space>"] = cmp.mapping.complete(),
 					["<C-e>"] = cmp.mapping.abort(),
-					["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+					["<CR>"] = cmp.mapping.confirm({ select = true }),
 				}),
 				sources = cmp.config.sources({
 					{ name = "nvim_lsp" },
diff --git a/lua/plugins/dadbod.lua b/lua/plugins/dadbod.lua
deleted file mode 100644
index 888e066..0000000
--- a/lua/plugins/dadbod.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-return {
-	"kristijanhusak/vim-dadbod-ui",
-	dependencies = {
-		{ "tpope/vim-dadbod", lazy = true },
-		{ "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql", "sqloracle" }, lazy = true },
-	},
-	cmd = {
-		"DBUI",
-		"DBUIToggle",
-		"DBUIAddConnection",
-		"DBUIFindBuffer",
-	},
-	init = function()
-		vim.g.db_ui_use_nerd_fonts = 1
-	end,
-}
diff --git a/lua/plugins/debugging.lua b/lua/plugins/debugging.lua
index 0479f28..434fef8 100644
--- a/lua/plugins/debugging.lua
+++ b/lua/plugins/debugging.lua
@@ -1,68 +1,86 @@
 return {
-	"mfussenegger/nvim-dap",
-	dependencies = {
-		"rcarriga/nvim-dap-ui",
-		"nvim-neotest/nvim-nio",
-	},
+	{
+		"mfussenegger/nvim-dap",
+		dependencies = {
+			"rcarriga/nvim-dap-ui",
+			"nvim-neotest/nvim-nio",
+		},
 
-	config = function()
-		local dap, dapui = require("dap"), require("dapui")
+		config = function()
+			local dap, dapui = require("dap"), require("dapui")
 
-		require("dapui").setup()
+			require("dapui").setup()
 
-		dap.listeners.before.attach.dapui_config = function()
-			dapui.open()
-		end
-		dap.listeners.before.launch.dapui_config = function()
-			dapui.open()
-		end
-		dap.listeners.before.event_terminated.dapui_config = function()
-			dapui.close()
-		end
-		dap.listeners.before.event_exited.dapui_config = function()
-			dapui.close()
-		end
+			dap.listeners.before.attach.dapui_config = function()
+				dapui.open()
+			end
+			dap.listeners.before.launch.dapui_config = function()
+				dapui.open()
+			end
+			dap.listeners.before.event_terminated.dapui_config = function()
+				dapui.close()
+			end
+			dap.listeners.before.event_exited.dapui_config = function()
+				dapui.close()
+			end
 
-		dap.adapters.lldb = {
-			type = "executable",
-			command = "/usr/bin/lldb-vscode",
-			name = "lldb",
-		}
+			dap.adapters.lldb = {
+				type = "executable",
+				command = "/usr/bin/lldb-vscode",
+				name = "lldb",
+			}
 
-		dap.configurations.rust = {
-			{
-				name = "Launch",
-				type = "lldb",
-				request = "launch",
-				program = function()
-					return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
-				end,
-				cwd = "${workspaceFolder}",
-				stopOnEntry = false,
-				args = {},
+			dap.configurations.rust = {
+				{
+					name = "Launch",
+					type = "lldb",
+					request = "launch",
+					program = function()
+						return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
+					end,
+					cwd = "${workspaceFolder}",
+					stopOnEntry = false,
+					args = {},
 
-				initCommands = function()
-					-- Find out where to look for the pretty printer Python module
-					local rustc_sysroot = vim.fn.trim(vim.fn.system("rustc --print sysroot"))
+					initCommands = function()
+						-- Find out where to look for the pretty printer Python module
+						local rustc_sysroot = vim.fn.trim(vim.fn.system("rustc --print sysroot"))
 
-					local script_import = 'command script import "'
-						.. rustc_sysroot
-						.. '/lib/rustlib/etc/lldb_lookup.py"'
-					local commands_file = rustc_sysroot .. "/lib/rustlib/etc/lldb_commands"
+						local script_import = 'command script import "'
+							.. rustc_sysroot
+							.. '/lib/rustlib/etc/lldb_lookup.py"'
+						local commands_file = rustc_sysroot .. "/lib/rustlib/etc/lldb_commands"
 
-					local commands = {}
-					local file = io.open(commands_file, "r")
-					if file then
-						for line in file:lines() do
-							table.insert(commands, line)
+						local commands = {}
+						local file = io.open(commands_file, "r")
+						if file then
+							for line in file:lines() do
+								table.insert(commands, line)
+							end
+							file:close()
 						end
-						file:close()
-					end
-					table.insert(commands, 1, script_import)
+						table.insert(commands, 1, script_import)
 
-					return commands
-				end,
-			},
-		}
-	end,
+						return commands
+					end,
+				},
+			}
+		end,
+	},
+	{
+		"kristijanhusak/vim-dadbod-ui",
+		dependencies = {
+			{ "tpope/vim-dadbod", lazy = true },
+			{ "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql", "sqloracle" }, lazy = true },
+		},
+		cmd = {
+			"DBUI",
+			"DBUIToggle",
+			"DBUIAddConnection",
+			"DBUIFindBuffer",
+		},
+		init = function()
+			vim.g.db_ui_use_nerd_fonts = 1
+		end,
+	},
 }
diff --git a/lua/plugins/lsp-config.lua b/lua/plugins/lsp-config.lua
index e1cc245..37a1587 100644
--- a/lua/plugins/lsp-config.lua
+++ b/lua/plugins/lsp-config.lua
@@ -21,8 +21,8 @@ return {
 					"ts_ls",
 					"clangd",
 					"tailwindcss",
-          "gopls",
-          "hls",
+					"gopls",
+					"hls",
 				},
 			})
 		end,
@@ -45,8 +45,8 @@ return {
 				"clangd",
 				"clangd",
 				"tailwindcss",
-        "gopls",
-        "hls",
+				"gopls",
+				"hls",
 			}
 
 			for _, lsp in ipairs(servers) do
@@ -56,4 +56,44 @@ return {
 			end
 		end,
 	},
+	{
+		"nvimtools/none-ls.nvim",
+		config = function()
+			local null_ls = require("null-ls")
+
+			null_ls.setup({
+				sources = {
+					null_ls.builtins.formatting.stylua,
+					null_ls.builtins.formatting.prettier,
+					null_ls.builtins.formatting.markdownlint,
+					null_ls.builtins.formatting.sql_formatter,
+					null_ls.builtins.formatting.bibclean,
+					null_ls.builtins.formatting.gofumpt,
+				},
+			})
+		end,
+	},
+	{
+		"luckasRanarison/tailwind-tools.nvim",
+		dependencies = { "nvim-treesitter/nvim-treesitter" },
+		opts = {}, -- your configuration
+	},
+	{
+		"nvim-treesitter/nvim-treesitter",
+		build = ":TSUpdate",
+		config = function()
+			local configs = require("nvim-treesitter.configs")
+			configs.setup({
+				sync_install = false,
+
+				auto_install = true,
+
+				highlight = {
+					enable = true,
+					additional_vim_regex_highlighting = false,
+				},
+				indent = { enable = true },
+			})
+		end,
+	},
 }
diff --git a/lua/plugins/none-ls.lua b/lua/plugins/none-ls.lua
deleted file mode 100644
index 86e439b..0000000
--- a/lua/plugins/none-ls.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-return {
-	"nvimtools/none-ls.nvim",
-	config = function()
-		local null_ls = require("null-ls")
-
-		null_ls.setup({
-			sources = {
-				null_ls.builtins.formatting.stylua,
-				null_ls.builtins.formatting.prettier,
-				null_ls.builtins.formatting.markdownlint,
-				null_ls.builtins.formatting.sql_formatter,
-				null_ls.builtins.formatting.bibclean,
-				null_ls.builtins.formatting.gofumpt,
-			},
-		})
-	end,
-}
diff --git a/lua/plugins/rustaceanvim.lua b/lua/plugins/rustaceanvim.lua
deleted file mode 100644
index 168e16e..0000000
--- a/lua/plugins/rustaceanvim.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-	"mrcjkb/rustaceanvim",
-	version = "^5", -- Recommended
-	lazy = false, -- This plugin is already lazy
-}
diff --git a/lua/plugins/tailwind-tools.lua b/lua/plugins/tailwind-tools.lua
deleted file mode 100644
index eddbc7f..0000000
--- a/lua/plugins/tailwind-tools.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-	"luckasRanarison/tailwind-tools.nvim",
-	dependencies = { "nvim-treesitter/nvim-treesitter" },
-	opts = {}, -- your configuration
-}
diff --git a/snippets/sql.json b/snippets/sql.json
deleted file mode 100644
index d191703..0000000
--- a/snippets/sql.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "BaseAuditEntity fields": {
-    "prefix": "sqlbae",
-    "body": [
-      "-- BaseAuditEntity fields",
-      "creator INT NOT NULL, -- FK to users.user_id",
-      "date_created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,",
-      "changed_by INT DEFAULT NULL, -- FK to users.user_id",
-      "date_changed TIMESTAMP DEFAULT NULL,",
-      "voided BOOLEAN NOT NULL DEFAULT FALSE,",
-      "voided_by INT DEFAULT NULL, -- FK to users.user_id",
-      "date_voided TIMESTAMP DEFAULT NULL,",
-      "void_reason VARCHAR(256) DEFAULT NULL,",
-      "uuid UUID NOT NULL DEFAULT gen_random_uuid () UNIQUE,",
-      "CONSTRAINT fk_${0}_creator FOREIGN KEY (creator) REFERENCES users (user_id),",
-      "CONSTRAINT fk_${0}_changed_by FOREIGN KEY (changed_by) REFERENCES users (user_id),",
-      "CONSTRAINT fk_${0}_voided_by FOREIGN KEY (voided_by) REFERENCES users (user_id)"
-    ],
-    "description": "BaseAuditEntity fields"
-  }
-}