From 281eeec8ac37e74e985e0e36af8bdb3499c3ce5b Mon Sep 17 00:00:00 2001
From: Tobias Ostner <tobias.ostner@gmail.com>
Date: Sat, 1 Mar 2025 11:52:40 +0100
Subject: [PATCH] Enable eglot for nix-mode

---
 config/emacs/init.el    | 10 +++-------
 module/home-manager.nix |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/config/emacs/init.el b/config/emacs/init.el
index 61b7325..9d25c03 100644
--- a/config/emacs/init.el
+++ b/config/emacs/init.el
@@ -144,12 +144,12 @@
   (mapc #'disable-theme custom-enabled-themes))
 
 (use-package eglot
-  :ensure t
   :hook ((typescript-mode . eglot-ensure)
          (tsx-ts-mode . eglot-ensure)
          (js-mode . eglot-ensure)
          (js-ts-mode . eglot-ensure)
-         (typescript-ts-mode . eglot-ensure))
+         (typescript-ts-mode . eglot-ensure)
+         (nix-mode . eglot-ensure))
   :custom
   (eglot-autoshutdown t)
   (eglot-events-buffer-size 0)
@@ -161,11 +161,7 @@
      :documentRangeFormattingProvider
      :documentOnTypeFormattingProvider
      :colorProvider
-     :foldingRangeProvider)
-   :config
-   (add-to-list 'eglot-server-programs
-                '((typescript-ts-mode tsx-ts-mode js-mode js-ts-mode)
-                  . ("typescript-language-server" "--stdio")))))
+     :foldingRangeProvider)))
 
 (use-package emacs
   :ensure nil
diff --git a/module/home-manager.nix b/module/home-manager.nix
index c4ce209..8f69749 100644
--- a/module/home-manager.nix
+++ b/module/home-manager.nix
@@ -30,12 +30,12 @@
     jq
     kubectl
     typescript
+    nixd
     nixpkgs-fmt
     nodejs
     nodePackages.typescript-language-server
     nodePackages.vscode-json-languageserver
     noto-fonts
-    nixd
     pass
     python312Packages.flake8
     python312Packages.isort