diff --git a/modules/languages/dart/config.nix b/modules/languages/dart/config.nix index 9866db4..ff19ede 100644 --- a/modules/languages/dart/config.nix +++ b/modules/languages/dart/config.nix @@ -12,10 +12,10 @@ with builtins; let dart = { package = pkgs.dart; lspConfig = '' - lspconfig.dart.setup{ + lspconfig.dartls.setup{ capabilities = capabilities; on_attach=default_on_attach; - cmd = {"${pkgs.dart}/bin/dart"}; + cmd = {"${pkgs.dart}/bin/dart", "language-server", "--protocol=lsp"}; ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.dartOpts}"} } ''; diff --git a/modules/languages/dart/dart.nix b/modules/languages/dart/dart.nix index 21bf960..bc11d2c 100644 --- a/modules/languages/dart/dart.nix +++ b/modules/languages/dart/dart.nix @@ -12,10 +12,10 @@ with builtins; let dart = { package = pkgs.dart; lspConfig = '' - lspconfig.dart.setup{ + lspconfig.dartls.setup{ capabilities = capabilities; on_attach=default_on_attach; - cmd = {"${pkgs.dart}/bin/dart"}; + cmd = {"${pkgs.dart}/bin/dart", "language-server", "--protocol=lsp"}; ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.dartOpts}"} } ''; @@ -35,11 +35,7 @@ in { }; lsp = { - enable = mkOption { - description = "Enable Dart LSP support"; - type = types.bool; - default = config.vim.languages.enableLSP; - }; + enable = mkEnableOption "Enable Dart LSP support"; server = mkOption { description = "The Dart LSP server to use"; type = with types; enum (attrNames servers); @@ -58,7 +54,11 @@ in { }; flutter-tools = { - enable = mkEnableOption "Enable flutter-tools for flutter support"; + enable = mkOption { + description = "Enable flutter-tools for flutter support"; + type = types.bool; + default = config.vim.languages.enableLSP; + }; color = { enable = mkEnableOption "Whether or mot to highlight color variables at all";