Merge branch 'main' of tildegit.org:acdw/emacs

5 files changed, 37 insertions, 54 deletions

@@ -1,25 +1,22 @@
 ;;; early-init.el -*- lexical-binding: t; coding: utf-8-unix -*-
-;;
 ;; Author: Case Duckworth <acdw@acdw.net>
 ;; Created: Sometime during Covid-19, 2020
 ;; Keywords: configuration
 ;; URL: https://tildegit.org/acdw/emacs
-;;
+
 ;; This file is NOT part of GNU Emacs.
-;;
+
 ;;; License:
-;;
 ;; Everyone is permitted to do whatever with this software, without
 ;; limitation.  This software comes without any warranty whatsoever,
 ;; but with two pieces of advice:
 ;; - Don't hurt yourself.
 ;; - Make good choices.
-;;
+
 ;;; Comentary:
-;;
 ;; Starting with Emacs 27.1, `early-init' is sourced before `package'
 ;; or any frames.  So those are the settings I run in this file.
-;;
+
 ;;; Code:
 
 ;;; Define personal-use constants
@@ -1,21 +1,19 @@
 ;;; init.el -*- lexical-binding: t; coding: utf-8-unix -*-
-;;
 ;; Author: Case Duckworth <acdw@acdw.net>
 ;; Created: Sometime during Covid-19, 2020
 ;; Keywords: configuration
 ;; URL: https://tildegit.org/acdw/emacs
 ;; Bankruptcy: 5c
-;;
+
 ;; This file is NOT part of GNU Emacs.
-;;
+
 ;;; License:
-;;
 ;; Everyone is permitted to do whatever with this software, without
 ;; limitation.  This software comes without any warranty whatsoever,
 ;; but with two pieces of advice:
 ;; - Don't hurt yourself.
 ;; - Make good choices.
-;;
+
 ;;; Code:
 
 ;;; Add `acdw.el'
@@ -286,9 +284,7 @@
          (modus-themes-scale-headings nil)
          (modus-themes-mode-line nil))
   :now ((acdw/sunrise-sunset #'modus-themes-load-operandi
-                             #'modus-themes-load-vivendi)
-        ;; for june
-        (global-font-lock-mode -1)))
+                             #'modus-themes-load-vivendi)))
 
 ;; Expand-region
 (acdw/pkg expand-region
@@ -346,29 +342,26 @@
              (prog-mode-hook goto-address-prog-mode)))
 
 ;;; Dired
-
-(acdw/set `((dired-recursive-copies always)
+(acdw/pkg dired
+  :local t
+  :set `((dired-recursive-copies always)
             (dired-recursive-deletes always)
             (delete-by-moving-to-trash t)
             (dired-listing-switches "-Al")
             (ls-lisp-dirs-first t)
-            (dired-dwim-target t)))
-
-(defun hook--dired-mode ()
-  (hl-line-mode +1)
-  (dired-hide-details-mode +1))
-(add-hook 'dired-mode-hook #'hook--dired-mode)
-
-(acdw/bind "C-x C-j" dired-jump :after "dired-x")
-
-(with-eval-after-load 'dired
-  ;; I tried `autoload'ing the keymap, and it just wouldn't work.  I have no
-  ;; idea what the issue was.
-  (acdw/pkg dired-subtree
-    :binds (("i" dired-subtree-toggle :map dired-mode-map))))
-
-(acdw/pkg dired-collapse
-  :hooks ((dired-mode-hook dired-collapse-mode)))
+         (dired-dwim-target t))
+  :now ((autoload 'dired-mode-map "dired" nil nil 'keymap)
+        (acdw/pkg dired-subtree)
+        (acdw/pkg dired-x
+          :local t
+          :binds (("C-x C-j" dired-jump)))
+        (acdw/pkg dired-collapse
+          :hooks ((dired-mode-hook dired-collapse-mode)))
+        (defun hook--dired-mode ()
+          (hl-line-mode +1)
+          (dired-hide-details-mode +1)))
+  :hooks ((dired-mode-hook hook--dired-mode))
+  :binds (("i" dired-subtree-toggle :map dired-mode-map)))
 
 ;;; Eshell
 
@@ -1,24 +1,22 @@
-:;;; acdw-modeline.el -*- lexical-binding: t; coding: utf-8-unix -*-
-;;
+;;; acdw-modeline.el -*- lexical-binding: t; coding: utf-8-unix -*-
 ;; Author: Case Duckworth <acdw@acdw.net>
 ;; Created: Sometime during Covid-19, 2020
 ;; Keywords: configuration
 ;; URL: https://tildegit.org/acdw/emacs
-;;
+
 ;; This file is NOT part of GNU Emacs.
-;;
+
 ;;; License:
-;;
 ;; Everyone is permitted to do whatever with this software, without
 ;; limitation.  This software comes without any warranty whatsoever,
 ;; but with two pieces of advice:
 ;; - Don't hurt yourself.
 ;; - Make good choices.
-;;
+
 ;;; Commentary:
 ;; `acdw-modeline' is a dumping ground for extra modeline functions, so they
 ;; don't clutter up `init.el'.
-;;
+
 ;;; Code:
 
 (require 'simple-modeline)
@@ -1,23 +1,20 @@
 ;;; acdw-org.el -*- lexical-binding: t; coding: utf-8-unix -*-
-;;
 ;; Author: Various
 ;; URL: https://tildegit.org/acdw/emacs
-;;
+
 ;; This file is NOT part of GNU Emacs.
-;;
+
 ;;; License:
-;;
 ;; Everyone is permitted to do whatever with this software, without
 ;; limitation.  This software comes without any warranty whatsoever,
 ;; but with two pieces of advice:
 ;; - Don't hurt yourself.
 ;; - Make good choices.
-;;
+
 ;;; Commentary:
-;;
 ;; This file is for the weird little `org-mode' functions that just take up
 ;; space in my main init file.  I've tried to give credit where credit is due.
-;;
+
 ;;; Code:
 
 ;;; unpackaged.el: https://github.com/alphapapa/unpackaged.el
@@ -1,24 +1,22 @@
 :;;; acdw.el -*- lexical-binding: t; coding: utf-8-unix -*-
-;;
 ;; Author: Case Duckworth <acdw@acdw.net>
 ;; Created: Sometime during Covid-19, 2020
 ;; Keywords: configuration
 ;; URL: https://tildegit.org/acdw/emacs
-;;
+
 ;; This file is NOT part of GNU Emacs.
-;;
+
 ;;; License:
-;;
 ;; Everyone is permitted to do whatever with this software, without
 ;; limitation.  This software comes without any warranty whatsoever,
 ;; but with two pieces of advice:
 ;; - Don't hurt yourself.
 ;; - Make good choices.
-;;
+
 ;;; Commentary:
 ;; `acdw.el' contains `acdw/map', its mode, and assorted ease-of-life
 ;; functions for me, acdw.
-;;
+
 ;;; Code:
 
 ;;; Utilities