Rename +defaults to +emacs

2 files changed, 17 insertions, 13 deletions

@@ -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 ()
@@ -1,4 +1,4 @@
-;;; +defaults.el --- measured defaults for Emacs -*- lexical-binding: t -*-
+;;; +emacs.el --- measured defaults for Emacs -*- lexical-binding: t -*-
 
 ;;; Commentary:
 
@@ -182,10 +182,9 @@ Do this only if the buffer is not visiting a file."
 (global-set-key (kbd "C-r") 'isearch-backward-regexp)
 (global-set-key (kbd "C-M-s") 'isearch-forward)
 (global-set-key (kbd "C-M-r") 'isearch-backward)
-
-;; 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-?)
+(global-set-key (kbd "M-u") 'upcase-dwim)
+(global-set-key (kbd "M-l") 'downcase-dwim)
+(global-set-key (kbd "M-c") 'capitalize-dwim)
 
 ;;; Required libraries
 
@@ -239,5 +238,5 @@ Do this only if the buffer is not visiting a file."
   (add-to-list 'tramp-default-proxies-alist
                '((regexp-quote (system-name)) nil nil)))
 
-(provide '+defaults)
-;;; +defaults.el ends here
+(provide '+emacs)
+;;; +emacs.el ends here