about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-03-16 22:52:18 -0500
committerCase Duckworth2021-03-16 22:52:18 -0500
commit0337a1cda1e4f1a6aa5a861ed3f262f2868625ca (patch)
treeda012f4c27cbb373358c354b5d9803a991f77f34
parentAdd crux bindings (diff)
parentRemove empty comment lines in headers (diff)
downloademacs-0337a1cda1e4f1a6aa5a861ed3f262f2868625ca.tar.gz
emacs-0337a1cda1e4f1a6aa5a861ed3f262f2868625ca.zip
Merge branch 'main' of tildegit.org:acdw/emacs
-rw-r--r--early-init.el11
-rw-r--r--init.el47
-rw-r--r--lisp/acdw-modeline.el12
-rw-r--r--lisp/acdw-org.el11
-rw-r--r--lisp/acdw.el10
5 files changed, 37 insertions, 54 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 @@
1;;; early-init.el -*- lexical-binding: t; coding: utf-8-unix -*- 1;;; early-init.el -*- lexical-binding: t; coding: utf-8-unix -*-
2;;
3;; Author: Case Duckworth <acdw@acdw.net> 2;; Author: Case Duckworth <acdw@acdw.net>
4;; Created: Sometime during Covid-19, 2020 3;; Created: Sometime during Covid-19, 2020
5;; Keywords: configuration 4;; Keywords: configuration
6;; URL: https://tildegit.org/acdw/emacs 5;; URL: https://tildegit.org/acdw/emacs
7;; 6
8;; This file is NOT part of GNU Emacs. 7;; This file is NOT part of GNU Emacs.
9;; 8
10;;; License: 9;;; License:
11;;
12;; Everyone is permitted to do whatever with this software, without 10;; Everyone is permitted to do whatever with this software, without
13;; limitation. This software comes without any warranty whatsoever, 11;; limitation. This software comes without any warranty whatsoever,
14;; but with two pieces of advice: 12;; but with two pieces of advice:
15;; - Don't hurt yourself. 13;; - Don't hurt yourself.
16;; - Make good choices. 14;; - Make good choices.
17;; 15
18;;; Comentary: 16;;; Comentary:
19;;
20;; Starting with Emacs 27.1, `early-init' is sourced before `package' 17;; Starting with Emacs 27.1, `early-init' is sourced before `package'
21;; or any frames. So those are the settings I run in this file. 18;; or any frames. So those are the settings I run in this file.
22;; 19
23;;; Code: 20;;; Code:
24 21
25;;; Define personal-use constants 22;;; Define personal-use constants
diff --git a/init.el b/init.el index a836386..9423887 100644 --- a/init.el +++ b/init.el
@@ -1,21 +1,19 @@
1;;; init.el -*- lexical-binding: t; coding: utf-8-unix -*- 1;;; init.el -*- lexical-binding: t; coding: utf-8-unix -*-
2;;
3;; Author: Case Duckworth <acdw@acdw.net> 2;; Author: Case Duckworth <acdw@acdw.net>
4;; Created: Sometime during Covid-19, 2020 3;; Created: Sometime during Covid-19, 2020
5;; Keywords: configuration 4;; Keywords: configuration
6;; URL: https://tildegit.org/acdw/emacs 5;; URL: https://tildegit.org/acdw/emacs
7;; Bankruptcy: 5c 6;; Bankruptcy: 5c
8;; 7
9;; This file is NOT part of GNU Emacs. 8;; This file is NOT part of GNU Emacs.
10;; 9
11;;; License: 10;;; License:
12;;
13;; Everyone is permitted to do whatever with this software, without 11;; Everyone is permitted to do whatever with this software, without
14;; limitation. This software comes without any warranty whatsoever, 12;; limitation. This software comes without any warranty whatsoever,
15;; but with two pieces of advice: 13;; but with two pieces of advice:
16;; - Don't hurt yourself. 14;; - Don't hurt yourself.
17;; - Make good choices. 15;; - Make good choices.
18;; 16
19;;; Code: 17;;; Code:
20 18
21;;; Add `acdw.el' 19;;; Add `acdw.el'
@@ -286,9 +284,7 @@
286 (modus-themes-scale-headings nil) 284 (modus-themes-scale-headings nil)
287 (modus-themes-mode-line nil)) 285 (modus-themes-mode-line nil))
288 :now ((acdw/sunrise-sunset #'modus-themes-load-operandi 286 :now ((acdw/sunrise-sunset #'modus-themes-load-operandi
289 #'modus-themes-load-vivendi) 287 #'modus-themes-load-vivendi)))
290 ;; for june
291 (global-font-lock-mode -1)))
292 288
293;; Expand-region 289;; Expand-region
294(acdw/pkg expand-region 290(acdw/pkg expand-region
@@ -346,29 +342,26 @@
346 (prog-mode-hook goto-address-prog-mode))) 342 (prog-mode-hook goto-address-prog-mode)))
347 343
348;;; Dired 344;;; Dired
349 345(acdw/pkg dired
350(acdw/set `((dired-recursive-copies always) 346 :local t
347 :set `((dired-recursive-copies always)
351 (dired-recursive-deletes always) 348 (dired-recursive-deletes always)
352 (delete-by-moving-to-trash t) 349 (delete-by-moving-to-trash t)
353 (dired-listing-switches "-Al") 350 (dired-listing-switches "-Al")
354 (ls-lisp-dirs-first t) 351 (ls-lisp-dirs-first t)
355 (dired-dwim-target t))) 352 (dired-dwim-target t))
356 353 :now ((autoload 'dired-mode-map "dired" nil nil 'keymap)
357(defun hook--dired-mode () 354 (acdw/pkg dired-subtree)
358 (hl-line-mode +1) 355 (acdw/pkg dired-x
359 (dired-hide-details-mode +1)) 356 :local t
360(add-hook 'dired-mode-hook #'hook--dired-mode) 357 :binds (("C-x C-j" dired-jump)))
361 358 (acdw/pkg dired-collapse
362(acdw/bind "C-x C-j" dired-jump :after "dired-x") 359 :hooks ((dired-mode-hook dired-collapse-mode)))
363 360 (defun hook--dired-mode ()
364(with-eval-after-load 'dired 361 (hl-line-mode +1)
365 ;; I tried `autoload'ing the keymap, and it just wouldn't work. I have no 362 (dired-hide-details-mode +1)))
366 ;; idea what the issue was. 363 :hooks ((dired-mode-hook hook--dired-mode))
367 (acdw/pkg dired-subtree 364 :binds (("i" dired-subtree-toggle :map dired-mode-map)))
368 :binds (("i" dired-subtree-toggle :map dired-mode-map))))
369
370(acdw/pkg dired-collapse
371 :hooks ((dired-mode-hook dired-collapse-mode)))
372 365
373;;; Eshell 366;;; Eshell
374 367
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 @@
1:;;; acdw-modeline.el -*- lexical-binding: t; coding: utf-8-unix -*- 1;;; acdw-modeline.el -*- lexical-binding: t; coding: utf-8-unix -*-
2;;
3;; Author: Case Duckworth <acdw@acdw.net> 2;; Author: Case Duckworth <acdw@acdw.net>
4;; Created: Sometime during Covid-19, 2020 3;; Created: Sometime during Covid-19, 2020
5;; Keywords: configuration 4;; Keywords: configuration
6;; URL: https://tildegit.org/acdw/emacs 5;; URL: https://tildegit.org/acdw/emacs
7;; 6
8;; This file is NOT part of GNU Emacs. 7;; This file is NOT part of GNU Emacs.
9;; 8
10;;; License: 9;;; License:
11;;
12;; Everyone is permitted to do whatever with this software, without 10;; Everyone is permitted to do whatever with this software, without
13;; limitation. This software comes without any warranty whatsoever, 11;; limitation. This software comes without any warranty whatsoever,
14;; but with two pieces of advice: 12;; but with two pieces of advice:
15;; - Don't hurt yourself. 13;; - Don't hurt yourself.
16;; - Make good choices. 14;; - Make good choices.
17;; 15
18;;; Commentary: 16;;; Commentary:
19;; `acdw-modeline' is a dumping ground for extra modeline functions, so they 17;; `acdw-modeline' is a dumping ground for extra modeline functions, so they
20;; don't clutter up `init.el'. 18;; don't clutter up `init.el'.
21;; 19
22;;; Code: 20;;; Code:
23 21
24(require 'simple-modeline) 22(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 @@
1;;; acdw-org.el -*- lexical-binding: t; coding: utf-8-unix -*- 1;;; acdw-org.el -*- lexical-binding: t; coding: utf-8-unix -*-
2;;
3;; Author: Various 2;; Author: Various
4;; URL: https://tildegit.org/acdw/emacs 3;; URL: https://tildegit.org/acdw/emacs
5;; 4
6;; This file is NOT part of GNU Emacs. 5;; This file is NOT part of GNU Emacs.
7;; 6
8;;; License: 7;;; License:
9;;
10;; Everyone is permitted to do whatever with this software, without 8;; Everyone is permitted to do whatever with this software, without
11;; limitation. This software comes without any warranty whatsoever, 9;; limitation. This software comes without any warranty whatsoever,
12;; but with two pieces of advice: 10;; but with two pieces of advice:
13;; - Don't hurt yourself. 11;; - Don't hurt yourself.
14;; - Make good choices. 12;; - Make good choices.
15;; 13
16;;; Commentary: 14;;; Commentary:
17;;
18;; This file is for the weird little `org-mode' functions that just take up 15;; This file is for the weird little `org-mode' functions that just take up
19;; space in my main init file. I've tried to give credit where credit is due. 16;; space in my main init file. I've tried to give credit where credit is due.
20;; 17
21;;; Code: 18;;; Code:
22 19
23;;; unpackaged.el: https://github.com/alphapapa/unpackaged.el 20;;; 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 @@
1:;;; acdw.el -*- lexical-binding: t; coding: utf-8-unix -*- 1:;;; acdw.el -*- lexical-binding: t; coding: utf-8-unix -*-
2;;
3;; Author: Case Duckworth <acdw@acdw.net> 2;; Author: Case Duckworth <acdw@acdw.net>
4;; Created: Sometime during Covid-19, 2020 3;; Created: Sometime during Covid-19, 2020
5;; Keywords: configuration 4;; Keywords: configuration
6;; URL: https://tildegit.org/acdw/emacs 5;; URL: https://tildegit.org/acdw/emacs
7;; 6
8;; This file is NOT part of GNU Emacs. 7;; This file is NOT part of GNU Emacs.
9;; 8
10;;; License: 9;;; License:
11;;
12;; Everyone is permitted to do whatever with this software, without 10;; Everyone is permitted to do whatever with this software, without
13;; limitation. This software comes without any warranty whatsoever, 11;; limitation. This software comes without any warranty whatsoever,
14;; but with two pieces of advice: 12;; but with two pieces of advice:
15;; - Don't hurt yourself. 13;; - Don't hurt yourself.
16;; - Make good choices. 14;; - Make good choices.
17;; 15
18;;; Commentary: 16;;; Commentary:
19;; `acdw.el' contains `acdw/map', its mode, and assorted ease-of-life 17;; `acdw.el' contains `acdw/map', its mode, and assorted ease-of-life
20;; functions for me, acdw. 18;; functions for me, acdw.
21;; 19
22;;; Code: 20;;; Code:
23 21
24;;; Utilities 22;;; Utilities