diff options
-rw-r--r-- | init.el | 17 | ||||
-rw-r--r-- | lisp/+emacs.el (renamed from lisp/+defaults.el) | 13 |
2 files changed, 17 insertions, 13 deletions
diff --git a/init.el b/init.el index 631ae3d..2a76b3b 100644 --- a/init.el +++ b/init.el | |||
@@ -16,15 +16,20 @@ | |||
16 | 16 | ||
17 | ;;; Code: | 17 | ;;; Code: |
18 | 18 | ||
19 | ;; Delete when no longer ... remacs'd | 19 | (require 'early-init (locate-user-emacs-file "early-init.el") t) |
20 | ;; Require early-init.el just in case it hasn't been yet. | ||
21 | (require 'early-init (locate-user-emacs-file "early-init.el") :noerror) | ||
22 | |||
23 | ;; Requre my private stuff | ||
24 | (require 'private) | 20 | (require 'private) |
25 | (setq debug-on-error t) | 21 | (setq debug-on-error t) |
26 | 22 | ||
27 | (setup (:require +defaults)) | 23 | (setup (:require +emacs) |
24 | ;; +emacs.el contains super-basic defaults that are basically | ||
25 | ;; necessary for good functioning. In this block, I add extra | ||
26 | ;; things or more "experimental" ones that might not belong in a | ||
27 | ;; separate file. | ||
28 | (:global "M-o" 'other-buffer | ||
29 | "C-x C-k" 'kill-this-buffer) | ||
30 | ;; C-h deletes backward - see https://idiomdrottning.org/bad-emacs-defaults | ||
31 | (global-set-key (kbd "C-h") 'delete-backward-char) | ||
32 | (keyboard-translate ?\C-h ?\C-?)) | ||
28 | 33 | ||
29 | (setup (:require +init) | 34 | (setup (:require +init) |
30 | (:bind "C-c s" (lambda () | 35 | (:bind "C-c s" (lambda () |
diff --git a/lisp/+defaults.el b/lisp/+emacs.el index d439d82..7440c92 100644 --- a/lisp/+defaults.el +++ b/lisp/+emacs.el | |||
@@ -1,4 +1,4 @@ | |||
1 | ;;; +defaults.el --- measured defaults for Emacs -*- lexical-binding: t -*- | 1 | ;;; +emacs.el --- measured defaults for Emacs -*- lexical-binding: t -*- |
2 | 2 | ||
3 | ;;; Commentary: | 3 | ;;; Commentary: |
4 | 4 | ||
@@ -182,10 +182,9 @@ Do this only if the buffer is not visiting a file." | |||
182 | (global-set-key (kbd "C-r") 'isearch-backward-regexp) | 182 | (global-set-key (kbd "C-r") 'isearch-backward-regexp) |
183 | (global-set-key (kbd "C-M-s") 'isearch-forward) | 183 | (global-set-key (kbd "C-M-s") 'isearch-forward) |
184 | (global-set-key (kbd "C-M-r") 'isearch-backward) | 184 | (global-set-key (kbd "C-M-r") 'isearch-backward) |
185 | 185 | (global-set-key (kbd "M-u") 'upcase-dwim) | |
186 | ;; C-h deletes backward - see https://idiomdrottning.org/bad-emacs-defaults | 186 | (global-set-key (kbd "M-l") 'downcase-dwim) |
187 | (global-set-key (kbd "C-h") 'delete-backward-char) | 187 | (global-set-key (kbd "M-c") 'capitalize-dwim) |
188 | (keyboard-translate ?\C-h ?\C-?) | ||
189 | 188 | ||
190 | ;;; Required libraries | 189 | ;;; Required libraries |
191 | 190 | ||
@@ -239,5 +238,5 @@ Do this only if the buffer is not visiting a file." | |||
239 | (add-to-list 'tramp-default-proxies-alist | 238 | (add-to-list 'tramp-default-proxies-alist |
240 | '((regexp-quote (system-name)) nil nil))) | 239 | '((regexp-quote (system-name)) nil nil))) |
241 | 240 | ||
242 | (provide '+defaults) | 241 | (provide '+emacs) |
243 | ;;; +defaults.el ends here | 242 | ;;; +emacs.el ends here |