diff --git a/lazy-lock.json b/lazy-lock.json index e937f5c..4008833 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,6 @@ { "LuaSnip": { "branch": "master", "commit": "563827f00bb4fe43269e3be653deabc0005f1302" }, - "alpha-nvim": { "branch": "main", "commit": "54c9ba499209ac2563ddcefd47ba7bce35ae94ae" }, + "alpha-nvim": { "branch": "main", "commit": "1c903fd40b1d51e7740b4d90e9f18e83f2916586" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, @@ -11,43 +11,44 @@ "colorschemes": { "branch": "master", "commit": "e29f32990d6e2c7c3a4763326194fbd847b49dac" }, "dracula.nvim": { "branch": "main", "commit": "798274ba3c454a9aa3cd71f95a86ea55cbbbb142" }, "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, - "friendly-snippets": { "branch": "main", "commit": "80597f3ea824946c87fd29f82b5ed4f24ef473f3" }, - "gitsigns.nvim": { "branch": "main", "commit": "f29f0b22fd66c910b892aae3bc18a4872c002738" }, + "friendly-snippets": { "branch": "main", "commit": "1645e7cd98ed99e766c84ab3cf13a1612c77dcee" }, + "gitsigns.nvim": { "branch": "main", "commit": "a5caac26768af80b7c57b919f77b3fed3d7424d0" }, "glow.nvim": { "branch": "main", "commit": "2bb4afb6e9dbc93993a1d7d4168dac08c74590ac" }, "headlines.nvim": { "branch": "master", "commit": "1cd93a641c03419bb255f8b3fe734451517763b1" }, "indent-blankline.nvim": { "branch": "master", "commit": "8299fe7703dfff4b1752aeed271c3b95281a952d" }, - "lazy.nvim": { "branch": "main", "commit": "bab744565e9d8d743b1889c66707aa2e8018ae86" }, + "lazy.nvim": { "branch": "main", "commit": "c778b7aa04c484e1536ba219e71f2fd0f05302aa" }, "lazygit.nvim": { "branch": "main", "commit": "32bffdebe273e571588f25c8a708ca7297928617" }, "lsp-colors.nvim": { "branch": "main", "commit": "d0b245232aeb197bbd097111d8b69621b0671edb" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7a97a77eee486ae152d2c559a459eda7c8aa12aa" }, - "mason.nvim": { "branch": "main", "commit": "14ae1ca58440b158a0a35cf90773013caddf788a" }, - "mini.fuzzy": { "branch": "stable", "commit": "292ecf747cf7f7af12d6804389ee7ddafaad2bf9" }, - "mini.move": { "branch": "main", "commit": "78fdbc1a59b55ee729d6cd053968e398346687fe" }, - "mini.pairs": { "branch": "stable", "commit": "fec9aba50912d8c3d92d07d6a77952de84f8d7ad" }, - "mini.trailspace": { "branch": "main", "commit": "cfbe50f17e92868a5cb65d7fcedae4340553f5a2" }, - "mkdnflow.nvim": { "branch": "main", "commit": "941c3a4aee26b28573ac3b67ace2dfd84fc7964c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e2b82cf4c68b453eeab5833d90c042ed4b49d0e1" }, + "mason.nvim": { "branch": "main", "commit": "a35f3c44381c8ce37faefd427b474ea5ef72d37d" }, + "mini.fuzzy": { "branch": "stable", "commit": "e8faf897330eadb1b1b76da67eeff04be85cbd8b" }, + "mini.move": { "branch": "main", "commit": "c225a1de04923570e238ed074b5c50f96910b225" }, + "mini.pairs": { "branch": "stable", "commit": "4ebc1ff8d77fe75e8f219432302800ca29e17614" }, + "mini.surround": { "branch": "main", "commit": "6a4f31e2a380439315729f561d7e7898bde1fd52" }, + "mini.trailspace": { "branch": "main", "commit": "8566ae0cf1524b263e489b6771d339025773189e" }, + "mkdnflow.nvim": { "branch": "main", "commit": "51cf944514e49662cca8a075b1a8f485c2c39d0f" }, "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, "neovim": { "branch": "main", "commit": "845a6ad5443e3559dde42910c4523a5835c9233b" }, "nord.nvim": { "branch": "main", "commit": "70df2b61de21b953fd577f292a973cd22e0ca686" }, - "null-ls.nvim": { "branch": "main", "commit": "ab4e9261843236d773f49a23fcfb3d2167a3c500" }, - "nvim": { "branch": "main", "commit": "c5ed88194ae1d581d3083725a0dc7c90dd3446be" }, - "nvim-cmp": { "branch": "main", "commit": "cfafe0a1ca8933f7b7968a287d39904156f2c57d" }, + "null-ls.nvim": { "branch": "main", "commit": "9d811bb6ed44cf766f4bda8a47fd65fdfbdcaa7d" }, + "nvim": { "branch": "main", "commit": "a5f3ed5d3b1d9ea21183718a8a89a6653bd6ea48" }, + "nvim-cmp": { "branch": "main", "commit": "aae0c3e4e778ca4be6fabc52e388cbd5b844b7a5" }, "nvim-dap": { "branch": "master", "commit": "401f5f22b2d7f9bdbb9294d0235136091458816a" }, "nvim-dap-python": { "branch": "master", "commit": "d4400d075c21ed8fb8e8ac6a5ff56f58f6e93531" }, - "nvim-lspconfig": { "branch": "master", "commit": "27e6eb27f31d1ef41427e1008029284c02dc856f" }, + "nvim-lspconfig": { "branch": "master", "commit": "1712672e4da3003a0dd9f771d30389600b360f42" }, "nvim-mapper": { "branch": "main", "commit": "7585479199ad7c3fdfed47ae79d26198f948cfc5" }, "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" }, - "nvim-tree.lua": { "branch": "master", "commit": "02fdc262eba188198a7deb2117b3b996e6763d65" }, - "nvim-treesitter": { "branch": "master", "commit": "f6df07be122de665fb363476cc3680c90f5bdf05" }, - "nvim-web-devicons": { "branch": "master", "commit": "ade34ca7d19543904b28b903e606be8930fb9ee3" }, + "nvim-tree.lua": { "branch": "master", "commit": "8b8d457e07d279976a9baac6bbff5aa036afdc5f" }, + "nvim-treesitter": { "branch": "master", "commit": "ad9ae9e7def54fee446c3e186ed0a0d44cca7b90" }, + "nvim-web-devicons": { "branch": "master", "commit": "bd7a222287c5828cd0607cd0a5605e52f0460074" }, "plenary.nvim": { "branch": "master", "commit": "9a0d3bf7b832818c042aaf30f692b081ddd58bd9" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "prettier.nvim": { "branch": "main", "commit": "918b99f5ddd7a56395fd393767ab6a3c15a50789" }, "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "304508fb7bea78e3c0eeddd88c4837501e403ae8" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "a18f78121d74c4fae9edd29e138a918a8ede2a70" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "7de3baef1ec4fb77f7a8195fe87bebd513244b6a" }, "telescope.nvim": { "branch": "master", "commit": "b79cd6c88b3d96b0f49cb7d240807cd59b610cd8" }, diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 4dbcf02..e0bf591 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -27,130 +27,97 @@ map('n', 'q', 'vem_move_buffer_left', default_opts) -- Applications and Plugins shortcuts ----------------------------------------------------------- --- nvim-tree -map('n', 'n', ':NvimTreeToggle', default_opts) -- open/close -map('n', 'q', ':NvimTreeRefresh', default_opts) -- refresh - --- Place Check box for To-Do style Lists -map('i','', '* [ ] ', default_opts) - --- Nvim Tree Resize -map('n', '=', ':NvimTreeResize +1', default_opts) -map('n', '-', ':NvimTreeResize -1', default_opts) -map('n', '==', ':NvimTreeResize +10', default_opts) -map('n', '--', ':NvimTreeResize -10', default_opts) - ----------------------------------------------------------- -- Telescope Keymaps ----------------------------------------------------------- -map('n', 'ff', ':Telescope find_files', default_opts) -map('n', 'fg', ':Telescope live_grep', default_opts) -map('n', 'fb', ':Telescope buffers', default_opts) -map('n', 'fe', ':Telescope file_browser', default_opts) + +-- For Neovim >= 0.7.0 Mapper = require("nvim-mapper") local M = Mapper.map --- For Neovim >= 0.7.0 -M( - 'n', 'P', ":MarkdownPreview", - {silent = true, noremap = true}, - "Markdown Preview", - "md_preview", - "Display Markdown preview in Qutebrowser" +local default_opts = {noremap=true, silent=true} + +-- Sidebar +M('n', 'n', ':SidebarNvimToggle', default_opts, + "Sidebar Toggle", "sidebar-toggle", "Open or Close Sidebar" +) +M('n', 'q', ':SidebarNvimUpdate', default_opts, + "Sidebar Update", "sidebar-update", "Refresh the Sidebar" ) -M( - 'n', 'fe', ":Telescope file_browser", - {silent=true, noremap=true}, - "Telescope Files", - "telescope-file-browser", - "Find files and directories in telescope" +--[[ Sidebar Resize +M('n', '=', ':SidebarNvimResize +1', default_opts, + "Sidebar +1", "sidebar-plus1", "Sidebar Bigger by one" +) +M('n', '-', ':SidebarNvimResize -1', default_opts, + "Sidebar -1", "sidebar-minus1", "Sidebar Smaller by one" +) +M('n', '==', ':SidebarNvimResize +10', default_opts, + "Sidebar +10", "sidebar-plus10", "Sidebar Bigger by 10" +) +M('n', '--', ':SidebarNvimResize -10', default_opts, + "Sidebar -10", "sidebar-minus10", "Sidebar Smaller by 10" +)--]] + +-- Markdown Preview Toggle +M('n', 'P', ":MarkdownPreview", default_opts, + "Markdown Preview", "md_preview", "Display Markdown preview in Qutebrowser" ) -M( - 'n', '', "@t", - {silent=true, noremap=true}, - "Add Todo", - "todo_todo", - "Add To-do/Task to the beginning of the line" +-- Telescope Options +M('n', 'ff', ':Telescope find_files', default_opts, + "Find Files", "find-files", "Find Files in Telescope pop-up" +) +M('n', 'fg', ':Telescope live_grep', default_opts, + "Live Grep", "live-grep", "Grep Files in Telescope pop-up" +) +M('n', 'fb', ':Telescope buffers', default_opts, + "Buffers", "buffers", "See Buffers in Telescope pop-up" +) +M('n', 'fe', ":Telescope file_browser", default_opts, + "Telescope Files", "telescope-file-browser", "Find files and directories in telescope" ) -M( - 'n', '', "@s", - {silent=true, noremap=true}, - "Add Solutions Engineering", - "todo_seng", - "Add Solutions Engineering to the beginning of the line" +M('n', '', "@t", default_opts, + "Add Todo", "todo_todo", "Add To-do/Task to the beginning of the line" ) -M( - 'n', '', "@f", - {silent=true, noremap=true}, - "Add Feature", - "add_feat", - "Add Feature Request tag to the beginning of the line. " +M('n', '', "@s", default_opts, + "Add Solutions Engineering", "todo_seng", "Add Solutions Engineering to the beginning of the line" ) -M( - 'n', '', "@c", - {silent=true, noremap=true}, - "Replace with Complete", - "add_complete", - "Replace tag with Complete tag at beginning of the line." +M('n', '', "@f", default_opts, + "Add Feature", "add_feat", "Add Feature Request tag to the beginning of the line. " +) + +M( 'n', '', "@c", default_opts, + "Replace with Complete", "add_complete", "Replace tag with Complete tag at beginning of the line." ) -M( - 'n', '', "@w", - {silent=true, noremap=true}, - "Add Warning/Error", - "add_error", - "Add Warning/Error tag at the beginning of the line." +M('n', '', "@w", default_opts, + "Add Warning/Error", "add_error", "Add Warning/Error tag at the beginning of the line." ) -M( - 'n', 'ce', ":TodoTrouble keywords=TODO | :resize +10", - {silent=true, noremap=true}, - "Show Todo Tags", - "show_todos", - "Show Todo Tags." +M('n', 'ce', ":TodoTrouble keywords=TODO | :resize +10", default_opts, + "Show Todo Tags", "show_todos", "Show Todo Tags." ) -M( - 'n', 'cf', ":TodoTrouble keywords=FEAT", - {silent=true, noremap=true}, - "Show Feature Tags", - "show_features", - "Show Feature Requests." +M('n', 'cf', ":TodoTrouble keywords=FEAT", default_opts, + "Show Feature Tags", "show_features", "Show Feature Requests." ) -M( - 'n', 'cq', ":TodoTrouble keywords=ERROR, WARN", - {silent=true, noremap=true}, - "Show Warning Tags", - "show_warnings", - "Show Errors Tags." +M('n', 'cq', ":TodoTrouble keywords=ERROR, WARN", default_opts, + "Show Warning Tags", "show_warnings", "Show Errors Tags." ) -M( - 'n', 'b', ":! black %", - {silent=true, noremap=true}, - "Black Formatting", - "black_current_file", - "Use Black Formatting on Current File." +M('n', 'b', ":! black %", default_opts, + "Black Formatting", "black_current_file", "Use Black Formatting on Current File." ) -M( - 'n', 'm', ":! markdownlint -f %", - {silent=true, noremap=true}, - "Markdownlint", - "md_lint_format", - "Use mdlint Formatting on Current File." +M('n', 'm', ":! markdownlint -f %", default_opts, + "Markdownlint", "md_lint_format", "Use mdlint Formatting on Current File." ) -M( - 'n', 'r30', ":resize 30", - {silent=true, noremap=true}, - "Resize30", - "resize_30", - "Resize Window to #30" +M('n', 'r30', ":resize 30", default_opts, + "Resize30", "resize_30", "Resize Window to #30" ) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index d6b754e..85ab8b3 100755 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -7,7 +7,7 @@ return { -- Manage all your Keymaps! { - "lazytanuki/nvim-mapper", + "gregorias/nvim-mapper", config = function() require("nvim-mapper").setup{} end, before = "telescope.nvim" }, @@ -81,6 +81,9 @@ return { end }, 'echasnovski/mini.trailspace', + { + 'echasnovski/mini.surround', version = '*' + }, { 'echasnovski/mini.pairs', branch = 'stable', config = function()