alphabetically sorted keymaps and options.

+ Fixed overlap with Karabiner M-hjkl bindings

.config/nvim/lua/sameer/core/keymaps.lua

@@ -4,26 +4,24 @@ vim.g.mapleader = " "
 
 keymap.set("i", "jk", "<ESC>", { desc = "Exit insert mode with jk" })
 keymap.set("n", "0", "^", { desc = "Goto first non empty character in line" })
-keymap.set("n", "<M-o>", "o<ESC>", { desc = "Insert a new line down in normal mode" })
-keymap.set("n", "<leader>nh", ":nohl<CR>", { desc = "Clear search highlights" })
-keymap.set("n", "x", '"_x') -- disable yanking on deleting a character
-keymap.set("n", "<leader>j", "J", { desc = "Join lines" })
-keymap.set("n", "J", "5j", { desc = "Move 5 lines down" })
-keymap.set("n", "K", "5k", { desc = "Move 5 lines up" })
-keymap.set("n", "<M-j>", ":m .+1<CR>==", { desc = "Move line up" })
-keymap.set("n", "<M-k>", ":m .-2<CR>==", { desc = "Move line down" })
-keymap.set("v", "<M-k>", ":m '>+1<CR>gv=gv", { desc = "Move line up" })
-keymap.set("v", "<M-k>", ":m '<-2<CR>gv=gv", { desc = "Move line down" })
-keymap.set("n", "<leader>w", "<cmd> w <CR>", { desc = "Write buffer" })
-keymap.set("n", "<leader>qq", "<cmd> qa <CR>", { desc = "Close neovim" })
-
--- window management
-keymap.set("n", "<leader>sv", "<C-w>v", { desc = "Split window vertically" })
-keymap.set("n", "<leader>sh", "<C-w>s", { desc = "Split window horizontally" })
-keymap.set("n", "<leader>se", "<C-w>=", { desc = "Make splits equal size" })
-keymap.set("n", "<leader>sx", "<cmd>close<CR>", { desc = "Close current split" })
-
 keymap.set("n", "<C-h>", "<C-w>h", { desc = "Select left split" })
 keymap.set("n", "<C-j>", "<C-w>j", { desc = "Select lower split" })
 keymap.set("n", "<C-k>", "<C-w>k", { desc = "Select upper split" })
 keymap.set("n", "<C-l>", "<C-w>l", { desc = "Select right split" })
+keymap.set("n", "<M-down>", ":m .+1<CR>==", { desc = "Move line up" })
+keymap.set("n", "<M-o>", "o<ESC>", { desc = "Insert a new line down in normal mode" })
+keymap.set("n", "<M-up>", ":m .-2<CR>==", { desc = "Move line down" })
+keymap.set("n", "<esc>", ":nohl<CR>", { desc = "Clear search highlights" })
+keymap.set("n", "<leader>j", "J", { desc = "Join lines" })
+keymap.set("n", "<leader>qq", "<cmd> qa <CR>", { desc = "Close neovim" })
+keymap.set("n", "<leader>se", "<C-w>=", { desc = "Make splits equal size" })
+keymap.set("n", "<leader>sh", "<C-w>s", { desc = "Split window horizontally" })
+keymap.set("n", "<leader>sv", "<C-w>v", { desc = "Split window vertically" })
+keymap.set("n", "<leader>sx", "<cmd>close<CR>", { desc = "Close current split" })
+keymap.set("n", "<leader>w", "<cmd> w <CR>", { desc = "Write buffer" })
+keymap.set("n", "J", "5j", { desc = "Move 5 lines down" })
+keymap.set("n", "K", "5k", { desc = "Move 5 lines up" })
+keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+keymap.set("v", "<M-k>", ":m '<-2<CR>gv=gv", { desc = "Move line down" })
+keymap.set("v", "<M-k>", ":m '>+1<CR>gv=gv", { desc = "Move line up" })

.config/nvim/lua/sameer/core/options.lua

@@ -1,32 +1,27 @@
 local opt = vim.opt
 
-opt.relativenumber = true
-opt.number = true
-
-opt.tabstop = 2
-opt.shiftwidth = 2
-opt.expandtab = true
 opt.autoindent = true
-opt.smartindent = true
-
-opt.wrap = false
-
-opt.ignorecase = true
-opt.smartcase = true
-
-opt.cursorline = true
-opt.termguicolors = true
-opt.signcolumn = "yes"
 opt.backspace = "indent,eol,start"
 opt.clipboard:append("unnamedplus")
-
-opt.splitright = true
-opt.splitbelow = true
-
-opt.swapfile = false
+opt.cursorline = true
+opt.expandtab = true
+opt.ignorecase = true
 opt.mouse = "a"
-
-opt.undofile = true
-opt.undodir = vim.env.HOME .. "/.undodir"
-
+opt.number = true
+opt.relativenumber = true
 opt.scrolloff = 4
+opt.shiftwidth = 2
+opt.showmode = false
+opt.signcolumn = "yes"
+opt.smartcase = true
+opt.smartindent = true
+opt.spelllang = { "en" }
+opt.splitbelow = true
+opt.splitright = true
+opt.swapfile = false
+opt.tabstop = 2
+opt.termguicolors = true
+opt.undodir = vim.env.HOME .. "/.undodir"
+opt.undofile = true
+opt.undolevels = 100
+opt.wrap = false

.config/nvim/lua/sameer/plugins/flash.lua

@@ -33,8 +33,5 @@ return {
       end,
       desc = "Flash Treesitter",
     },
-    -- { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
-    -- { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-    -- { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
   },
 }

.config/nvim/lua/sameer/plugins/lsp/lspconfig.lua

@@ -15,7 +15,6 @@ return {
     local on_attach = function(_, bufnr)
       opts.buffer = bufnr
 
-      -- set keybinds
       opts.desc = "Show LSP references"
       keymap.set("n", "gR", "<cmd>Telescope lsp_references<CR>", opts)
 
@@ -95,12 +94,10 @@ return {
       on_attach = on_attach,
       settings = {
         Lua = {
-          -- make the language server recognize "vim" global
           diagnostics = {
             globals = { "vim" },
           },
           workspace = {
-            -- make language server aware of runtime files
             library = {
               [vim.fn.expand("$VIMRUNTIME/lua")] = true,
               [vim.fn.stdpath("config") .. "/lua"] = true,

.config/nvim/lua/sameer/plugins/telescope.lua

@@ -23,7 +23,6 @@ return {
           i = {
             ["<C-k>"] = actions.move_selection_previous,
             ["<C-j>"] = actions.move_selection_next,
-            ["<C-q>"] = actions.send_selected_to_qflist + actions.open_qflist,
           },
         },
       },