feat(plugins, keymaps): Add plugins, move plugins to nix, update keymaps

Added:
  - [aerial.nvim](https://github.com/stevearc/aerial.nvim)
  - [better-escape.nvim](https://github.com/max397574/better-escape.nvim)
  - [dressing.nvim](https://github.com/stevearc/dressing.nvim)
  - [ident-blankline.nvim](https://github.com/lukas-reineke/indent-blankline.nvim)
  - [nvim-notify](https://github.com/rcarriga/nvim-notify)
  - [todo-comments.nvim](https://github.com/folke/todo-comments.nvim)

Moved plugin source from Github to Nix:
  - [Comment.nvim](https://github.com/numToStr/Comment.nvim)
  - [neo-tree.nvim](https://github.com/numToStr/Comment.nvim)

Mapped windown switching to `<C-h`... instead of `<M-h`...
Moved some coliding lsp keymaps under the `<leader>l` group
  - Eg. `<leader>ls` for signature help

nvim/plugin/aerial.lua

@@ -0,0 +1,17 @@
+if vim.g.did_load_aerial_plugin then
+  return
+end
+vim.g.did_load_aerial_plugin = true
+
+require("aerial").setup({
+  -- optionally use on_attach to set keymaps when aerial has attached to a buffer
+  on_attach = function(bufnr)
+    -- Jump forwards/backwards with '{' and '}'
+    vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", { buffer = bufnr })
+    vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", { buffer = bufnr })
+  end,
+})
+-- You probably also want to set a keymap to toggle aerial
+vim.keymap.set("n", "<leader>a", "<cmd>AerialToggle!<CR>")
+
+

nvim/plugin/autocommands.lua

@@ -80,9 +80,9 @@ vim.api.nvim_create_autocmd('LspAttach', {
     keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = 'lsp [g]o to [d]efinition' })
     keymap.set('n', 'K', vim.lsp.buf.hover, { desc = '[lsp] hover' })
     keymap.set('n', 'gi', vim.lsp.buf.implementation, { desc = 'lsp [g]o to [i]mplementation' })
-    keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, { desc = '[lsp] signature help' })
+    keymap.set('n', '<leader>ls', vim.lsp.buf.signature_help, { desc = '[l]sp [s]ignature help' })
     keymap.set('n', '<M-CR>', vim.lsp.buf.code_action, { desc = '[lsp] code action' })
-    keymap.set('n', '<M-l>', vim.lsp.codelens.run, { desc = '[lsp] run code lens' })
+    keymap.set('n', '<leader>ll', vim.lsp.codelens.run, { desc = '[l]sp run code [l]ens' })
     keymap.set('n', 'gr', vim.lsp.buf.references, { desc = 'lsp [g]et [r]eferences' })
 
     wk.add({

nvim/plugin/ident-blankline.lua

@@ -0,0 +1,33 @@
+if vim.g.did_load_ibl_plugin then
+  return
+end
+vim.g.did_load_ibl_plugin = true
+
+local highlight = {
+    "RainbowRed",
+    "RainbowYellow",
+    "RainbowBlue",
+    "RainbowOrange",
+    "RainbowGreen",
+    "RainbowViolet",
+    "RainbowCyan",
+}
+
+local hooks = require "ibl.hooks"
+-- create the highlight groups in the highlight setup hook, so they are reset
+-- every time the colorscheme changes
+hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
+    vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" })
+    vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" })
+    vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" })
+    vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" })
+    vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" })
+    vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" })
+    vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" })
+end)
+
+require("ibl").setup{
+  indent = {
+    highlight = highlight
+  }
+}

nvim/plugin/keymaps.lua

@@ -189,10 +189,12 @@ keymap.set('n', '<C-u>', '<C-u>zz', { desc = 'move [u]p half-page and center' })
 keymap.set('n', '<C-f>', '<C-f>zz', { desc = 'move DOWN [f]ull-page and center' })
 keymap.set('n', '<C-b>', '<C-b>zz', { desc = 'move UP full-page and center' })
 
-keymap.set('n', '<M-h>', '<Cmd>wincmd h<CR>', { desc = 'focus left window' })
-keymap.set('n', '<M-j>', '<Cmd>wincmd j<CR>', { desc = 'focus bottom window' })
-keymap.set('n', '<M-k>', '<Cmd>wincmd k<CR>', { desc = 'focus top window' })
-keymap.set('n', '<M-l>', '<Cmd>wincmd l<CR>', { desc = 'focus right window' })
+keymap.set('n', '<C-h>', '<Cmd>wincmd h<CR>', { desc = 'focus left window' })
+keymap.set('n', '<C-j>', '<Cmd>wincmd j<CR>', { desc = 'focus bottom window' })
+keymap.set('n', '<C-k>', '<Cmd>wincmd k<CR>', { desc = 'focus top window' })
+keymap.set('n', '<C-l>', '<Cmd>wincmd l<CR>', { desc = 'focus right window' })
+
+keymap.set('n', '<leader>tt', '<Cmd>TodoTelescope<Cr>', { desc = '[t]elescope [t]odo comments'})
 
 --- Disabled keymaps [enable at your own risk]
 

nvim/plugin/plugins.lua

@@ -12,3 +12,5 @@ require("dapui").setup()
 require('nvim-surround').setup()
 require('which-key').setup()
 require('Comment').setup()
+require("better_escape").setup()
+require("todo-comments").setup()

nvim/plugin/treesitter.lua

@@ -50,10 +50,10 @@ configs.setup {
     swap = {
       enable = true,
       swap_next = {
-        ['<leader>a'] = '@parameter.inner',
+        ['<leader>sa'] = '@parameter.inner',
       },
       swap_previous = {
-        ['<leader>A'] = '@parameter.inner',
+        ['<leader>sA'] = '@parameter.inner',
       },
     },
     move = {