feat: refactor dart and elixir LSPs according to the new structure

modules/languages/dart/config.nix

@@ -0,0 +1,60 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.dart;
+  ftcfg = cfg.flutter-tools;
+  servers = {
+    dart = {
+      package = pkgs.dart;
+      lspConfig = ''
+        lspconfig.dart.setup{
+          capabilities = capabilities;
+          on_attach=default_on_attach;
+          cmd = {"${pkgs.dart}/bin/dart"};
+          ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.dartOpts}"}
+        }
+      '';
+    };
+  };
+in {
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp.lspconfig.enable = true;
+
+      vim.lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig;
+    })
+
+    (mkIf (ftcfg.enable) {
+      vim.startPlugins = ["flutter-tools"];
+
+      vim.luaConfigRC.flutter-tools = nvim.dag.entryAnywhere ''
+        require('flutter-tools').setup {
+          lsp = {
+            color = { -- show the derived colours for dart variables
+              enabled = ${boolToString ftcfg.color.enable}, -- whether or not to highlight color variables at all, only supported on flutter >= 2.10
+              background = ${boolToString ftcfg.color.highlightBackground}, -- highlight the background
+              foreground = ${boolToString ftcfg.color.highlightForeground}, -- highlight the foreground
+              virtual_text = ${boolToString ftcfg.color.virtualText.enable}, -- show the highlight using virtual text
+              virtual_text_str = ${ftcfg.color.virtualText.character} -- the virtual text character to highlight
+            },
+
+            capabilities = capabilities,
+            on_attach = default_on_attach;
+            flags = lsp_flags,
+          },
+        }
+
+      '';
+    })
+  ]);
+}

modules/languages/dart/dart.nix

@@ -0,0 +1,90 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.dart;
+  defaultServer = "dart";
+  servers = {
+    dart = {
+      package = pkgs.dart;
+      lspConfig = ''
+        lspconfig.dart.setup{
+          capabilities = capabilities;
+          on_attach=default_on_attach;
+          cmd = {"${pkgs.dart}/bin/dart"};
+          ${optionalString (cfg.lsp.opts != null) "init_options = ${cfg.lsp.dartOpts}"}
+        }
+      '';
+    };
+  };
+in {
+  options.vim.languages.dart = {
+    enable = mkEnableOption "Dart language support";
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable Dart treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      package = nvim.types.mkGrammarOption pkgs "dart";
+    };
+
+    lsp = {
+      enable = mkOption {
+        description = "Enable Dart LSP support";
+        type = types.bool;
+        default = config.vim.languages.enableLSP;
+      };
+      server = mkOption {
+        description = "The Dart LSP server to use";
+        type = with types; enum (attrNames servers);
+        default = defaultServer;
+      };
+      package = mkOption {
+        description = "Dart LSP server package";
+        type = types.package;
+        default = servers.${cfg.lsp.server}.package;
+      };
+      opts = mkOption {
+        description = "Options to pass to Dart LSP server";
+        type = with types; nullOr str;
+        default = null;
+      };
+    };
+
+    flutter-tools = {
+      enable = mkEnableOption "Enable flutter-tools for flutter support";
+
+      color = {
+        enable = mkEnableOption "Whether or mot to highlight color variables at all";
+
+        highlightBackground = mkOption {
+          type = types.bool;
+          default = false;
+          description = "Highlight the background";
+        };
+
+        highlightForeground = mkOption {
+          type = types.bool;
+          default = false;
+          description = "Highlight the foreground";
+        };
+
+        virtualText = {
+          enable = mkEnableOption "Show the highlight using virtual text";
+
+          character = mkOption {
+            type = types.str;
+            default = "■";
+            description = "Virtual text character to highlight";
+          };
+        };
+      };
+    };
+  };
+}

modules/languages/dart/default.nix

@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./dart.nix
+    ./config.nix
+  ];
+}

modules/languages/default.nix

@@ -10,6 +10,8 @@ in {
   imports = [
     ./markdown
     ./tidal
+    ./dart
+    ./elixir
 
     ./clang.nix
     ./go.nix

modules/languages/elixir/config.nix

@@ -0,0 +1,66 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.languages.elixir;
+in {
+  config = mkIf (cfg.enable) {
+    vim.startPlugins = [
+      "elixir-tools"
+    ];
+
+    vim.luaConfigRC.elixir-tools = nvim.dag.entryAnywhere ''
+        local elixir = require("elixir")
+        local elixirls = require("elixir.elixirls")
+
+        elixir.setup {
+          elixirls = {
+
+
+          -- alternatively, point to an existing elixir-ls installation (optional)
+          -- not currently supported by elixirls, but can be a table if you wish to pass other args `{"path/to/elixirls", "--foo"}`
+          cmd = "${lib.getExe pkgs.elixir-ls}",
+
+          -- default settings, use the `settings` function to override settings
+          settings = elixirls.settings {
+            dialyzerEnabled = true,
+            fetchDeps = false,
+            enableTestLenses = false,
+            suggestSpecs = false,
+          },
+
+          on_attach = function(client, bufnr)
+            local map_opts = { buffer = true, noremap = true}
+
+            -- run the codelens under the cursor
+            vim.keymap.set("n", "<space>r",  vim.lsp.codelens.run, map_opts)
+            -- remove the pipe operator
+            vim.keymap.set("n", "<space>fp", ":ElixirFromPipe<cr>", map_opts)
+            -- add the pipe operator
+            vim.keymap.set("n", "<space>tp", ":ElixirToPipe<cr>", map_opts)
+            vim.keymap.set("v", "<space>em", ":ElixirExpandMacro<cr>", map_opts)
+
+            -- bindings for standard LSP functions.
+            vim.keymap.set("n", "<space>df", "<cmd>lua vim.lsp.buf.format()<cr>", map_opts)
+            vim.keymap.set("n", "<space>gd", "<cmd>lua vim.diagnostic.open_float()<cr>", map_opts)
+            vim.keymap.set("n", "<space>dt", "<cmd>lua vim.lsp.buf.definition()<cr>", map_opts)
+            vim.keymap.set("n", "<space>K", "<cmd>lua vim.lsp.buf.hover()<cr>", map_opts)
+            vim.keymap.set("n", "<space>gD","<cmd>lua vim.lsp.buf.implementation()<cr>", map_opts)
+            vim.keymap.set("n", "<space>1gD","<cmd>lua vim.lsp.buf.type_definition()<cr>", map_opts)
+            -- keybinds for fzf-lsp.nvim: https://github.com/gfanto/fzf-lsp.nvim
+            -- you could also use telescope.nvim: https://github.com/nvim-telescope/telescope.nvim
+            -- there are also core vim.lsp functions that put the same data in the loclist
+            vim.keymap.set("n", "<space>gr", ":References<cr>", map_opts)
+            vim.keymap.set("n", "<space>g0", ":DocumentSymbols<cr>", map_opts)
+            vim.keymap.set("n", "<space>gW", ":WorkspaceSymbols<cr>", map_opts)
+            vim.keymap.set("n", "<leader>d", ":Diagnostics<cr>", map_opts)
+          end
+        }
+      }
+    '';
+  };
+}

modules/languages/elixir/default.nix

@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./config.nix
+    ./elixir-tools.nix
+  ];
+}

modules/languages/elixir/elixir-tools.nix

@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; {
+  options.vim.languages.elixir = {
+    enable = mkEnableOption "elixir support";
+  };
+}