2 files changed, 32 insertions, 82 deletions
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