   :demand)
 
 ;; built-in eldoc mode
-(use-package eldoc-mode
+(use-package eldoc
   :ensure nil
+  :general
+  ("<f6> h"  #'eldoc-doc-buffer)
+  :custom
+  (eldoc-echo-area-prefer-doc-buffer t)             ; show in *eldoc* buffer if showing & fits
+  (eldoc-echo-area-use-multiline-p 1)               ; one line at most in minibuffer
+  :config
+  (global-eldoc-mode t)
   :general
   ("<f10> e" #'eldoc-mode))
 

  :after no-littering
  :general
  (:keymaps 'eglot-mode-map
            "<f6> c"  #'eglot-code-actions
            "<f6> h"  #'eglot-help-at-point)
  :hook ((rust-mode . eglot-ensure))
  :init
  (setq eglot-ignored-server-capabilites '( :documentHighlightProvider)

  (push '("*Completions*" :stick t :noselect t) popwin:special-display-config)
  (push '(Man-mode :stick t :height 20) popwin:special-display-config)
  (push '("*undo-tree*" :stick t :width 60 :position right) popwin:special-display-config)
  (push '("*eldoc*" :width 60 :position right :noselect t) popwin:special-display-config)
  (push '("*General Keybindings*" :width 120 :position right) popwin:special-display-config)
  (popwin-mode 1)
  :defer 2)
