From f1a364e3f8b77c18ac8108356cd211c4a6a336f7 Mon Sep 17 00:00:00 2001
From: Nicholas Novak <34256932+NickyBoy89@users.noreply.github.com>
Date: Sun, 3 May 2026 14:15:16 -0700
Subject: [PATCH] feat: Add keybinds directory and changed some of the options

---
 nvim/.config/nvim/plugin/keybinds.lua | 18 ++++++++++++++++++
 nvim/.config/nvim/plugin/options.lua  |  8 ++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 nvim/.config/nvim/plugin/keybinds.lua

diff --git a/nvim/.config/nvim/plugin/keybinds.lua b/nvim/.config/nvim/plugin/keybinds.lua
new file mode 100644
index 0000000..5afa657
--- /dev/null
+++ b/nvim/.config/nvim/plugin/keybinds.lua
@@ -0,0 +1,18 @@
+-- [[ Basic Keymaps ]]
+--  See `:help vim.keymap.set()`
+
+-- Clear highlights on search when pressing <Esc> in normal mode
+--  See `:help hlsearch`
+vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
+
+-- Diagnostic keymaps
+vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
+
+-- Keybinds to make split navigation easier.
+--  Use CTRL+<hjkl> to switch between windows
+--
+--  See `:help wincmd` for a list of all window commands
+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' })
diff --git a/nvim/.config/nvim/plugin/options.lua b/nvim/.config/nvim/plugin/options.lua
index f364874..9c75849 100644
--- a/nvim/.config/nvim/plugin/options.lua
+++ b/nvim/.config/nvim/plugin/options.lua
@@ -29,6 +29,12 @@ vim.wo.signcolumn = 'yes'
 -- Prevent markdown from collapsing down
 vim.o.foldenable = false
 
+-- Preview substitutions live, as you type!
+vim.o.inccommand = 'split'
+
+-- Show which line your cursor is on
+vim.o.cursorline = true
+
 -- Tabs instead of spaces
 -- :h tabstop is the number of spaces for a tab character
 -- :h expandtab expands tabs into spaces
@@ -42,5 +48,3 @@ vim.o.completeopt = 'menuone,noinsert,noselect'
 
 -- Disable modelines, this removes some errors when opening text files
 vim.o.modeline = false
-
-vim.o.rtp = vim.o.rtp .. ",~/oxy/current-course"