From da21f7a14c232431ba00e4c1b32215e65a1bbb87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Sat, 4 May 2024 22:02:13 +0200
Subject: [PATCH] [fix] neovim: reduce closure size

Also re-enable all grammars
---
 nvim/augroups.nix |  2 +-
 nvim/nixvim.nix   | 29 +++++++++---------
 nvim/plugins.nix  | 75 ++++++++---------------------------------------
 3 files changed, 29 insertions(+), 77 deletions(-)

diff --git a/nvim/augroups.nix b/nvim/augroups.nix
index 05d781b..56f0462 100644
--- a/nvim/augroups.nix
+++ b/nvim/augroups.nix
@@ -74,7 +74,7 @@
             end
             -- Enable formatting if supported
             if capabilities.documentFormattingProvider then
-              vim.keymap.set('n', '<leader>w', function() vim.lsp.buf.format { async = true } end, { desc = 'Format Buffer', ${opts} })
+              vim.keymap.set('n', '<leader>w', function() require("conform").format({ lsp_fallback = true }) end, { desc = 'Format Buffer', ${opts} })
             end
             -- Other keybinds
             vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = '[G]o to [D]efinition', ${opts} })
diff --git a/nvim/nixvim.nix b/nvim/nixvim.nix
index 2c0238c..c050eed 100644
--- a/nvim/nixvim.nix
+++ b/nvim/nixvim.nix
@@ -51,22 +51,23 @@ in {
       keymaps = import ./mappings.nix;
       inherit (import ./augroups.nix) autoGroups autoCmd;
       extraPlugins = let
+        plugins = pkgs.vimPlugins;
         jjdescription = pkgs.callPackage ./vim-jjdescription.nix {};
-      in
-        with pkgs.vimPlugins; [
-          nvim-web-devicons
-          jjdescription
-        ];
+      in [
+        plugins.nui-nvim
+        plugins.nvim-web-devicons
+        jjdescription
+      ];
       # Formatting
-      extraPackages = with pkgs; [
-        stylua
-        shfmt
-        taplo
-        yamlfmt
-        nixpkgs-fmt
-        alejandra
-        nixfmt-classic
-        rust-analyzer
+      extraPackages = [
+        pkgs.stylua
+        pkgs.shfmt
+        pkgs.taplo
+        pkgs.yamlfmt
+        pkgs.nixpkgs-fmt
+        pkgs.alejandra
+        pkgs.nixfmt-classic
+        pkgs.luajitPackages.jsregexp
       ];
       extraConfigLuaPre = ''
         -- Lua Pre Config
diff --git a/nvim/plugins.nix b/nvim/plugins.nix
index 7debe12..83d8575 100644
--- a/nvim/plugins.nix
+++ b/nvim/plugins.nix
@@ -124,7 +124,7 @@
       c = ["clang_format"];
       cpp = ["clang_format"];
       lua = ["stylua"];
-      nix = ["nixpkgs_fmt"];
+      nix = ["alejandra"];
       rust = ["rustfmt"];
       sh = ["shfmt"];
       toml = ["taplo"];
@@ -137,7 +137,7 @@
     enable = true;
     servers = {
       bashls.enable = true;
-      clangd.enable = true;
+      # clangd.enable = true;
       html.enable = true;
       jsonls.enable = true;
       nil_ls.enable = true;
@@ -166,19 +166,28 @@
   };
   noice = {
     enable = true;
+    lsp.override = {
+      "vim.lsp.util.convert_input_to_markdown_lines" = true;
+      "vim.lsp.util.stylize_markdown" = true;
+      "cmp.entry.get_documentation" = true;
+    };
     presets = {
       # use a classic bottom cmdline for search
       bottom_search = true;
       # position the cmdline and popupmenu together
-      command_palette = true;
+      command_palette = false;
       # long messages will be sent to a split
       long_message_to_split = true;
       # enables an input dialog for inc-rename.nvim
       inc_rename = false;
       # add a border to hover docs and signature help
-      lsp_doc_border = false;
+      lsp_doc_border = true;
     };
   };
+  notify = {
+    enable = true;
+    backgroundColour = "#000000";
+  };
   nvim-colorizer = {
     enable = true;
     userDefaultOptions = {
@@ -198,64 +207,6 @@
     enable = true;
     indent = true;
     incrementalSelection.enable = true;
-    grammarPackages = let
-      parsers = pkgs.vimPlugins.nvim-treesitter-parsers;
-    in [
-      parsers.asm
-      parsers.bash
-      # parsers.bibtex
-      parsers.c
-      parsers.comment
-      parsers.commonlisp
-      parsers.cpp
-      parsers.css
-      parsers.csv
-      # parsers.d
-      parsers.diff
-      parsers.dockerfile
-      parsers.dot
-      parsers.doxygen
-      parsers.git_config
-      parsers.git_rebase
-      parsers.gitattributes
-      parsers.gitcommit
-      parsers.gitignore
-      parsers.go
-      parsers.gomod
-      parsers.gosum
-      parsers.gowork
-      parsers.html
-      parsers.ini
-      parsers.json
-      parsers.json5
-      parsers.jsonc
-      # parsers.latex
-      parsers.lua
-      parsers.luadoc
-      parsers.luap
-      parsers.luau
-      parsers.make
-      parsers.markdown
-      parsers.markdown_inline
-      parsers.meson
-      parsers.nix
-      parsers.ocaml
-      parsers.ocaml_interface
-      parsers.pem
-      parsers.python
-      parsers.rust
-      parsers.scheme
-      parsers.sql
-      parsers.ssh_config
-      parsers.toml
-      parsers.tsv
-      parsers.vim
-      parsers.vimdoc
-      parsers.wgsl
-      parsers.wgsl_bevy
-      parsers.yaml
-      parsers.zig
-    ];
   };
   trouble = {
     enable = true;