Merge pull request #27 from gvolpe/nixpkgs/jan-05-2025

flakes: update all inputs on January 5, 2025

Author: gvolpe

flake.lock

@@ -14,17 +14,9 @@ let
     };
   };
 
-  smithy-lsp = pkgs.callPackage ./smithy-lspconfig.nix { };
-
-  smithyLspHook = ''
-    cat >> $out/lua/lspconfig/server_configurations/smithy.lua <<EOL
-    ${smithy-lsp.lua}
-    EOL
-  '';
-
   # sync queries of tree-sitter-scala and nvim-treesitter
   queriesHook = ''
-    cp ${inputs.tree-sitter-scala}/queries/scala/* $out/queries/scala/
+    cp ${inputs.tree-sitter-scala}/queries/* $out/queries/scala/
     cp ${ts.builtGrammars.tree-sitter-smithy}/queries/highlights.scm $out/queries/smithy/highlights.scm
   '';
 
@@ -44,25 +36,38 @@ let
     ln -s ${grammars} parser
   '';
 
-  buildPlug = name: grammars: buildVimPlugin {
-    pname = name;
-    version = "master";
-    src = builtins.getAttr name inputs;
-    preFixup = ''
-      ${writeIf (name == "nvim-lspconfig") smithyLspHook}
-      ${writeIf (name == "nvim-treesitter") tsPreFixupHook}
-      ${writeIf (name == "telescope-media-files") telescopeFixupHook}
-    '';
-    postPatch = ''
-      ${writeIf (name == "nvim-treesitter") (tsPostPatchHook grammars)}
-    '';
-  };
+  plenaryPostPatchHook = ''
+    sed -Ei lua/plenary/curl.lua \
+        -e 's@(command\s*=\s*")curl(")@\1${pkgs.curl}/bin/curl\2@'
+  '';
+
+  # following https://github.com/NixOS/nixpkgs/blob/d86ae899d2909c0899e4d3b29d90d5309771e77c/pkgs/applications/editors/vim/plugins/overrides.nix#L139
+  buildPlug = name: grammars:
+    let overrides = (final.callPackage ./plugins/overrides.nix { }) { p = name; };
+    in buildVimPlugin {
+      inherit name;
+      inherit (overrides) checkInputs dependencies nvimRequireCheck nvimSkipModule;
+
+      version = "master";
+      src = lib.getAttr name inputs;
+
+      doInstallCheck = name == "diffview" || name == "plenary-nvim";
+      dontBuild = name == "nvim-metals";
+
+      preFixup = ''
+        ${writeIf (name == "nvim-treesitter") tsPreFixupHook}
+        ${writeIf (name == "telescope-media-files") telescopeFixupHook}
+      '';
+      postPatch = ''
+        ${writeIf (name == "nvim-treesitter") (tsPostPatchHook grammars)}
+        ${writeIf (name == "plenary-nvim") plenaryPostPatchHook}
+      '';
+    };
 
   vimPlugins = {
     inherit (pkgs.vimPlugins) nerdcommenter;
   };
-in
-rec {
+
   # override at use site with your own preferences
   treesitterGrammars = t: t.withPlugins (p: [
     p.tree-sitter-scala
@@ -73,6 +78,9 @@ rec {
     p.tree-sitter-markdown-inline
     p.tree-sitter-smithy
   ]);
+in
+{
+  inherit treesitterGrammars;
 
   neovimPlugins =
     let

lib/buildPlugin.nix

@@ -0,0 +1,87 @@
+{ curl, neovimPlugins, ... }:
+
+# https://github.com/NixOS/nixpkgs/blob/d86ae899d2909c0899e4d3b29d90d5309771e77c/pkgs/applications/editors/vim/plugins/overrides.nix#L139
+let
+  withDeps = cond: deps: if cond then deps else [ ];
+
+  cmpSkip = [
+    "cmp.matcher_spec"
+    "cmp.source_spec"
+    "cmp.types.lsp_spec"
+    "cmp.context_spec"
+    "cmp.core_spec"
+    "cmp.utils.feedkeys_spec"
+    "cmp.utils.async_spec"
+    "cmp.utils.misc_spec"
+    "cmp.utils.api_spec"
+    "cmp.utils.binary_spec"
+    "cmp.utils.keymap_spec"
+    "cmp.utils.str_spec"
+    "cmp.entry_spec"
+  ];
+
+  snackSkip = [
+    # Requires setup call first
+    "snacks.dashboard"
+    "snacks.debug"
+    "snacks.dim"
+    "snacks.git"
+    "snacks.indent"
+    "snacks.input"
+    "snacks.lazygit"
+    "snacks.notifier"
+    "snacks.scratch"
+    "snacks.scroll"
+    "snacks.terminal"
+    "snacks.win"
+    "snacks.words"
+    "snacks.zen"
+    # Optional trouble integration
+    "trouble.sources.profiler"
+  ];
+in
+{ p }: {
+  checkInputs =
+    (withDeps (p == "modes-nvim") [ neovimPlugins.nvim-cmp ]) ++
+    (withDeps (p == "cmp-path") [ neovimPlugins.nvim-cmp ]) ++
+    (withDeps (p == "cmp-vsnip") [ neovimPlugins.nvim-cmp ]);
+
+  dependencies =
+    (withDeps (p == "diffview") [ neovimPlugins.plenary-nvim ]) ++
+    (withDeps (p == "harpoon") [ neovimPlugins.plenary-nvim ]) ++
+    (withDeps (p == "neogit") [ neovimPlugins.plenary-nvim ]) ++
+    (withDeps (p == "noice") [ neovimPlugins.nui-nvim ]) ++
+    (withDeps (p == "nvim-metals") [ neovimPlugins.plenary-nvim ]) ++
+    (withDeps (p == "nvim-treesitter-textobjects") [ neovimPlugins.nvim-treesitter ]) ++
+    (withDeps (p == "nvim-ufo") [ neovimPlugins.promise-async ]) ++
+    (withDeps (p == "telescope") [ neovimPlugins.plenary-nvim ]) ++
+    (withDeps (p == "todo-comments") [ neovimPlugins.plenary-nvim ]);
+
+  nvimRequireCheck =
+    (withDeps (p == "diffview") [ "diffview" ]) ++
+    (withDeps (p == "harpoon") [ "harpoon" ]) ++
+    (withDeps (p == "neogit") [ "neogit" ]) ++
+    (withDeps (p == "noice") [ "noice" ]) ++
+    (withDeps (p == "nvim-metals") [ "metals" ]) ++
+    (withDeps (p == "nvim-treesitter") [ "nvim-treesitter" ]) ++
+    (withDeps (p == "nvim-ufo") [ "ufo" ]) ++
+    (withDeps (p == "plenary-nvim") [ "plenary" ]) ++
+    (withDeps (p == "todo-comments") [ "todo-comments" ]);
+
+  nvimSkipModule =
+    (withDeps (p == "indent-blankline") [ "ibl.config.types" ]) ++
+    (withDeps (p == "nvim-autopairs") [ "nvim-autopairs.completion.cmp" "nvim-autopairs.completion.compe" ]) ++
+    (withDeps (p == "nvim-bufferline") [ "bufferline.commands" ]) ++
+    (withDeps (p == "nvim-cmp") cmpSkip) ++
+    (withDeps (p == "nvim-neoclip") [ "neoclip.fzf" "neoclip.telescope" ]) ++
+    (withDeps (p == "nvim-notify") [ "notify.integrations.fzf" ]) ++
+    (withDeps (p == "nvim-treesitter-context") [ "install_parsers" ]) ++
+    (withDeps (p == "nvim-surround") [ "nvim-surround.queries" ]) ++
+    (withDeps (p == "onedark") [ "barbecue.theme.onedark" "onedark.highlights" "onedark.colors" "onedark.terminal" ]) ++
+    (withDeps (p == "snacks") snackSkip) ++
+    (withDeps (p == "telescope-tabs") [ "search" "search.settings" "search.util" ]) ++
+    (withDeps (p == "tide") [ "tide.render" "tide.api" "tide.panel" "tide" ]) ++
+    (withDeps (p == "tokyonight") [ "tokyonight.docs" "tokyonight.extra.fzf" ]) ++
+    (withDeps (p == "trouble") [ "trouble.docs" ]) ++
+    (withDeps (p == "which-key") [ "which-key.docs" ]);
+}

lib/plugins/overrides.nix

@@ -476,7 +476,7 @@ in
         -- Smithy config
         vim.cmd([[au BufRead,BufNewFile *.smithy setfiletype smithy]])
 
-        lspconfig.smithy.setup {
+        lspconfig.smithy_ls.setup {
           capabilities = capabilities;
           on_attach = function(client, bufnr)
             attach_keymaps(client, bufnr)
@@ -494,7 +494,7 @@ in
 
       ${writeIf cfg.ts ''
         -- TS config
-        lspconfig.tsserver.setup {
+        lspconfig.ts_ls.setup {
           capabilities = capabilities;
           on_attach = function(client, bufnr)
             attach_keymaps(client, bufnr)