From 9cba0624d60f7c575fa1b06e31a8b62984192a32 Mon Sep 17 00:00:00 2001 From: sterni Date: Sat, 12 Mar 2022 13:33:55 +0100 Subject: feat(sterni/emacs): setup direnv and lsp(-haskell) 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 Autosubmit: sterni --- users/sterni/emacs/default.nix | 3 +++ users/sterni/emacs/init.el | 8 ++++++++ 2 files changed, 11 insertions(+) (limited to 'users/sterni') 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\\'" -- cgit 1.4.1