Merge branch 'main' into more-option-stuff

modules/plugins/languages/dart.nix

@@ -130,7 +130,6 @@ in {
 
     (mkIf cfg.lsp.enable {
       vim.lsp.lspconfig.enable = true;
-
       vim.lsp.lspconfig.sources.dart-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
 

modules/plugins/languages/haskell.nix

@@ -71,7 +71,7 @@ in {
                 cmd = ${
                 if isList cfg.lsp.package
                 then expToLua cfg.lsp.package
-                else ''{"${cfg.lsp.package}/bin/haskell-language-server-wrapper"}''
+                else ''{"${cfg.lsp.package}/bin/haskell-language-server-wrapper", "--lsp"}''
               },
                 on_attach = function(client, bufnr, ht)
                   default_on_attach(client, bufnr, ht)

modules/plugins/ui/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./noice
     ./modes
+    ./nvim-ufo
     ./notifications
     ./smartcolumn
     ./colorizer

modules/plugins/ui/nvim-ufo/config.nix

@@ -0,0 +1,20 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+
+  cfg = config.vim.ui.nvim-ufo;
+in {
+  config = mkIf cfg.enable {
+    vim = {
+      startPlugins = ["promise-async"];
+      lazy.plugins.nvim-ufo = {
+        package = "nvim-ufo";
+        setupModule = "ufo";
+        inherit (cfg) setupOpts;
+      };
+    };
+  };
+}

modules/plugins/ui/nvim-ufo/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./nvim-ufo.nix
+    ./config.nix
+  ];
+}

modules/plugins/ui/nvim-ufo/nvim-ufo.nix

@@ -0,0 +1,9 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
+in {
+  options.vim.ui.nvim-ufo = {
+    enable = mkEnableOption "nvim-ufo";
+    setupOpts = mkPluginSetupOption "nvim-ufo" {};
+  };
+}