chore(*): some changes from upstream, add x mode in keymap (lib.*n*Keymap)

- feat(mappings): support range lsp formatting
(NvChad/NvChad@118d995)
- fix(mappings): use x instead of v for lsp format
(NvChad/NvChad@fea9194)
- fix(lspconfig): use LspAttach for setting on_attach mappings
(NvChad/NvChad@4765c80)
- fix: remove un-needed luasnip autocmd
(NvChad/NvChad@478299d)

Author: fmway

lib/default.nix

@@ -28,7 +28,7 @@
         mode = lib.stringToCharacters x;
         inherit desc;
       };
-  }) (lib.splices [ "n" "v" "i" "t" ]));
+  }) (lib.splices [ "n" "v" "i" "t" "x" ]));
 in {
   nixvim = inputs.nixvim.lib.nixvim.extend (self: super: {
     mkLuaFn' = template false;

modules/nixvim/keybindings.nix

@@ -1,6 +1,6 @@
 { internal, lib, ... }:
 let
-  inherit (lib.nixvim) mkRaw mkRawFn iKeymap' nKeymap' vKeymap' tKeymap';
+  inherit (lib.nixvim) mkRaw mkRawFn iKeymap' nKeymap' vKeymap' tKeymap' nxKeymap';
 in
 { config, lib, ... }:
 {
@@ -23,7 +23,7 @@ in
     (nKeymap' "<C-c>" "<cmd>%y+<CR>" "general copy whole file")
     (nKeymap' "<leader>n" "<cmd>set nu!<CR>" "toggle line number")
     (nKeymap' "<leader>rn" "<cmd>set rnu!<CR>" "toggle relative number")
-    (nKeymap' "<leader>fm" (mkRawFn ''require("conform").format { lsp_fallback = true }'') "general format file")
+    (nxKeymap' "<leader>fm" (mkRawFn ''require("conform").format { lsp_fallback = true }'') "general format file")
     (nKeymap' "<leader>ds" (mkRaw "vim.diagnostic.setloclist") "LSP diagnostic loclist")
 
     # terminal

modules/nixvim/luasnip.nix

@@ -4,18 +4,6 @@
   plugins.cmp_luasnip.enable = config.plugins.luasnip.enable;
   plugins.luasnip = {
     enable = true;
-    luaConfig.post = ''
-      vim.api.nvim_create_autocmd("InsertLeave", {
-        callback = function()
-          if
-            require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()]
-            and not require("luasnip").session.jump_active
-          then
-            require("luasnip").unlink_current()
-          end
-        end,
-      })
-    '';
     lazyLoad.enable = true;
     lazyLoad.settings.event = "InsertEnter";
     fromVscode = [

modules/nixvim/options/default.nix

@@ -102,10 +102,15 @@ in
 
     plugins.lsp.luaConfig.pre = ''
       dofile(vim.g.base46_cache .. "lsp")
+      require("nvchad.lsp").diagnostic_config()
+      vim.api.nvim_create_autocmd("LspAttach", {
+        callback = function(args)
+          M.on_attach(_, args.buf)
+        end,
+      })
     '';
     plugins.lsp.lazyLoad.settings.before = mkRawFn ''
       require('lz.n').trigger_load('blink.cmp')
-      require("nvchad.lsp").diagnostic_config()
     '';
     plugins.lsp.keymaps.extra = [
       (nKeymap' "<leader>ra" {