improve configuration of lsp-mode for haskell

seems like 'lsp' is not the right package to use, switched to lsp-mode and
use deferred to give time to nix-shell to do its magic

2 files changed, 11 insertions, 5 deletions

diff --git a/.emacs b/.emacs
index 6cde332..033d72f 100644
--- a/.emacs
+++ b/.emacs
@@ -315,13 +315,18 @@
   :after (haskell-mode yasnippet)
   :defer)
 
-(use-package lsp
-  :ensure t)
+(use-package lsp-mode
+  :ensure t
+  ;; we need to defer running lsp because in case there's a direnv
+  ;; with use nix, it takes some time to load and lsp won't find the
+  ;; language server until the env is setup properly
+  :hook ((haskell-mode . lsp-deferred))
+  :commands (lsp lsp-deferred))
+
 (use-package lsp-haskell
   :ensure t)
-(add-hook 'haskell-mode-hook #'lsp-mode)
-(setq lsp-log-io 't)
 
+(setq lsp-log-io 't)
 
 ;; optionally
 ;; (use-package lsp-ui :commands lsp-ui-mode)
diff --git a/install.el b/install.el
index 938befa..f5712a4 100644
--- a/install.el
+++ b/install.el
@@ -34,4 +34,5 @@
           elm-mode
           terraform-mode
           nix-mode
-          nix-sandbox))
+          nix-sandbox
+          lsp-ui))