diff --git a/modules/development/default.nix b/modules/development/default.nix
index b0fa7214..e5f5af85 100644
--- a/modules/development/default.nix
+++ b/modules/development/default.nix
@@ -32,12 +32,13 @@
             )
           
           ;; Language server support
-          (use-package lsp-mode
-            :commands (lsp lsp-deferred)
-            :config (lsp-enable-which-key-integration t)
+          (use-package eglot
             :general
-            (lmap lsp-mode-map
-              "SPC" '(:keymap lsp-command-map)
+            (lmap
+              "SPC s" '(eglot :which-key "Add buffer to eglot")
+              "SPC f" '(eglot-format :which-key "Format region")
+              "SPC F" '(eglot-format :which-key "Format buffer")
+              "SPC r" '(eglot-rename :which-key "Rename symbol")
               )
             )
 
@@ -58,10 +59,8 @@
           ;; Haskell language support
           (use-package haskell-mode
             :mode "\\.hs\\'"
-            )
-
-          (use-package lsp-haskell
-            :hook (haskell-mode . lsp)
+            :config
+            (require 'haskell-doc)
             )
 
           ;; Folding
diff --git a/modules/development/git/default.nix b/modules/development/git/default.nix
index 8447b332..bdba48b6 100644
--- a/modules/development/git/default.nix
+++ b/modules/development/git/default.nix
@@ -35,6 +35,7 @@
             ".data"
             ".direnv"
             ".envrc"
+            ".dir-locals.el"
           ];
           signing = {
             key = "charlotte@vanpetegem.me";