about summary refs log tree commit diff
path: root/users/glittershark/emacs.d
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-07-03T17·46-0400
committerglittershark <grfn@gws.fyi>2020-07-03T23·23+0000
commit6480a81c1662f75e1996aeb3cb114baf53ca09b9 (patch)
tree61367bfeca492e5139781e958fe984705a2daf3b /users/glittershark/emacs.d
parent64ce8522fed750fcfb3a0504267f57dd20bcfb99 (diff)
feat(xan): Use haskell-language-server r/1204
Use haskell-language-server instead of haskell-ide-engine for Xanthous.

Change-Id: I7ef1433d5cd561e659fc06b3f373a6f29dfa5690
Reviewed-on: https://cl.tvl.fyi/c/depot/+/904
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: BuildkiteCI
Diffstat (limited to 'users/glittershark/emacs.d')
-rw-r--r--users/glittershark/emacs.d/config.el15
1 files changed, 4 insertions, 11 deletions
diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el
index a2b05399fd03..a0120824fbe3 100644
--- a/users/glittershark/emacs.d/config.el
+++ b/users/glittershark/emacs.d/config.el
@@ -689,12 +689,6 @@
   (add-to-list #'company-backends #'company-lsp)
   (setq company-lsp-async t))
 
-(use-package! lsp-treemacs
-  :config
-  (map! :map lsp-mode-map
-        (:leader
-          "c X" #'lsp-treemacs-errors-list)))
-
 (use-package! dap-mode)
 
 (defun +grfn/haskell-mode-setup ()
@@ -728,11 +722,10 @@
   ;; :hook
   ;; (haskell-mode . lsp-haskell-enable)
   :config
-  (add-hook 'haskell-mode-hook #'+grfn/haskell-mode-setup 't)
-  (setq
-   ;; lsp-haskell-process-path-hie "/home/griffin/.nix-profile/bin/hie-8.6.5"
-   lsp-haskell-process-args-hie
-   '("-d" "-l" "/tmp/hie.log" "+RTS" "-M4G" "-H1G" "-K4G" "-A16M" "-RTS")))
+  (setq lsp-haskell-process-path-hie "haskell-language-server-wrapper"
+        lsp-haskell-process-args-hie
+        '("-d" "-l" "/tmp/hie.log" "+RTS" "-M4G" "-H1G" "-K4G" "-A16M" "-RTS"))
+  (add-hook 'haskell-mode-hook #'+grfn/haskell-mode-setup 't))
 
 (use-package! lsp-imenu
   :after (lsp-mode lsp-ui)