Port some package settings to use-package

Undecided about C-c bindings.  I like having them in "one neat pile",
rather than scattered across several use-package forms.

2 files changed, 30 insertions, 16 deletions

diff --git a/.emacs b/.emacs
index 0fa790c..d786880 100644
--- a/.emacs
+++ b/.emacs
@@ -333,14 +333,12 @@
 (delight 'auto-fill-function "⏎" t)
 (delight 'auto-revert-mode "⟳" 'autorevert)
 (delight 'auto-revert-tail-mode "⤓" 'autorevert)
-(delight 'eldoc-mode "📖" 'eldoc)
 (delight 'footnote-mode "¹" 'footnote)
 (delight 'flyspell-mode (propertize (my/symbol-as-icon ?🖋)
                                     'face 'flyspell-incorrect)
          'flyspell)
 (delight 'hi-lock-mode nil 'hi-lock)
 (delight 'hs-minor-mode "…" 'hideshow)
-(delight 'magit-blame-mode "👉" 'magit-blame)
 (delight 'mml-mode "📧" 'mml)
 (delight 'page-break-lines-mode nil 'page-break-lines)
 (delight 'scroll-lock-mode "📜" 'scroll-lock)
@@ -651,6 +649,17 @@
 
 ;; Trying out use-package.
 
+(use-package ediff
+  :custom
+  (ediff-merge-split-window-function 'split-window-vertically)
+  (ediff-split-window-function 'split-window-horizontally)
+  (ediff-window-setup-function 'ediff-setup-windows-plain))
+
+(use-package eldoc
+  :custom
+  (eldoc-echo-area-use-multiline-p nil)
+  :delight "📖")
+
 (use-package icomplete
   :config
   (setq icomplete-scroll t)
@@ -664,6 +673,25 @@
   (isearch-allow-scroll t)
   (isearch-lazy-count t))
 
+(use-package magit
+  :custom
+  (magit-define-global-key-bindings nil)
+  (magit-diff-refine-hunk t)
+  (magit-ediff-dwim-show-on-hunks t)
+  (magit-log-arguments '("--graph" "--color" "--decorate" "-n256"))
+  (magit-log-section-arguments '("--graph" "--color" "--decorate" "-n256")))
+
+(use-package magit-blame
+  :delight "👉")
+
+(use-package markdown-mode
+  :custom
+  (markdown-asymmetric-header t)
+  (markdown-command "pandoc -s")
+  (markdown-enable-math t)
+  (markdown-header-scaling t)
+  (markdown-indent-on-enter 'indent-and-new-item))
+
 (use-package minibuffer
   :config
   (setq completion-ignore-case t)
diff --git a/.emacs-custom.el b/.emacs-custom.el
index f0d2c47..8dcd745 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -17,10 +17,6 @@
  '(diff-hl-flydiff-mode t)
  '(dired-kill-when-opening-new-dired-buffer t)
  '(dired-listing-switches "-al -Fhv --group-directories-first")
- '(ediff-merge-split-window-function 'split-window-vertically)
- '(ediff-split-window-function 'split-window-horizontally)
- '(ediff-window-setup-function 'ediff-setup-windows-plain)
- '(eldoc-echo-area-use-multiline-p nil)
  '(electric-pair-mode t)
  '(enable-recursive-minibuffers t)
  '(epg-pinentry-mode 'loopback)
@@ -56,16 +52,6 @@
  '(inhibit-startup-screen t)
  '(line-number-display-limit-width 2000)
  '(lua-indent-level 2)
- '(magit-define-global-key-bindings nil)
- '(magit-diff-refine-hunk t)
- '(magit-ediff-dwim-show-on-hunks t)
- '(magit-log-arguments '("--graph" "--color" "--decorate" "-n256"))
- '(magit-log-section-arguments '("--graph" "--color" "--decorate" "-n256"))
- '(markdown-asymmetric-header t)
- '(markdown-command "pandoc -s")
- '(markdown-enable-math t)
- '(markdown-header-scaling t)
- '(markdown-indent-on-enter 'indent-and-new-item)
  '(menu-bar-mode nil)
  '(minibuffer-depth-indicate-mode t)
  '(package-selected-packages