From f15c3f377a35a2869d056c3c176c1b2cc2c6ad61 Mon Sep 17 00:00:00 2001
From: dathegreat <d.a.thegreat123@gmail.com>
Date: Mon, 27 Apr 2026 11:54:15 -0600
Subject: [PATCH] lsp/presets/haskell-language-server.nix: Add cabal-fmt as an
 extra package if lsp is enabled

Otherwise, formatting a .cabal file throws an error that cabal-fmt can't
be found. This is especially annoying if saving => formatting, because
each save throws an error which must be escaped.
---
 modules/plugins/languages/haskell.nix                   | 1 +
 modules/plugins/lsp/presets/haskell-language-server.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix
index 90cc2d38..2ea05fd8 100644
--- a/modules/plugins/languages/haskell.nix
+++ b/modules/plugins/languages/haskell.nix
@@ -98,6 +98,7 @@ in {
 
     (mkIf cfg.extensions.haskell-tools.enable {
       vim = {
+        extraPackages = [haskellPackages.cabal-fmt];
         startPlugins = ["haskell-tools-nvim"];
         luaConfigRC.haskell-tools-nvim = entryAfter ["lsp-servers"] ''
           vim.g.haskell_tools = {
diff --git a/modules/plugins/lsp/presets/haskell-language-server.nix b/modules/plugins/lsp/presets/haskell-language-server.nix
index a9ed0980..cd63e086 100644
--- a/modules/plugins/lsp/presets/haskell-language-server.nix
+++ b/modules/plugins/lsp/presets/haskell-language-server.nix
@@ -15,6 +15,7 @@ in {
   };
 
   config = mkIf cfg.enable {
+    vim.extraPackages = [pkgs.haskellPackages.cabal-fmt];
     vim.lsp.servers.haskell-language-server = {
       enable = true;
       cmd = [(getExe' pkgs.haskellPackages.haskell-language-server "haskell-language-server-wrapper") "--lsp"];