From a446a914120b1a6d1762a40a4b39ac068af1a8ce Mon Sep 17 00:00:00 2001
From: S4NKALP <sankalptharu50028@gmail.com>
Date: Mon, 1 Jul 2024 15:27:35 +0545
Subject: [PATCH] updates

---
 lua/plugins/lock.json           |  31 +++++-----
 lua/plugins/tools/which-key.lua | 103 ++++++++++++++++++--------------
 2 files changed, 72 insertions(+), 62 deletions(-)

diff --git a/lua/plugins/lock.json b/lua/plugins/lock.json
index 34422ff..8075ef0 100644
--- a/lua/plugins/lock.json
+++ b/lua/plugins/lock.json
@@ -1,5 +1,5 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" },
+  "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
   "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
   "auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" },
   "ccc.nvim": { "branch": "main", "commit": "4fb5abaef2f2e0540fe22d4d74a9841205fff9e4" },
@@ -11,22 +11,21 @@
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "co-author.nvim": { "branch": "main", "commit": "3beddbbd5fdf3121921fc7b28fd731cffc70f952" },
   "codeium.vim": { "branch": "main", "commit": "7a01ffb1e6538fe634f294908a50a7b680039284" },
-  "compiler.nvim": { "branch": "main", "commit": "520ca6e0bd924e3ca8bd26e036a3b830955cf52f" },
+  "compiler.nvim": { "branch": "main", "commit": "4ad0395994f374e6c797266ea4acca90927f19aa" },
   "conform.nvim": { "branch": "master", "commit": "c26dadf8a47a547768d1048a0d698ecec33494ce" },
   "dashboard-nvim": { "branch": "master", "commit": "69a4c935cc43d3d725ed0600c6d00593bc23d132" },
   "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
   "flash.nvim": { "branch": "main", "commit": "43f67935d388fbb540f8b40e8cbfd80de54f978a" },
-  "flutter-tools.nvim": { "branch": "main", "commit": "0fbb3ee9056236d907b4b5680fcaa1da23cddc29" },
+  "flutter-tools.nvim": { "branch": "main", "commit": "5aa227fa083fd740184b55b5220dfabc24a25cc7" },
   "fortune.nvim": { "branch": "master", "commit": "470bcb2292f4fba68724cddc39b07c96e5e3e732" },
   "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
   "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
-  "gitsigns.nvim": { "branch": "main", "commit": "d0db8ef6a0489ed6af0baacb101a7b733c5d5de1" },
+  "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" },
   "hardtime.nvim": { "branch": "main", "commit": "9a4e24fb40482dc85a93bf6cf344a030b9bf9a39" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "hererocks": { "branch": "master", "commit": "ec640f26e25f4a8e16f236d78bf35ab72b197b29" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "4036c8ae9cc29faf8e6443fa5b23e679db055d24" },
-  "lazy.nvim": { "branch": "main", "commit": "9005e8ede7ff9e6434818c32d99860d7154d0432" },
-  "lazydev.nvim": { "branch": "main", "commit": "6184ebbbc8045d70077659b7d30c705a588dc62f" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
+  "lazy.nvim": { "branch": "main", "commit": "1fad61712bd3937dda925775a7736b8efbcbf1a7" },
+  "lazydev.nvim": { "branch": "main", "commit": "78d8a11fbd02ad4eafa07dd8a43a959a69fb3bf8" },
   "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" },
   "lsp_lines.nvim": { "branch": "main", "commit": "dbfd8e96ec2696e1ceedcd23fd70e842256e3dea" },
   "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" },
@@ -43,20 +42,20 @@
   "neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" },
   "neotest-rspec": { "branch": "main", "commit": "48573d5882cbe8d8bcd3b735d9ee7705168b1b87" },
   "nerdy.nvim": { "branch": "main", "commit": "b467d6609b78d6a5f1e12cbc08fcc1ac87af20f5" },
-  "noice.nvim": { "branch": "main", "commit": "cade1f972ba226e7753a7a113f3f1a942908e73c" },
-  "none-ls.nvim": { "branch": "main", "commit": "f1b438ab1709cf9d8875843559d20265013ac755" },
-  "nui.nvim": { "branch": "main", "commit": "a2bc1e9d0359caa5d11ad967cd1e30e8d4676226" },
+  "noice.nvim": { "branch": "main", "commit": "03c6a75661e68012e30b0ed81f050358b1e2233c" },
+  "none-ls.nvim": { "branch": "main", "commit": "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91" },
+  "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
   "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
   "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
   "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
   "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79" },
+  "nvim-lspconfig": { "branch": "master", "commit": "7edfd6692ba17f8d4fe08d84142781898ab0a672" },
   "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
-  "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" },
+  "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" },
   "nvim-spider": { "branch": "main", "commit": "b17d85c086d963852b7e3f543e0cd187b5112bc5" },
   "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" },
-  "nvim-treesitter": { "branch": "master", "commit": "09700b88b41ed96391de3d2010d74dc54fd5c210" },
+  "nvim-treesitter": { "branch": "master", "commit": "7ff0b8d3d21b15eb7231fcbd2acfded8987f5efd" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
   "nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
@@ -71,7 +70,7 @@
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "5c9660801ce345cd3835e1947c12b54290ab7e71" },
   "refactoring.nvim": { "branch": "master", "commit": "c9c1a0995b7d9a534f3b9a4df7fd55240127eeb4" },
   "ror.nvim": { "branch": "main", "commit": "9d31ad3953be83ac8dd542725ca4881c861f64a5" },
-  "sniprun": { "branch": "master", "commit": "1420cff041a0582636f63960d7160f7832463c10" },
+  "sniprun": { "branch": "master", "commit": "30991d81ecfb947a2c54f879b194d4ed23225d91" },
   "tabout.nvim": { "branch": "master", "commit": "3d7fbc7f5e91ef0f96b4d787c78ad9f8820de3ec" },
   "tdo.nvim": { "branch": "main", "commit": "95d4651bc5aef366b7d53a0ba6872cf444c09f33" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "a7ab9a957b17199183388c6f357d614fcaa508e5" },
@@ -84,7 +83,7 @@
   "ts-node-action": { "branch": "master", "commit": "6d3b60754fd87963d70eadaa2f77873b447eac26" },
   "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" },
   "url-open": { "branch": "main", "commit": "9f8f4a56ac709f26aa17d8ef921b272bf2262a30" },
-  "vim-fugitive": { "branch": "master", "commit": "64d6cafb9dcbacce18c26d7daf617ebb96b273f3" },
+  "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" },
   "vim-rails": { "branch": "master", "commit": "2fba7907f585819a8653f0bc7dd7f437a822d9c6" },
   "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" },
   "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
diff --git a/lua/plugins/tools/which-key.lua b/lua/plugins/tools/which-key.lua
index 2ac000d..0a78411 100644
--- a/lua/plugins/tools/which-key.lua
+++ b/lua/plugins/tools/which-key.lua
@@ -131,19 +131,19 @@ local mappings = {
     },
     c = {
         name = icons.ui.Neovim .. 'Code',
+        c = { '<cmd>CccHighlighterToggle<cr>', 'Highlight Colors' },
         d = { '<cmd>RootDir<cr>', 'Root Directory' },
         f = { '<cmd>lua vim.lsp.buf.format({async = true})<cr>', 'Format File' },
         F = { '<cmd>retab<cr>', 'Fix Tabs' },
-        r = { '<cmd>Telescope reloader<cr>', 'Reload Module' },
-        R = { '<cmd>ReloadConfig<cr>', 'Reload Configs' },
-        o = { '<cmd>Dashboard<cr>', 'Dashboard' },
-        c = { '<cmd>CccHighlighterToggle<cr>', 'Highlight Colors' },
         h = { '<cmd>Hardtime toggle<cr>', 'Hardtime' },
         l = { '<cmd>:g/^\\s*$/d<cr>', 'Clean Empty Lines' },
         m = { '<cmd>MarkdownPreviewToggle<cr>', 'Markdown Preview' },
         n = { '<cmd>Telescope notify<cr>', 'Notifications' },
+        o = { '<cmd>Dashboard<cr>', 'Dashboard' },
         p = { '<cmd>CccPick<cr>', 'Pick Color' },
         P = { '<cmd>CccConvert<cr>', 'Convert Color' },
+        r = { '<cmd>Telescope reloader<cr>', 'Reload Module' },
+        R = { '<cmd>ReloadConfig<cr>', 'Reload Configs' },
         x = { '<cmd>%SnipRun<cr>', 'Run File' },
     },
     d = {
@@ -160,9 +160,9 @@ local mappings = {
         a = { '<cmd>b#<cr>', 'Alternate File' },
         c = { '<cmd>e $MYVIMRC<cr>', 'Config' },
         d = { '<cmd>lua require("telescope.builtin").find_files({cwd = vim.fn.stdpath("config")})<cr>', 'Config Dir' },
-        E = { '<cmd>NvimTreeToggle<cr>', 'Explorer' },
+        e = { '<cmd>NvimTreeToggle<cr>', 'Explorer' },
         f = { 'gf', 'File Under Cursor' },
-        l = { '<cmd>e ~/.config/shell/local.sh', 'Local Config' },
+        l = { '<cmd>e ~/.config/shell/local.sh<cr>', 'Local Config' },
         m = { '<cmd>e README.md<cr>', 'Readme' },
         n = { '<cmd>enew<cr>', 'New File' },
         z = { '<cmd>e $ZDOTDIR/.zshrc<cr>', 'Zsh Config' },
@@ -230,8 +230,8 @@ local mappings = {
         e = { '<cmd>Telescope symbols<cr>', 'Emojis' },
         f = { "<cmd>put =expand('%:t')<cr>", 'File Name' },
         n = { '<cmd>Nerdy<cr>', 'Nerd Glyphs' },
-        p = { '<cmd>put %<cr>', 'Relative Path' },
         P = { '<cmd>put %:p<cr>', 'Absolute Path' },
+        p = { '<cmd>put %<cr>', 'Relative Path' },
         r = { '<cmd>Telescope registers<cr>', 'Registers' },
         t = { "<cmd>put =strftime('## %r')<cr>", 'Time' },
     },
@@ -259,9 +259,9 @@ local mappings = {
     },
     k = {
         name = icons.ui.Keyboard .. 'Keys',
-        k = { '<cmd>Telescope keymaps<cr>', 'Keymaps' },
         c = { '<cmd>Telescope commands<cr>', 'Commands' },
         h = { '<cmd>Telescope command_history<cr>', 'Command History' },
+        k = { '<cmd>Telescope keymaps<cr>', 'Keymaps' },
         s = { '<cmd>Telescope search_history<cr>', 'Search History' },
     },
     l = {
@@ -275,32 +275,34 @@ local mappings = {
         i = { '<cmd>LspInfo<cr>', 'LSP Info' },
         j = { '<cmd>Lspsaga diagnostic_jump_next<cr>', 'Next Diagnostic' },
         k = { '<cmd>Lspsaga diagnostic_jump_prev<cr>', 'Prev Diagnostic' },
-        l = { '<cmd>Telescope diagnostics layout_strategy=vertical<cr>', 'File Diagnostics' },
         L = { '<cmd>Lspsaga show_workspace_diagnostics<cr>', 'Workspace Diagnostics' },
+        l = { '<cmd>Telescope diagnostics layout_strategy=vertical<cr>', 'File Diagnostics' },
         o = { '<cmd>Lspsaga outline<cr>', 'Outline' },
         p = { '<cmd>Telescope lsp_incoming_calls<cr>', 'Incoming Calls' },
         P = { '<cmd>Telescope lsp_outgoing_calls<cr>', 'Outgoing Calls' },
-        r = { '<cmd>Lspsaga rename<cr>', 'Rename' },
+        q = { '<cmd>LspStop<cr>', 'Stop LSP' },
+        Q = { '<cmd>LspRestart<cr>', 'Restart LSP' },
         R = { '<cmd>Lspsaga project_replace<cr>', 'Replace' },
+        r = { '<cmd>Lspsaga rename<cr>', 'Rename' },
         s = { '<cmd>Telescope lsp_document_symbols theme=get_ivy<cr>', 'Document Symbols' },
         S = { '<cmd>Telescope lsp_dynamic_workspace_symbols<cr>', 'Workspace Symbols' },
-        t = { '<cmd>Lspsaga peek_type_definition<cr>', 'Peek Type Definition' },
         T = { '<cmd>Lspsaga goto_type_definition<cr>', 'Goto Type Definition' },
+        t = { '<cmd>Lspsaga peek_type_definition<cr>', 'Peek Type Definition' },
     },
     m = {
         name = icons.ui.Bookmark .. 'Marks',
         b = { "<cmd>lua require('telescope').extensions.marks_nvim.bookmarks_list_all()<cr>", 'Bookmarks' },
-        D = { "<cmd>lua require('marks').delete_buf()<cr>", 'Delete Buffer' },
         d = { "<cmd>lua require('marks').delete_line()<cr>", 'Delete Line' },
-        P = { "<cmd>lua require('marks').preview()<cr>", 'Preview' },
-        x = { "<cmd>lua require('marks').delete_bookmark()<cr>", 'Delete Bookmark' },
+        D = { "<cmd>lua require('marks').delete_buf()<cr>", 'Delete Buffer' },
         h = { "<cmd>lua require('marks').next_bookmark()<cr>", 'Next Bookmark' },
         j = { "<cmd>lua require('marks').next()<cr>", 'Next' },
         k = { "<cmd>lua require('marks').prev()<cr>", 'Previous' },
         l = { "<cmd>lua require('marks').prev_bookmark()<cr>", 'Previous Bookmark' },
         m = { '<cmd>Telescope marks<cr>', 'All Marks' },
+        P = { "<cmd>lua require('marks').preview()<cr>", 'Preview' },
         s = { "<cmd>lua require('marks').set_next()<cr>", 'Set Next' },
         t = { "<cmd>lua require('marks').toggle()<cr>", 'Toggle' },
+        x = { "<cmd>lua require('marks').delete_bookmark()<cr>", 'Delete Bookmark' },
 
         ['1'] = { "<cmd>lua require('marks').toggle_bookmark1()<cr>", 'Toggle Bookmark 0' },
         ['2'] = { "<cmd>lua require('marks').toggle_bookmark2()<cr>", 'Toggle Bookmark 2' },
@@ -350,11 +352,11 @@ local mappings = {
         name = icons.ui.Package .. 'Packages',
         c = { '<cmd>Lazy check<cr>', 'Check' },
         d = { '<cmd>Lazy debug<cr>', 'Debug' },
-        p = { '<cmd>Lazy<cr>', 'Plugins' },
-        P = { '<cmd>Lazy profile<cr>', 'Profile' },
-        m = { '<cmd>Mason<cr>', 'Mason' },
         i = { '<cmd>Lazy install<cr>', 'Install' },
         l = { '<cmd>Lazy log<cr>', 'Log' },
+        m = { '<cmd>Mason<cr>', 'Mason' },
+        P = { '<cmd>Lazy profile<cr>', 'Profile' },
+        p = { '<cmd>Lazy<cr>', 'Plugins' },
         r = { '<cmd>Lazy restore<cr>', 'Restore' },
         s = { '<cmd>Lazy sync<cr>', 'Sync' },
         u = { '<cmd>Lazy update<cr>', 'Update' },
@@ -367,22 +369,23 @@ local mappings = {
         d = { '<cmd>bdelete<cr>', 'Delete Buffer' },
         f = { '<cmd>qall!<cr>', 'Force Quit' },
         q = { '<cmd>q<cr>', 'Quit' },
+        w = { '<cmd>wq<cr>', 'Write and Quit' },
     },
     r = {
         name = icons.ui.Code .. 'Refactor',
         b = { "<cmd>lua require('spectre').open_file_search()<cr>", 'Replace Buffer' },
+        d = { '', 'Go To Definition' },
         e = { "<cmd>lua require('refactoring').refactor('Extract Block')<CR>", 'Extract Block' },
         f = { "<cmd>lua require('refactoring').refactor('Extract Block To File')<CR>", 'Extract To File' },
-        i = { "<cmd>lua require('refactoring').refactor('Inline Variable')<CR>", 'Inline Variable' },
-        n = { '', 'Swap Next' },
-        p = { '', 'Swap Previous' },
-        r = { '', 'Smart Rename' },
-        d = { '', 'Go To Definition' },
         h = { '', 'List Definition Head' },
-        l = { '', 'List Definition' },
+        i = { "<cmd>lua require('refactoring').refactor('Inline Variable')<CR>", 'Inline Variable' },
         j = { '', 'Next Usage' },
         k = { '', 'Previous Usage' },
+        l = { '', 'List Definition' },
+        n = { '', 'Swap Next' },
+        p = { '', 'Swap Previous' },
         R = { "<Esc><cmd>lua require('telescope').extensions.refactoring.refactors()<CR>", 'Refactor Commands' },
+        r = { '', 'Smart Rename' },
         S = { "<cmd>lua require('spectre').open()<cr>", 'Replace' },
         s = { [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], 'Replace Word' },
         v = { "<cmd>lua require('refactoring').refactor('Extract Variable')<CR>", 'Extract Variable' },
@@ -390,23 +393,28 @@ local mappings = {
     },
     s = {
         name = icons.ui.Windows .. 'Split',
-        [','] = { '<cmd>NavigatorPrevious<cr>', 'Previous Split' },
+        ['`'] = { '<C-w>p', 'Previous Window' },
         ['-'] = { '<C-w>s', 'Split Below' },
         ['\\'] = { '<C-w>v', 'Split Right' },
+        a = { '<cmd>vsplit<cr>', 'Vertical Split' },
         c = { '<cmd>tabclose<cr>', 'Close Tab' },
         d = { '<C-w>c', 'Close Window' },
         f = { '<cmd>tabfirst<cr>', 'First Tab' },
         h = { '<C-w>h', 'Move Left' },
+        H = { '<cmd>vertical resize -10<cr>', 'Decrease window width' },
         j = { '<C-w>j', 'Move Down' },
+        J = { '<cmd>resize -10<cr>', 'Decrease window height' },
         k = { '<C-w>k', 'Move Up' },
+        K = { '<cmd>resize +10<cr>', 'Increase window height' },
         l = { '<C-w>l', 'Move Right' },
-        p = { '<C-w>p', 'Previous Window' },
+        L = { '<cmd>vertical resize +10<cr>', 'Increase window width' },
+        p = { '<cmd>NavigatorPrevious<cr>', 'Previous Pane' },
         s = { '<cmd>split<cr>', 'Horizontal Split' },
-        a = { '<cmd>vsplit<cr>', 'Vertical Split' },
     },
     t = {
         name = icons.ui.Terminal .. 'Terminal',
         ['`'] = { '<cmd>Sterm<cr>', 'Horizontal Terminal' },
+        c = { '<cmd>Sterm bundle exec rails console<cr>', 'Rails Console' },
         n = { '<cmd>Sterm node<cr>', 'Node' },
         p = { '<cmd>Sterm bpython<cr>', 'Python' },
         r = { '<cmd>Sterm irb<cr>', 'Ruby' },
@@ -416,29 +424,30 @@ local mappings = {
     },
     u = {
         name = icons.ui.Test .. 'Test',
-        f = { '<cmd>lua require("neotest").run.run(vim.fn.expand("%"))<cr>', 'Run Test' },
         F = { '<cmd>lua require("neotest").run.run()<cr>', 'Run Current Test' },
+        f = { '<cmd>lua require("neotest").run.run(vim.fn.expand("%"))<cr>', 'Run Test' },
         o = { '<cmd>Neotest output-panel<cr>', 'Test Output' },
         O = { '<cmd>Neotest summary<cr>', 'Test Summary' },
     },
     v = {
         name = icons.ui.Star .. 'Select',
-        p = { 'vip', 'Paragraph' },
-        P = { 'vap', 'Around Para' },
-        q = { 'viq', 'Quote' },
-        Q = { 'vaq', 'Around Quote' },
-        b = { 'vib', 'Bracket' },
         B = { 'vab', 'Around Bracket' },
+        b = { 'vib', 'Bracket' },
+        P = { 'vap', 'Around Para' },
+        p = { 'vip', 'Paragraph' },
+        Q = { 'vaq', 'Around Quote' },
+        q = { 'viq', 'Quote' },
     },
     w = {
         name = icons.kind.File .. 'Writing',
+        c = { '<cmd>set spell!<cr>', 'Spellcheck' },
         f = { "<cmd>lua require'utils'.sudo_write()<cr>", 'Force Write' },
         j = { ']s', 'Next Misspell' },
         k = { '[s', 'Prev Misspell' },
-        c = { '<cmd>set spell!<cr>', 'Spellcheck' },
+        q = { '<cmd>wq<cr>', 'Write and Quit' },
         s = { '<cmd>Telescope spell_suggest<cr>', 'Suggestions' },
         t = { '<cmd>Twilight<cr>', 'Twilight' },
-        w = { '<cmd>w<cr>', 'Write' },
+        w = { '<cmd>w<cr>', 'Write and Quit' },
         z = { '<cmd>ZenMode<cr>', 'ZenMode' },
     },
     x = { '<cmd>x<cr>', icons.ui.SignOut .. 'Save and Quit' },
@@ -446,9 +455,9 @@ local mappings = {
         name = icons.ui.Clipboard .. 'Yank',
         a = { '<cmd>%y+<cr>', 'Copy Whole File' },
         f = { '<cmd>CopyFileName<cr>', 'File Name' },
-        p = { '<cmd>CopyRelativePath<cr>', 'Relative Path' },
-        P = { '<cmd>CopyAbsolutePath<cr>', 'Absolute Path' },
         g = { '<cmd>lua require"gitlinker".get_buf_range_url()<cr>', 'Copy Git URL' },
+        P = { '<cmd>CopyAbsolutePath<cr>', 'Absolute Path' },
+        p = { '<cmd>CopyRelativePath<cr>', 'Relative Path' },
     },
 }
 
@@ -477,9 +486,11 @@ local vmappings = {
     },
     c = {
         name = icons.ui.Neovim .. 'Code',
-        s = { ':sort<cr>', 'Sort Asc' },
+        i = { ':sort i<cr>', 'Sort Case Insensitive' },
         S = { ':sort!<cr>', 'Sort Desc' },
+        s = { ':sort<cr>', 'Sort Asc' },
         u = { ':!uniq<cr>', 'Unique' },
+        x = { "<esc><cmd>'<,'>SnipRun<cr>", 'Run Code' },
     },
     g = {
         name = icons.git.Octoface .. 'Git',
@@ -516,7 +527,6 @@ local vmappings = {
         v = { "<esc><cmd>lua require('refactoring').refactor('Extract Variable')<CR>", 'Extract Variable' },
         i = { "<esc><cmd>lua require('refactoring').refactor('Inline Variable')<CR>", 'Inline Variable' },
     },
-    s = { "<esc><cmd>'<,'>SnipRun<cr>", icons.ui.Play .. 'Run Code' },
     y = {
         name = icons.ui.Clipboard .. 'Yank',
         g = { '<cmd>lua require"gitlinker".get_buf_range_url("v")<cr>', 'Copy Git URL' },
@@ -533,22 +543,27 @@ local no_leader_opts = {
 }
 
 local no_leader_mappings = {
+    K = { '<cmd>Lspsaga hover_doc<cr>', 'LSP Hover' },
+    Q = { '<cmd>qall!<cr>', 'Force Quit!' },
+    U = { '<cmd>redo<cr>', 'Redo' },
+
     ['<S-h>'] = { '<cmd>bprevious<cr>', 'Previous Buffer' },
     ['<S-l>'] = { '<cmd>bnext<cr>', 'Next Buffer' },
 
+    ['<C-f>'] = { '<cmd>Telescope find_files<cr>', 'Find Files' },
+    ['<C-g>'] = { '<cmd>Fterm lazygit<cr>', 'Lazygit' },
+
     ['<C-h>'] = { '<C-w>h', 'Move Left' },
     ['<C-j>'] = { '<C-w>j', 'Move Down' },
     ['<C-k>'] = { '<C-w>k', 'Move Up' },
     ['<C-l>'] = { '<C-w>l', 'Move Right' },
+    ['<C-\\>'] = { '<C-w>p', 'Previous Pane' },
 
     ['<C-Up>'] = { '<cmd>resize +10<cr>', 'Increase window height' },
     ['<C-Down>'] = { '<cmd>resize -10<cr>', 'Decrease window height' },
     ['<C-Left>'] = { '<cmd>vertical resize -10<cr>', 'Decrease window width' },
     ['<C-Right>'] = { '<cmd>vertical resize +10<cr>', 'Increase window width' },
 
-    ['<C-f>'] = { '<cmd>Telescope find_files<cr>', 'Find Files' },
-    ['<C-g>'] = { '<cmd>Fterm lazygit<cr>', 'Lazygit' },
-
     ['['] = {
         name = icons.ui.ArrowLeft .. 'Previous',
         b = { '<cmd>bprevious<cr>', 'Buffer' },
@@ -567,10 +582,6 @@ local no_leader_mappings = {
         g = { '<cmd>Gitsigns next_hunk<cr>', 'Git Hunk' },
         j = { '<C-i>', 'Jump' },
     },
-
-    K = { '<cmd>Lspsaga hover_doc<cr>', 'LSP Hover' },
-    Q = { '<cmd>qall!<cr>', 'Force Quit!' },
-    U = { '<cmd>redo<cr>', 'Redo' },
 }
 
 if vim.fn.exists('$TMUX') == 1 then
@@ -579,7 +590,7 @@ if vim.fn.exists('$TMUX') == 1 then
         ['<C-j>'] = { '<cmd>NavigatorDown<cr>', 'Move Down' },
         ['<C-k>'] = { '<cmd>NavigatorUp<cr>', 'Move Up' },
         ['<C-l>'] = { '<cmd>NavigatorRight<cr>', 'Move Right' },
-        ['<C-m>'] = { '<cmd>NavigatorPrevious<cr>', 'Goto Previous' },
+        ['<C-\\>'] = { '<cmd>NavigatorPrevious<cr>', 'Previous Pane' },
     }
     no_leader_mappings = vim.tbl_extend('force', no_leader_mappings, tmux_mappings)
 end