diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 7d6c092a..ca2594af 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -30,6 +30,7 @@
         consult-yasnippet
 
         # ide-packages
+        flymake-popon
         treesit-grammars.with-all-grammars
         treesit-auto
         apheleia
diff --git a/home/emacs/init.el b/home/emacs/init.el
index c74d596f..17381272 100644
--- a/home/emacs/init.el
+++ b/home/emacs/init.el
@@ -451,6 +451,13 @@
   :custom (direnv-always-show-summary nil)
   :config (direnv-mode +1))
 
+(use-package eldoc
+  :ensure t
+  :custom
+  (eldoc-echo-area-display-truncation-message nil)
+  (eldoc-echo-area-prefer-doc-buffer t)
+  (eldoc-echo-area-use-multiline-p nil))
+
 (use-package eglot
   :ensure t
   :bind (("C-c c e" . eglot)
@@ -473,6 +480,12 @@
   :bind (("C-c C-." . flymake-goto-next-error)
          ("C-c C-," . flymake-goto-prev-error)))
 
+(use-package flymake-popon
+  :ensure t
+  :after flymake
+  :config
+  (global-flymake-popon-mode +1))
+
 (setq project-switch-use-entire-map t
       project-switch-commands 'project-dired)
 
diff --git a/home/emacs/init.org b/home/emacs/init.org
index 18a6e2ef..f2951ce6 100644
--- a/home/emacs/init.org
+++ b/home/emacs/init.org
@@ -540,6 +540,16 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     :config (direnv-mode +1))
 #+END_SRC
 
+** Eldoc
+#+begin_src emacs-lisp :tangle yes
+  (use-package eldoc
+    :ensure t
+    :custom
+    (eldoc-echo-area-display-truncation-message nil)
+    (eldoc-echo-area-prefer-doc-buffer t)
+    (eldoc-echo-area-use-multiline-p nil))
+#+end_src
+
 ** Eglot LSP
 #+BEGIN_SRC emacs-lisp
   (use-package eglot
@@ -567,6 +577,15 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     :bind (("C-c C-." . flymake-goto-next-error)
            ("C-c C-," . flymake-goto-prev-error)))
 #+end_src
+
+*** Diagnostics in popup
+#+begin_src emacs-lisp :tangle yes
+  (use-package flymake-popon
+    :ensure t
+    :after flymake
+    :config
+    (global-flymake-popon-mode +1))
+#+end_src
 ** Project
 #+BEGIN_SRC emacs-lisp
   (setq project-switch-use-entire-map t