diff --git a/plugins/languages/rust.nix b/plugins/languages/rust.nix index 8355af91..e7caeb84 100644 --- a/plugins/languages/rust.nix +++ b/plugins/languages/rust.nix @@ -123,14 +123,13 @@ in { }; server = - helpers.mkCompositeOption "server" - ({ - standalone = helpers.defaultNullOpts.mkBool true '' - standalone file support - setting it to false may improve startup time - ''; - } - // (import ../lsp/language-servers/rust-analyzer-config.nix lib pkgs)); + { + standalone = helpers.defaultNullOpts.mkBool true '' + standalone file support + setting it to false may improve startup time + ''; + } + // (import ../lsp/language-servers/rust-analyzer-config.nix lib pkgs); }; config = mkIf cfg.enable { extraPlugins = with pkgs.vimPlugins; [nvim-lspconfig cfg.package]; @@ -176,12 +175,11 @@ in { enabled_graphviz_backends = enabledGraphvizBackends; }; }; - server = with cfg.server; - helpers.ifNonNull' cfg.server { - inherit standalone; - settings.rust-analyzer = lib.filterAttrs (n: v: n != "standalone") cfg.server; - on_attach = helpers.mkRaw "__lspOnAttach"; - }; + server = { + inherit (cfg.server) standalone; + settings.rust-analyzer = lib.filterAttrs (n: v: n != "standalone") cfg.server; + on_attach = helpers.mkRaw "__lspOnAttach"; + }; } // cfg.extraOptions; in ''