diff --git a/README.org b/README.org
index 8b4af46..d654b01 100644
--- a/README.org
+++ b/README.org
@@ -296,6 +296,7 @@ The format of arguments to =set-defaults= is identical to the one used by
 | compilation-ask-about-save                    | nil                        |
 | compilation-scroll-output                     | 'first-error               |
 | compilation-skip-threshold                    | 2                          |
+| compilation-context-lines                     | t                          |
 | completions-cycle-threshold                   | t                          |
 | completions-detailed                          | t                          |
 | completions-format                            | 'vertical                  |
@@ -1022,6 +1023,7 @@ Company provides completions in Emacs. Activate them by pressing =C-M-i=.
 
 #+BEGIN_SRC emacs-lisp
   (use-package company
+    :disabled
     :delight
     :defer 1
     :custom (company-require-match nil)
@@ -1037,8 +1039,7 @@ Company provides completions in Emacs. Activate them by pressing =C-M-i=.
             comint-previous-matching-input-from-input
             comint-next-matching-input-from-input
             completion-at-point))
-    :custom (company-backends '(company-elisp
-                         company-css
+    :custom (company-backends '(company-css
                          company-cmake
                          company-nxml
                          (company-capf
@@ -2848,48 +2849,53 @@ Eglot is builtin to Emacs and can work with any language with an LSP backend.
 **** Haskell
 
 #+BEGIN_SRC emacs-lisp
-  (use-package haskell-mode
-    :custom (haskell-compile-cabal-build-command "cabal new-build")
-    :custom (haskell-hoogle-url "https://hoogle.haskell.org/?hoogle=%s")
-    :mode (("\\.cabal\\'" . haskell-cabal-mode))
-    :hook ((haskell-mode . subword-mode)
-           ;; (haskell-mode . flyspell-prog-mode)
-           ;; (haskell-mode . haskell-indentation-mode)
-           ;; (haskell-mode . haskell-auto-insert-module-template)
-           ;; (haskell-mode . haskell-decl-scan-mode)
-           ;; (haskell-mode . turn-on-haskell-indent)
-           ;; (haskell-mode . imenu-add-menubar-index)
-           ;; (haskell-mode .
-           ;;          (lambda ()
-           ;;            (autoload 'haskell-doc-current-info
-           ;;              "haskell-doc")
-           ;;            (setq-local eldoc-documentation-function
-           ;;                        'haskell-doc-current-info)))
-           (haskell-mode . (lambda () (whitespace-mode -1)))
-           )
-
-    :functions xref-push-marker-stack
-    :commands (haskell-session-maybe haskell-mode-find-def haskell-ident-at-point
-                                     haskell-mode-handle-generic-loc)
-    :bind (:map haskell-mode-map
-                ("C-c h" . haskell-hoogle)
-                ("C-c C-." . haskell-navigate-imports)
-                ("C-`" . haskell-interactive-bring)
-                ("C-c `" . haskell-interactive-bring)
-                ("C-c C-t" . haskell-process-do-type)
-                ("C-c C-i" . haskell-process-do-info)
-                ("C-c C-k" . haskell-interactive-mode-clear)
-                ("C-c c" . haskell-process-cabal)
-                ;; ("M-." . haskell-mode-jump-to-def)
-                :map haskell-cabal-mode-map
-                ("C-`" . haskell-interactive-bring)
-                ("C-c C-k" . haskell-interactive-mode-clear)
-                ("C-c c" . haskell-process-cabal))
-    :init
-    (add-to-list 'completion-ignored-extensions ".hi")
-    :config
-    ;; (setq flymake-allowed-file-name-masks (delete '("\\.l?hs\\'" haskell-flymake-init) flymake-allowed-file-name-masks))
-    )
+    (use-package haskell-mode
+      :custom (haskell-compile-cabal-build-command "cabal new-build")
+      :custom (haskell-hoogle-url "https://hoogle.haskell.org/?hoogle=%s")
+      :mode (("\\.cabal\\'" . haskell-cabal-mode))
+      :hook ((haskell-mode . subword-mode)
+             ;; (haskell-mode . flyspell-prog-mode)
+             ;; (haskell-mode . haskell-indentation-mode)
+             ;; (haskell-mode . haskell-auto-insert-module-template)
+             ;; (haskell-mode . haskell-decl-scan-mode)
+             ;; (haskell-mode . turn-on-haskell-indent)
+             ;; (haskell-mode . imenu-add-menubar-index)
+             ;; (haskell-mode .
+             ;;          (lambda ()
+             ;;            (autoload 'haskell-doc-current-info
+             ;;              "haskell-doc")
+             ;;            (setq-local eldoc-documentation-function
+             ;;                        'haskell-doc-current-info)))
+             (haskell-mode . (lambda () (whitespace-mode -1)))
+             (compilation-start . (lambda (proc)
+                                    (when (file-exists-p (expand-file-name "cabal.project" compilation-directory))
+                                      (setq-local compilation-error-regexp-alist haskell-compilation-error-regexp-alist)
+                                      (add-hook 'compilation-filter-hook 'haskell-compilation-filter-hook nil t))))
+             )
+
+      :functions xref-push-marker-stack
+      :commands (haskell-session-maybe haskell-mode-find-def haskell-ident-at-point
+                                       haskell-mode-handle-generic-loc)
+      :bind (:map haskell-mode-map
+                  ("C-c h" . haskell-hoogle)
+                  ("C-c C-." . haskell-navigate-imports)
+                  ("C-`" . haskell-interactive-bring)
+                  ("C-c `" . haskell-interactive-bring)
+                  ("C-c C-t" . haskell-process-do-type)
+                  ("C-c C-i" . haskell-process-do-info)
+                  ("C-c C-k" . haskell-interactive-mode-clear)
+                  ("C-c c" . haskell-process-cabal)
+                  ;; ("M-." . haskell-mode-jump-to-def)
+                  :map haskell-cabal-mode-map
+                  ("C-`" . haskell-interactive-bring)
+                  ("C-c C-k" . haskell-interactive-mode-clear)
+                  ("C-c c" . haskell-process-cabal))
+      :init
+      (add-to-list 'completion-ignored-extensions ".hi")
+      (require 'haskell-compile)
+      :config
+      ;; (setq flymake-allowed-file-name-masks (delete '("\\.l?hs\\'" haskell-flymake-init) flymake-allowed-file-name-masks))
+      )
 #+END_SRC
 
 **** JavaScript
@@ -4442,14 +4448,14 @@ Cross-platform script to execute the app. Uses =open= on macOS to get the
 graphical version of Emacs.
 
 #+BEGIN_SRC shell :padline no
-case $(uname) in
-    Darwin)
-        open @emacs@/Applications/Emacs.app
-    ;;
-    *)
-        @emacs@/bin/emacs
-    ;;
-esac
+  case $(uname) in
+      # Darwin)
+      #     open @emacs@/Applications/Emacs.app
+      # ;;
+      ,*)
+          @emacs@/bin/emacs
+      ;;
+  esac
 #+END_SRC
 * Building
 :PROPERTIES:
diff --git a/flake.lock b/flake.lock
index 539caf7..9c4d417 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1708995364,
-        "narHash": "sha256-AZORtOZ52A9DdFXOL3KN/TF55A6g+pOdb7TmOka7NjU=",
+        "lastModified": 1714381768,
+        "narHash": "sha256-+IHdF9NDVByF8U780qDrUNSv75q9WllO7Q29/Aohm1E=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "fdc34eabbe59ffe5e935fcb53a40996fc4e46958",
+        "rev": "482bc4749bcbfcaf19a668a3d0e5ba3423be730c",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708995544,
-        "narHash": "sha256-YJgLopKOKVTggnKzjX4OiAS22hx/vNv397DcsAyTZgY=",
+        "lastModified": 1714424026,
+        "narHash": "sha256-0a3UXcZ0vbR+dGTGl024cdYHgNpVyeq7qeAUGWj2nMY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5bd8df40204f47a12263f3614c72cd5b6832a9a0",
+        "rev": "5467a90a5d0bdc73bc98f396bda95d20fc7cb6c7",
         "type": "github"
       },
       "original": {
@@ -57,11 +57,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1708831307,
-        "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=",
+        "lastModified": 1714272655,
+        "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b",
+        "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf",
         "type": "github"
       },
       "original": {