From c21f21afab7514c312dae9bd500a703cd87c21cf Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Tue, 16 Mar 2021 09:29:53 -0500 Subject: "Package-ize" dired --- init.el | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/init.el b/init.el index d2d5b68..47b8462 100644 --- a/init.el +++ b/init.el @@ -367,29 +367,26 @@ indicator in the mode-line." (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 -- cgit 1.4.1-21-gabe81 From a84730b0d0bb124286cc51c7e3c2d516e7a5ef88 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Tue, 16 Mar 2021 11:15:59 -0500 Subject: Turn back on `global-font-lock-mode' --- init.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/init.el b/init.el index d0b6f6a..b8b2a45 100644 --- a/init.el +++ b/init.el @@ -286,9 +286,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 -- cgit 1.4.1-21-gabe81 From fe1706e7d9e6977b8b4f9e33f46611f87dcf43a5 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Tue, 16 Mar 2021 11:16:21 -0500 Subject: Remove empty comment lines in headers --- early-init.el | 11 ++++------- init.el | 8 +++----- lisp/acdw-modeline.el | 12 +++++------- lisp/acdw-org.el | 11 ++++------- lisp/acdw.el | 10 ++++------ 5 files changed, 20 insertions(+), 32 deletions(-) diff --git a/early-init.el b/early-init.el index 5ef77f7..201506a 100644 --- a/early-init.el +++ b/early-init.el @@ -1,25 +1,22 @@ ;;; early-init.el -*- lexical-binding: t; coding: utf-8-unix -*- -;; ;; Author: Case Duckworth ;; 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 diff --git a/init.el b/init.el index b8b2a45..2301e64 100644 --- a/init.el +++ b/init.el @@ -1,21 +1,19 @@ ;;; init.el -*- lexical-binding: t; coding: utf-8-unix -*- -;; ;; Author: Case Duckworth ;; 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' diff --git a/lisp/acdw-modeline.el b/lisp/acdw-modeline.el index 89037f9..1369d7d 100644 --- a/lisp/acdw-modeline.el +++ b/lisp/acdw-modeline.el @@ -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 ;; 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) diff --git a/lisp/acdw-org.el b/lisp/acdw-org.el index 1522f78..9fa8767 100644 --- a/lisp/acdw-org.el +++ b/lisp/acdw-org.el @@ -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 diff --git a/lisp/acdw.el b/lisp/acdw.el index e25de43..f454570 100644 --- a/lisp/acdw.el +++ b/lisp/acdw.el @@ -1,24 +1,22 @@ :;;; acdw.el -*- lexical-binding: t; coding: utf-8-unix -*- -;; ;; Author: Case Duckworth ;; 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 -- cgit 1.4.1-21-gabe81