build(xmonad): try nixd instead of rnix-lsp

yurrriq · Feb 6, 2024 · 8989e8c · 8989e8c
1 parent 6bf5967
commit 8989e8c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/config/xmonad/emacs.el b/config/xmonad/emacs.el
@@ -64,16 +64,14 @@
   :config (global-hl-todo-mode t))
 
 (use-package lsp-mode
-  :hook ((haskell-mode . lsp-deferred))
+  :hook ((haskell-mode
+          nix-mode)
+         . lsp-deferred)
   :commands (lsp lsp-deferred)
   :config
   (advice-add 'lsp :before #'direnv-update-environment)
-  (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))
-  (setq lsp-modeline-code-actions-enable nil)
-  (lsp-register-client
-   (make-lsp-client :new-connection (lsp-stdio-connection '("rnix-lsp"))
-                    :major-modes '(nix-mode)
-                    :server-id 'nix)))
+  ;; (add-to-list 'lsp-language-id-configuration '(nix-mode . "nix"))
+  (setq lsp-modeline-code-actions-enable nil))
 
 (use-package lsp-ui
   :hook (haskell-mode . lsp-ui-mode)

diff --git a/flake.nix b/flake.nix
@@ -257,8 +257,8 @@
                 haskellPackages.hlint
                 haskellPackages.ormolu
                 haskellPackages.pointfree
+                nixd
                 pre-commit
-                rnix-lsp
                 xorg.libX11
                 xorg.libXScrnSaver
                 xorg.libXext

diff --git a/src/flake.nw b/src/flake.nw
@@ -254,8 +254,8 @@ xmonad =
       haskellPackages.hlint
       haskellPackages.ormolu
       haskellPackages.pointfree
+      nixd
       pre-commit
-      rnix-lsp
       xorg.libX11
       xorg.libXScrnSaver
       xorg.libXext