Start porting to use-package

2 files changed, 44 insertions, 24 deletions

diff --git a/.emacs b/.emacs
index 6e5379d..b57e2b7 100644
--- a/.emacs
+++ b/.emacs
@@ -340,8 +340,6 @@
          'flyspell)
 (delight 'hi-lock-mode nil 'hi-lock)
 (delight 'hs-minor-mode "…" 'hideshow)
-(delight 'isearch-mode "🔍" 'isearch)
-(delight 'org-indent-mode "»" 'org-indent)
 (delight 'magit-blame-mode "👉" 'magit-blame)
 (delight 'mml-mode "📧" 'mml)
 (delight 'page-break-lines-mode nil 'page-break-lines)
@@ -478,11 +476,6 @@
 (add-hook 'ibuffer-mode-hook
           (lambda ()
             (ibuffer-switch-to-saved-filter-groups "my/ibuffer-groups")))
-
-(eval-after-load 'org
-  '(when (version< org-version "9.4")
-       (define-key org-mode-map (kbd "C-j") 'org-return)
-       (define-key org-mode-map (kbd "RET") 'org-return-indent)))
 
 ;;; Helper functions and miscellaneous settings.
 
@@ -645,10 +638,6 @@
 ;;;; Miscellany.
 (setq-default paragraph-start (concat "[ 	]*- \\|" paragraph-start))
 
-(setq completion-ignore-case t
-      read-buffer-completion-ignore-case t
-      read-file-name-completion-ignore-case t)
-
 (defun my/screenshot (output)
   (interactive
    (list
@@ -660,4 +649,47 @@
     (save-buffer)
     (kill-buffer buf)))
 
+;; Trying out use-package.
+
+(use-package icomplete
+  :config
+  (setq icomplete-scroll t)
+  :custom
+  (icomplete-mode t)
+  (icomplete-vertical-mode t))
+
+(use-package isearch
+  :delight "🔍"
+  :custom
+  (isearch-allow-scroll t)
+  (isearch-lazy-count t))
+
+(use-package minibuffer
+  :config
+  (setq completion-ignore-case t)
+  :custom
+  (completions-detailed t)
+  (completions-group t)
+  (read-buffer-completion-ignore-case t)
+  (read-file-name-completion-ignore-case t))
+
+(use-package org
+  :config
+  (when (version< org-version "9.4")
+    (define-key org-mode-map (kbd "C-j") 'org-return)
+    (define-key org-mode-map (kbd "RET") 'org-return-indent))
+  :custom
+  (org-edit-src-content-indentation 0)
+  (org-ellipsis "…")
+  (org-fontify-done-headline nil)
+  (org-fontify-quote-and-verse-blocks t)
+  (org-startup-indented t)
+  ;; Make org-refile a bit more eager.
+  (org-outline-path-complete-in-steps nil)
+  (org-refile-targets '(nil . (:maxlevel . 10)))
+  (org-refile-use-outline-path t))
+
+(use-package org-indent
+  :delight "»")
+
 ;;; TODO: decruftify mode-line (e.g. remove superflous parens).
diff --git a/.emacs-custom.el b/.emacs-custom.el
index 4f688e3..f0d2c47 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -11,8 +11,6 @@
  '(calendar-week-start-day 1)
  '(column-number-mode t)
  '(comint-scroll-show-maximum-output nil)
- '(completions-detailed t)
- '(completions-group t)
  '(delete-selection-mode t)
  '(describe-bindings-outline t)
  '(diff-default-read-only t)
@@ -54,13 +52,8 @@
  '(highlight-nonselected-windows t)
  '(hscroll-step 1)
  '(ibuffer-default-sorting-mode 'filename/process)
- '(icomplete-mode t)
- '(icomplete-scroll t t)
- '(icomplete-vertical-mode t)
  '(indent-tabs-mode nil)
  '(inhibit-startup-screen t)
- '(isearch-allow-scroll t)
- '(isearch-lazy-count t)
  '(line-number-display-limit-width 2000)
  '(lua-indent-level 2)
  '(magit-define-global-key-bindings nil)
@@ -75,13 +68,8 @@
  '(markdown-indent-on-enter 'indent-and-new-item)
  '(menu-bar-mode nil)
  '(minibuffer-depth-indicate-mode t)
- '(org-edit-src-content-indentation 0)
- '(org-ellipsis "…")
- '(org-fontify-done-headline nil)
- '(org-fontify-quote-and-verse-blocks t)
- '(org-startup-indented t)
  '(package-selected-packages
-   '(async auctex debbugs delight diff-hl eglot flycheck magit markdown-mode page-break-lines paradox rg rust-mode which-key wgrep))
+   '(async auctex debbugs delight diff-hl eglot flycheck magit markdown-mode page-break-lines paradox rg rust-mode use-package which-key wgrep))
  '(page-break-lines-modes '(fundamental-mode text-mode prog-mode special-mode))
  '(paradox-execute-asynchronously t)
  '(paradox-github-token t)