Modified nvim config, added and organized keymaps and options

4 files changed, 37 insertions, 41 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index c5e7d9b..dc9539e 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,4 +1,3 @@
--- Install Lazy if it doesn't exist yet
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
     vim.fn.system({
@@ -15,8 +14,6 @@ vim.opt.rtp:prepend(lazypath)
 require("options")
 require("keymaps")
 require("autocmds")
-require("lazy").setup("plugins")
-
-
 
+require("lazy").setup("plugins")
 
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index df007bb..8a416ce 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -23,6 +23,7 @@
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
+  "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" },
   "tokyonight.nvim": { "branch": "main", "commit": "81c867c5f638597a82c82094dcb90ed42444dabc" },
   "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" }
 }
\ No newline at end of file
diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
index c043fc7..8501c64 100644
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
@@ -1,15 +1,24 @@
-vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
+-- Misc
+vim.keymap.set({ 'n', 'i'}, '<C-a>', '<Esc>ggVG', { desc = 'Visually Highlight [A]ll' })
+vim.keymap.set('n', '<Esc>', ':nohlsearch<CR>')
 
+-- Window Navigation
 vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
 vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
 vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
 vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
 
+-- Window resizing
+local resize = 2;
+vim.keymap.set('n', '<C-Left>', string.format(':vertical resize -%d<CR>', resize), { desc = "Resize Left" })
+vim.keymap.set('n', '<C-Up>', string.format(':resize -%d<CR>', resize), { desc = "Resize Up" })
+vim.keymap.set('n', '<C-Down>', string.format(':resize +%d<CR>', resize), { desc = "Resize Down" })
+vim.keymap.set('n', '<C-Right>', string.format(':vertical resize +%d<CR>', resize), { desc = "Resize Right" })
 
+-- Keep selection after < and >
+vim.keymap.set('v', '<', '<gv', {})
+vim.keymap.set('v', '>', '>gv', {})
 
-
-
-
-
-
+-- todo.lua
+vim.keymap.set('n', '<leader>ft', ':TodoTelescope<cr>', { desc = "[F]ind [T]odos" })
 
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index 1941a5b..f55703d 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -1,47 +1,36 @@
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
+-- System
 vim.g.have_nerd_font = true
+vim.opt.mouse = 'a' -- enable mouse
+vim.opt.clipboard = 'unnamedplus' -- use system clipboard
 
--- Remove duplicate mode cuz lualine
-vim.opt.showmode = false
+-- Tab
+vim.opt.expandtab = true            -- convert tabs to spaces
+vim.opt.tabstop = 4                 -- number of visual spaces per TAB
+vim.opt.softtabstop = 4             -- number of idfk tab when editing
+vim.opt.shiftwidth = 4              -- number of spaces to insert on tab
 
+-- UI
+vim.opt.signcolumn = 'auto'
 vim.opt.number = true
 vim.opt.relativenumber = true
-
-vim.opt.expandtab = true
-vim.opt.tabstop = 4
-vim.opt.softtabstop = 4
-vim.opt.shiftwidth = 4
-
-vim.opt.mouse = 'a'
-vim.opt.clipboard = 'unnamedplus'
-
-vim.opt.undofile = true
-
-vim.opt.ignorecase = true
-vim.opt.smartcase = true
-
-vim.opt.signcolumn = 'auto'
-
-vim.opt.updatetime = 250
-
--- Displays which-key sooner, once that's setupped
-vim.opt.timeoutlen = 300
-
+vim.opt.cursorline = true -- highlight current line
 vim.opt.splitright = true
 vim.opt.splitbelow = true
-
--- vim.opt.list = true
--- vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
-
+vim.opt.showmode = false -- don't show mode, because lualine already does
 vim.opt.list = true
 vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
 
-vim.opt.cursorline = true
-
-vim.opt.scrolloff = 8
-
+-- Searching
 vim.opt.hlsearch = true
+vim.opt.ignorecase = true
+vim.opt.smartcase = true
 
+-- Misc
+vim.opt.scrolloff = 8
+vim.opt.undofile = true
+vim.opt.updatetime = 250
+vim.opt.timeoutlen = 300 -- Displays which-key sooner, once that's setupped