about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-03-12T12·33+0100
committerclbot <clbot@tvl.fyi>2022-03-12T12·38+0000
commit9cba0624d60f7c575fa1b06e31a8b62984192a32 (patch)
tree64c5215ac63d5277dac19c786db66de17a5bca19
parent648e18d14205ca878f4285eb23434e94017142bc (diff)
feat(sterni/emacs): setup direnv and lsp(-haskell) r/3908
The LSP setup is very basic at the moment, I'll probably want lsp-ui as
well and other bits and pieces.

Change-Id: Ic0360bbfde98e99990aa3ccb68ea045b522e67ce
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5386
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: sterni <sternenseemann@systemli.org>
-rw-r--r--users/sterni/emacs/default.nix3
-rw-r--r--users/sterni/emacs/init.el8
2 files changed, 11 insertions, 0 deletions
diff --git a/users/sterni/emacs/default.nix b/users/sterni/emacs/default.nix
index 9119a2c4ec99..798e27923fc8 100644
--- a/users/sterni/emacs/default.nix
+++ b/users/sterni/emacs/default.nix
@@ -13,10 +13,13 @@ let
     epkgs.bqn-mode
     epkgs.elpaPackages.ada-mode
     epkgs.melpaPackages.adoc-mode
+    epkgs.melpaPackages.direnv
     epkgs.melpaPackages.dockerfile-mode
     epkgs.melpaPackages.haskell-mode
     epkgs.melpaPackages.jq-mode
     epkgs.melpaPackages.languagetool
+    epkgs.melpaPackages.lsp-mode
+    epkgs.melpaPackages.lsp-haskell
     epkgs.melpaPackages.markdown-mode
     epkgs.melpaPackages.nix-mode
     epkgs.melpaPackages.sly
diff --git a/users/sterni/emacs/init.el b/users/sterni/emacs/init.el
index fa51cada37e2..9aa3efcf8018 100644
--- a/users/sterni/emacs/init.el
+++ b/users/sterni/emacs/init.el
@@ -193,7 +193,15 @@
 (use-package nix-mode :mode "\\.nix\\'")
 (use-package nix-drv-mode :mode "\\.drv\\'")
 
+(use-package direnv
+  :config (direnv-mode))
+
 (use-package haskell-mode)
+(use-package lsp-mode
+  :hook ((haskell-mode . lsp-deferred))
+  :commands (lsp lsp-deferred))
+(use-package lsp-haskell)
+
 (use-package urweb-mode)
 (use-package bqn-mode
   :mode "\\.bqn\\'"