From 4957169193f998213888c4d087ab2785a8f5244c Mon Sep 17 00:00:00 2001
From: Thomas Sindt <Thomas.Sindt@gmx.de>
Date: Sun, 8 Mar 2026 14:57:30 +0100
Subject: [PATCH] keybindings

---
 init.lua             | 10 ++++------
 lua/core/keymaps.lua | 16 ++++++++++++++++
 lua/core/options.lua | 18 ++++++++++++++++++
 3 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 lua/core/keymaps.lua
 create mode 100644 lua/core/options.lua

diff --git a/init.lua b/init.lua
index b6d9ae0..da64645 100644
--- a/init.lua
+++ b/init.lua
@@ -1,16 +1,14 @@
 -- init.lua  by THS
 --
-vim.g.mapleader = " "
-vim.opt.number = true
-vim.opt.relativenumber = true
-vim.opt.termguicolors = true
+require("core.options")
+require("core.keymaps")
+
 vim.opt.mouse = "a"
+
 vim.api.nvim_create_autocmd("VimEnter", {
   callback = function()
     vim.notify("Neovim 2026 init.lua from THS loaded", vim.log.levels.INFO)
   end,
 })
 
--- basic keymap sanity check
-vim.keymap.set("n", "<leader>s", "<cmd>w<cr>", { desc = "Save file" })
 
diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua
new file mode 100644
index 0000000..313cfcc
--- /dev/null
+++ b/lua/core/keymaps.lua
@@ -0,0 +1,16 @@
+-- ~/.config/nvim/lua/core/keymaps.lua
+
+vim.g.mapleader = " "
+
+local map = vim.keymap.set
+local opts = { noremap = true, silent = true }
+
+map("n", "<leader>s", "<cmd>w<cr>", vim.tbl_extend("force", opts, { desc = "Save file" }))
+map("n", "<leader>q", "<cmd>confirm q<cr>", vim.tbl_extend("force", opts, { desc = "Quit window" }))
+map("n", "<leader>h", "<cmd>nohlsearch<cr>", vim.tbl_extend("force", opts, { desc = "Clear highlights" }))
+
+map("n", "<C-h>", "<C-w>h", opts)
+map("n", "<C-j>", "<C-w>j", opts)
+map("n", "<C-k>", "<C-w>k", opts)
+map("n", "<C-l>", "<C-w>l", opts)
+
diff --git a/lua/core/options.lua b/lua/core/options.lua
new file mode 100644
index 0000000..480a700
--- /dev/null
+++ b/lua/core/options.lua
@@ -0,0 +1,18 @@
+-- ~/.config/nvim/lua/core/options.lua
+
+vim.opt.number = true
+vim.opt.relativenumber = true
+vim.opt.signcolumn = "yes"
+vim.opt.termguicolors = true
+vim.opt.cursorline = true
+
+vim.opt.ignorecase = true
+vim.opt.smartcase = true
+vim.opt.incsearch = true
+vim.opt.hlsearch = false
+
+vim.opt.splitright = true
+vim.opt.splitbelow = true
+vim.opt.updatetime = 200
+vim.opt.timeoutlen = 400
+