1 files changed, 43 insertions, 11 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).