From bd34b3e9a87657b6e8728eee3e136cc224a6f5ec Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Sun, 28 Apr 2024 10:34:30 +0200
Subject: [PATCH] VIM: add autopairs and autotag

---
 modules/hm/nvim/nvim-cmp-config.lua |  5 ++++
 modules/hm/vim.nix                  | 42 ++++++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/modules/hm/nvim/nvim-cmp-config.lua b/modules/hm/nvim/nvim-cmp-config.lua
index e30c4d3..7dba4ea 100644
--- a/modules/hm/nvim/nvim-cmp-config.lua
+++ b/modules/hm/nvim/nvim-cmp-config.lua
@@ -42,3 +42,8 @@ cmp.setup({
   }),
 })
 
+local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+cmp.event:on(
+  'confirm_done',
+  cmp_autopairs.on_confirm_done()
+)
diff --git a/modules/hm/vim.nix b/modules/hm/vim.nix
index 41e895c..c6f7762 100644
--- a/modules/hm/vim.nix
+++ b/modules/hm/vim.nix
@@ -23,13 +23,15 @@ let vp = pkgs.vimPlugins; in {
         type = "lua";
         config = ''require("nvim-surround").setup({})'';
       }
-      {
-        plugin = vp.autoclose-nvim;
-        type = "lua";
-        config = ''
-          require("autoclose").setup({})
-        '';
-      }
+      # {
+      #   plugin = vp.autoclose-nvim;
+      #   type = "lua";
+      #   config = ''
+      #     require("autoclose").setup({})
+      #   '';
+      # }
+
+
 
       vp.telescope-fzf-native-nvim
       {
@@ -221,6 +223,32 @@ let vp = pkgs.vimPlugins; in {
           })
         '';
       }
+
+      {
+        plugin = vp.nvim-autopairs;
+        type = "lua";
+        config = ''
+          local npairs = require("nvim-autopairs")
+          npairs.setup({check_ts = true})
+        '';
+      }
+
+      {
+        plugin = vp.nvim-ts-autotag;
+        type = "lua";
+        config = ''
+          require('nvim-ts-autotag').setup()
+
+          vim.lsp.handlers['textDocument/publishDiagnostics'] = vim.lsp.with(
+            vim.lsp.diagnostic.on_publish_diagnostics, {
+                underline = true,
+                virtual_text = { spacing = 5, severity_limit = 'Warning' },
+                update_in_insert = true,
+            }
+          )
+        '';
+      }
+
     ];
     # settings = { ignorecase = true; };
     # coc.enable = true;