From 9ee2615507bf8c2a21975e56e2cf4608f0cba0e6 Mon Sep 17 00:00:00 2001
From: Jan Kremer <mail@jankremer.eu>
Date: Thu, 10 Jul 2025 14:59:57 +0200
Subject: [PATCH] Revert "helix: Cleanup LSP settings"

This reverts commit cbce9ba8b95f89b39a91cf6d4e3ad7f669de62f0.
---
 modules/home-manager/helix.nix | 43 +++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix
index b043ce0..c33d197 100644
--- a/modules/home-manager/helix.nix
+++ b/modules/home-manager/helix.nix
@@ -68,20 +68,35 @@
     };
 
     languages = {
-      language-server = {
-        nixd = {
-          command = "nixd";
-          config = {
-            formatting.command = [ "nixfmt" ];
-            nixpkgs.expr = "import (builtins.getFlake \"~/.config/nix\").inputs.nixpkgs { }";
-            options = {
-              nixos.expr = "(builtins.getFlake \"~/.config/nix\").nixosConfigurations.galanthus.options";
-              darwin.expr = "(builtins.getFlake \"~/.config/nix\").darwinConfigurations.malus.options";
-              home-manager.expr = "(builtins.getFlake \"~/.config/nix\").homeConfigurations.jan.options";
-            };
-          };
-        };
-      };
+      # language-server = {
+      #   nixd = {
+      #     config.nixd =
+      #       let
+      #         flake = "(builtins.getFlake (toString ./.))";
+      #       in
+      #       {
+      #         nixpkgs.expr = "import ${flake}.inputs.nixpkgs { }";
+      #         options = {
+      #           nixos.expr = "${flake}.nixosConfigurations.galanthus.options";
+      #           darwin.expr = "${flake}.darwinConfigurations.malus.options";
+      #           home-manager.expr = "${flake}.darwinConfigurations.malus.options.home-manager.users.type.getSubOptions []";
+      #         };
+      #       };
+      #   };
+      # };
+
+      language = [
+        {
+          name = "nix";
+          formatter.command = "nixfmt";
+          auto-format = true;
+        }
+        {
+          name = "typst";
+          formatter.command = "typstyle";
+          auto-format = true;
+        }
+      ];
     };
   };
 }