diff --git a/pkgs/emacs/default.nix b/pkgs/emacs/default.nix
index a4037f6..b027dda 100644
--- a/pkgs/emacs/default.nix
+++ b/pkgs/emacs/default.nix
@@ -14,6 +14,7 @@ emacsWithPackages (
       company
       dap-mode
       diff-hl
+      envrc
       doom-modeline
       evil
       evil-collection
@@ -29,6 +30,7 @@ emacsWithPackages (
       lsp-haskell
       lsp-mode
       lsp-python-ms
+      lsp-ui
       magit
       magit-delta
       nix-mode
diff --git a/users/profiles/emacs/default.nix b/users/profiles/emacs/default.nix
index b00b28e..d029916 100644
--- a/users/profiles/emacs/default.nix
+++ b/users/profiles/emacs/default.nix
@@ -38,6 +38,7 @@
       delta
       fd
       graphviz-nox
+      haskell-language-server
       hunspell
       hunspellDicts.en_US
       hunspellDicts.it_IT
@@ -62,7 +63,6 @@
       )
     ] ++ (if pkgs.system == "x86_64-linux" then [
       python-language-server
-      haskell-language-server
     ] ++ (with easy-ps; [
       # spago2nix
       ffmpegthumbnailer
diff --git a/users/profiles/emacs/emacs.d/config/config-direnv.lsp b/users/profiles/emacs/emacs.d/config/config-direnv.lsp
new file mode 100644
index 0000000..1505317
--- /dev/null
+++ b/users/profiles/emacs/emacs.d/config/config-direnv.lsp
@@ -0,0 +1,7 @@
+(use-package envrc
+    :disabled t
+    :after exec-path-from-shell
+    :config
+    (envrc-global-mode))
+
+(provide 'config-envrc)
diff --git a/users/profiles/emacs/emacs.d/init.el b/users/profiles/emacs/emacs.d/init.el
index ce73d36..ff5db61 100644
--- a/users/profiles/emacs/emacs.d/init.el
+++ b/users/profiles/emacs/emacs.d/init.el
@@ -29,5 +29,6 @@ Return nil if COMMAND is not found anywhere in `exec-path'."
 (require 'config-scad)
 (require 'config-translate)
 (require 'config-lisp)
+(require 'config-direnv)
 
 (server-start)