From cd3cc4f4e764c25dac453cf2c95a844726e7d19d Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Sun, 5 Dec 2021 22:37:11 -0600
Subject: Rename +defaults to +emacs

---
 init.el | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index 631ae3d..2a76b3b 100644
--- a/init.el
+++ b/init.el
@@ -16,15 +16,20 @@
 
 ;;; Code:
 
-;; Delete when no longer ... remacs'd
-;; Require early-init.el just in case it hasn't been yet.
-(require 'early-init (locate-user-emacs-file "early-init.el") :noerror)
-
-;; Requre my private stuff
+(require 'early-init (locate-user-emacs-file "early-init.el") t)
 (require 'private)
 (setq debug-on-error t)
 
-(setup (:require +defaults))
+(setup (:require +emacs)
+  ;; +emacs.el contains super-basic defaults that are basically
+  ;; necessary for good functioning.  In this block, I add extra
+  ;; things or more "experimental" ones that might not belong in a
+  ;; separate file.
+  (:global "M-o" 'other-buffer
+           "C-x C-k" 'kill-this-buffer)
+  ;; C-h deletes backward - see https://idiomdrottning.org/bad-emacs-defaults
+  (global-set-key (kbd "C-h") 'delete-backward-char)
+  (keyboard-translate ?\C-h ?\C-?))
 
 (setup (:require +init)
   (:bind "C-c s" (lambda ()
-- 
cgit 1.4.1-21-gabe81