From e108df3ba49eda6735008bdf06c8d1eb44930014 Mon Sep 17 00:00:00 2001
From: FlafyDev <flafyarazi@gmail.com>
Date: Tue, 18 Apr 2023 14:57:11 +0300
Subject: [PATCH 1/3] fix: use dartls instead of dart in lspconfig

---
 modules/languages/dart/config.nix | 2 +-
 modules/languages/dart/dart.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/languages/dart/config.nix b/modules/languages/dart/config.nix
index 9866db4..6cd9273 100644
--- a/modules/languages/dart/config.nix
+++ b/modules/languages/dart/config.nix
@@ -12,7 +12,7 @@ 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"};
diff --git a/modules/languages/dart/dart.nix b/modules/languages/dart/dart.nix
index 21bf960..79452e7 100644
--- a/modules/languages/dart/dart.nix
+++ b/modules/languages/dart/dart.nix
@@ -12,7 +12,7 @@ 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"};

From 9af9bd7f3ae1813f255c11f24b66eed76dad4ac9 Mon Sep 17 00:00:00 2001
From: FlafyDev <flafyarazi@gmail.com>
Date: Tue, 18 Apr 2023 15:00:46 +0300
Subject: [PATCH 2/3] feat: change flutter-tools to be enabled by default
 instead of dart's lsp

---
 modules/languages/dart/dart.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/languages/dart/dart.nix b/modules/languages/dart/dart.nix
index 79452e7..89e02d1 100644
--- a/modules/languages/dart/dart.nix
+++ b/modules/languages/dart/dart.nix
@@ -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";

From dc2dddeda23b98af0142351daf3f34536a261979 Mon Sep 17 00:00:00 2001
From: FlafyDev <flafyarazi@gmail.com>
Date: Tue, 18 Apr 2023 15:33:38 +0300
Subject: [PATCH 3/3] fix: use correct dart cli options for lsp

---
 modules/languages/dart/config.nix | 2 +-
 modules/languages/dart/dart.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/languages/dart/config.nix b/modules/languages/dart/config.nix
index 6cd9273..ff19ede 100644
--- a/modules/languages/dart/config.nix
+++ b/modules/languages/dart/config.nix
@@ -15,7 +15,7 @@ with builtins; let
         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 89e02d1..bc11d2c 100644
--- a/modules/languages/dart/dart.nix
+++ b/modules/languages/dart/dart.nix
@@ -15,7 +15,7 @@ with builtins; let
         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}"}
         }
       '';