Use more nvim based plugins

5 files changed, 46 insertions, 21 deletions

diff --git a/config/nvim/colors/tranquil.vim b/config/nvim/colors/tranquil.vim
index 92f5a91..f331a5a 100644
--- a/config/nvim/colors/tranquil.vim
+++ b/config/nvim/colors/tranquil.vim
@@ -112,3 +112,4 @@ hi WildMenu        guifg=#80FFCC guibg=#0F261F
 hi CursorLine      guibg=#FFFFFFFF
 hi ColorColumn     guifg=#FFFFFF guibg=#FA3B00
 
+hi WhichKeyDesc guifg=#0F261F
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 58c4bf7..e1e61f6 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -112,6 +112,9 @@ vim.g.coq_settings = {
 -- Oil
 vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" })
 
+-- UndoTree
+vim.keymap.set('n', '<leader>U', vim.cmd.UndotreeToggle)
+
 -- Plugins
 require('plugins')
 require('treesitter_config')
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 98bd307..a011a46 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,24 +1,26 @@
 {
   "LargeFile": { "branch": "master", "commit": "3941a37b2b0288524300348a39521a46539bf9f6" },
   "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" },
-  "coq_nvim": { "branch": "coq", "commit": "a290446adad540d780e87d7fa8ef86bb2fdc2951" },
-  "fzf-lua": { "branch": "main", "commit": "fb94dde9147af859463b9a1a929159b572ee723b" },
+  "autoclose.nvim": { "branch": "main", "commit": "dc42806540dcf448ecb2bad6b67204410cfbe629" },
+  "coq_nvim": { "branch": "coq", "commit": "806a0a71a20795a6b3cd11e0bc9deaa68ae81d7f" },
+  "fzf-lua": { "branch": "main", "commit": "fea7e7b98af19fe4bc988828073da21b9ad1c3a6" },
   "gemini.vim": { "branch": "master", "commit": "c9efb59c97b71c28d4678c79fd21fbdd3a69d196" },
-  "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
+  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
   "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
   "neogen": { "branch": "main", "commit": "b95347a588401a755eadd17482edc1662876bd58" },
   "nota.nvim": { "branch": "main", "commit": "ca10d2a36e3e7d8d28f15f36f0812384606c238d" },
   "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" },
   "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
   "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "1917b562a02f20885900b1da0f0ea25028ccedab" },
-  "nvim-treesitter": { "branch": "master", "commit": "b781fd058224f67df7469b8f376c42a8d85e11db" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e5e600232188ed9fb960f5df6bb06084ae8bf3ec" },
+  "nvim-treesitter": { "branch": "master", "commit": "c09932bd2de01dc9c01e870fe83060693c67de13" },
+  "nvim-treesitter-endwise": { "branch": "master", "commit": "156d5782b3a68845f824156e45fc5bb038211e7b" },
   "oil.nvim": { "branch": "master", "commit": "18dfd2458dc741fea683357a17aaa95870b25a3c" },
   "snes-syntax-vim": { "branch": "master", "commit": "a6a699c8905f7b6119bf91e44f960667d9f03d59" },
   "tree-sitter-api-notation": { "branch": "main", "commit": "3113c6077d9ed1e662a891714ac00e1ee3bb7657" },
-  "vim-closer": { "branch": "master", "commit": "6007d9db0a35e983af246b667282606612076b07" },
-  "vim-endwise": { "branch": "master", "commit": "3719ffddb5e42bf67b55b2183d7a6fb8d3e5a2b8" },
+  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-fugitive": { "branch": "master", "commit": "41beedabc7e948c787ea5696e04c3544c3674e23" },
   "vim-indent-object": { "branch": "master", "commit": "8ab36d5ec2a3a60468437a95e142ce994df598c6" },
-  "vim-togglelist": { "branch": "master", "commit": "48f0d30292efdf20edc883e61b121e6123e03df7" }
+  "vim-togglelist": { "branch": "master", "commit": "48f0d30292efdf20edc883e61b121e6123e03df7" },
+  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }
\ No newline at end of file
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 14a9311..35f8327 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -13,10 +13,10 @@ vim.opt.rtp:prepend(lazypath)
 
 require('lazy').setup({
   {
-    "ibhagwan/fzf-lua",
+    'ibhagwan/fzf-lua',
     config = function()
       -- calling `setup` is optional for customization
-      require("fzf-lua").setup({
+      require('fzf-lua').setup({
         winopts={
           width=1,
           height=0.4,
@@ -42,11 +42,11 @@ require('lazy').setup({
         previewers = {
           builtin = {
             extensions = {
-              ["png"] = { "chafa", "-f", "symbols", "{file}" },
-              ["gif"] = { "chafa", "-f", "symbols", "{file}" },
-              ["svg"] = { "chafa", "-f", "symbols", "{file}" },
-              ["jpg"] = { "chafa", "-f", "symbols", "{file}" },
-              ["jpeg"] = { "chafa", "-f", "symbols", "{file}" }
+              ['png'] = { 'chafa', '-f', 'symbols', '{file}' },
+              ['gif'] = { 'chafa', '-f', 'symbols', '{file}' },
+              ['svg'] = { 'chafa', '-f', 'symbols', '{file}' },
+              ['jpg'] = { 'chafa', '-f', 'symbols', '{file}' },
+              ['jpeg'] = { 'chafa', '-f', 'symbols', '{file}' }
             }
           }
         }
@@ -57,17 +57,22 @@ require('lazy').setup({
   -- Syntaxes
   'ARM9/snes-syntax-vim',
   'https://git.sr.ht/~torresjrjr/gemini.vim',
-  { "folke/neodev.nvim", opts = {} },
+  { 'folke/neodev.nvim', opts = {} },
 
-  -- Debugging
+  --'Debugging
   'mfussenegger/nvim-dap',
   'rcarriga/nvim-dap-ui',
   'mxsdev/nvim-dap-vscode-js',
 
   -- Editing
   'ms-jpq/coq_nvim',
-  'tpope/vim-endwise',
-  'rstacruz/vim-closer',
+  'RRethy/nvim-treesitter-endwise',
+  {
+    'm4xshen/autoclose.nvim',
+    config = function()
+      require('autoclose').setup()
+    end
+  },
   'michaeljsmith/vim-indent-object',
   {
     'Pocco81/auto-save.nvim',
@@ -98,13 +103,23 @@ require('lazy').setup({
   'folke/neodev.nvim',
 
   -- Tools
+  'mbbill/undotree',
   'vim-scripts/LargeFile',
   'tpope/vim-fugitive',
   'milkypostman/vim-togglelist',
+  {
+    'folke/which-key.nvim',
+    event = 'VeryLazy',
+    init = function()
+      vim.o.timeout = true
+      vim.o.timeoutlen = 300
+    end,
+    opts = {}
+  },
   { 'stevearc/oil.nvim', opts = {
     keymaps = {
-      ["<C-p>"] = false,
-      ["<C-S-p>"] = "actions.preview"
+      ['<C-p>'] = false,
+      ['<C-S-p>'] = 'actions.preview'
     }
   } },
 
diff --git a/config/nvim/lua/treesitter_config.lua b/config/nvim/lua/treesitter_config.lua
index 32e4ed2..ded65ac 100644
--- a/config/nvim/lua/treesitter_config.lua
+++ b/config/nvim/lua/treesitter_config.lua
@@ -33,6 +33,10 @@ require'nvim-treesitter.configs'.setup {
   sync_install = false,
   auto_install = true,
 
+  endwise = {
+    enable = true
+  },
+
   highlight = {
     enable = true,