summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--user/emacs/.emacs.d/init.el29
-rw-r--r--user/settings/emacs.nix1
2 files changed, 25 insertions, 5 deletions
diff --git a/user/emacs/.emacs.d/init.el b/user/emacs/.emacs.d/init.el
index d4470242..21b91c43 100644
--- a/user/emacs/.emacs.d/init.el
+++ b/user/emacs/.emacs.d/init.el
@@ -707,9 +707,30 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
 (use-package flymake
   :custom ((flymake-error-bitmap '(left-vertical-bar compilation-error))
            (flymake-warning-bitmap '(left-vertical-bar compilation-warning))))
-(use-package flymake-diagnostic-at-point
-  :custom ((flymake-diagnostic-at-point-diagnostic-function #'flymake-diagnostic-at-point-display-minibuffer))
-  :ghook '(flymake-mode-hook))
+(use-package flycheck
+  :custom ((flycheck-highlighting-mode 'sexps))
+  :config (progn
+            (flycheck-define-error-level 'error
+              :severity 100
+              :compilation-level 2
+              :overlay-category 'flycheck-error-overlay
+              :fringe-bitmap 'left-vertical-bar
+              :fringe-face 'flycheck-fringe-error
+              :error-list-face 'flycheck-error-list-error)
+            (flycheck-define-error-level 'warning
+              :severity 10
+              :compilation-level 1
+              :overlay-category 'flycheck-warning-overlay
+              :fringe-bitmap 'left-vertical-bar
+              :fringe-face 'flycheck-fringe-warning
+              :warning-list-face 'flycheck-error-list-warning)
+            (flycheck-define-error-level 'info
+              :severity -10
+              :compilation-level 0
+              :overlay-category 'flycheck-info-overlay
+              :fringe-bitmap 'left-vertical-bar
+              :fringe-face 'flycheck-fringe-info
+              :info-list-face 'flycheck-error-list-info)))
 
 (use-package lsp-mode
   :ghook ('(typescript-mode-hook
@@ -725,7 +746,7 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
   :gfhook 'lsp--flymake-setup
   :custom ((lsp-auto-guess-root t)
            (lsp-auto-configure nil)
-           (lsp-prefer-flymake t)
+           (lsp-prefer-flymake nil)
            (lsp-enable-symbol-highlighting nil))
   :config (progn
             (add-to-list 'lsp-language-id-configuration '(js-mode . "javascript"))))
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index ce71ce4c..4cdd4d58 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -80,7 +80,6 @@ in
       feature-mode
       fish-completion
       flycheck
-      flymake-diagnostic-at-point
       general
       git-gutter-fringe
       git-messenger