Use more nvim based plugins

2 files changed, 32 insertions, 13 deletions

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,