modules/lsp: switch to explicit lib calls

modules/lsp/lsp-signature/config.nix

@@ -3,25 +3,29 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf nvim optionalString;
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.strings) optionalString;
 
   cfg = config.vim.lsp;
 in {
   config = mkIf (cfg.enable && cfg.lspSignature.enable) {
-    vim.startPlugins = [
-      "lsp-signature"
-    ];
+    vim = {
+      startPlugins = [
+        "lsp-signature"
+      ];
 
-    vim.luaConfigRC.lsp-signature = nvim.dag.entryAnywhere ''
-      -- Enable lsp signature viewer
-      require("lsp_signature").setup({
-        ${optionalString (config.vim.ui.borders.plugins.lsp-signature.enable) ''
-        bind = true, -- This is mandatory, otherwise border config won't get registered.
-        handler_opts = {
-          border = "${config.vim.ui.borders.plugins.lsp-signature.style}"
-        }
-      ''}
-      })
-    '';
+      luaConfigRC.lsp-signature = entryAnywhere ''
+        -- Enable lsp signature viewer
+        require("lsp_signature").setup({
+          ${optionalString config.vim.ui.borders.plugins.lsp-signature.enable ''
+          bind = true, -- This is mandatory, otherwise border config won't get registered.
+          handler_opts = {
+            border = "${config.vim.ui.borders.plugins.lsp-signature.style}"
+          }
+        ''}
+        })
+      '';
+    };
   };
 }

modules/lsp/lsp-signature/default.nix

@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./lsp-signature.nix
     ./config.nix

modules/lsp/lsp-signature/lsp-signature.nix

@@ -1,13 +1,9 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib) mkEnableOption;
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
 in {
   options.vim.lsp = {
     lspSignature = {
-      enable = mkEnableOption "lsp signature viewer";
+      enable = mkEnableOption "lsp signature viewer [lsp-signature]";
     };
   };
 }