6 files changed, 57 insertions, 15 deletions
diff --git a/emacs/.config/emacs-kj/early-init.el b/emacs/.config/emacs-kj/early-init.el
index 512068a..95acd2e 100644
--- a/emacs/.config/emacs-kj/early-init.el
+++ b/emacs/.config/emacs-kj/early-init.el
@@ -1 +1,19 @@
+;;; early-init.el -*- lexical-binding: t; -*-
+
+;; Defer garbage collection further back in the startup process
+(setq gc-cons-threshold most-positive-fixnum)
+
+(setq-default inhibit-redisplay t
+              inhibit-message t)
+(add-hook 'window-setup-hook
+          (lambda ()
+            (setq-default inhibit-redisplay nil
+                          inhibit-message nil)
+            (redisplay)))
+
 (setq package-enable-at-startup nil)
+
+(tool-bar-mode -1)
+(scroll-bar-mode -1)
+(tooltip-mode -1)
+(menu-bar-mode -1)
diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el
index 3e10e47..b771a0c 100644
--- a/emacs/.config/emacs-kj/init.el
+++ b/emacs/.config/emacs-kj/init.el
@@ -14,6 +14,8 @@
       (eval-print-last-sexp)))
   (load bootstrap-file nil 'nomessage))
 
+(push (expand-file-name "lisp" user-emacs-directory) load-path)
+
 (setq user-full-name "KJ Orbekk"
       user-mail-address "kj@orbekk.com")
 
@@ -23,8 +25,6 @@
               (format-time-string "%F %T %z" startup-time)))
 (setq inhibit-startup-message t)
 
-(server-start)
-
 (setq custom-file (expand-file-name "emacs-custom.el" user-emacs-directory))
 (load custom-file :noerror t)
 
@@ -75,10 +75,6 @@
 (setq alert-default-style 'libnotify)
 
 (when window-system
-  (tool-bar-mode -1)
-  (scroll-bar-mode -1)
-  (tooltip-mode -1)
-  (menu-bar-mode -1)
   (use-package all-the-icons
     :if (display-graphic-p)))
 (setq inhibit-compacting-font-caches t)
@@ -382,10 +378,13 @@
   (org-mode . mixed-pitch-mode)
   )
 
-(set-face-attribute 'default nil :font "Iosevka" :height 150)
-(unless (equal system-name "minideck")
-  (set-face-attribute 'fixed-pitch nil :font "Iosevka" :height 150)
-  (set-face-attribute 'variable-pitch nil :font "Noto Serif"))
+(custom-set-faces
+ `(variable-pitch ((t (:family "Noto Serif" :height 150))))
+ `(default ((t (:family "Iosevka" :height 150)))))
+
+;; (unless (equal system-name "minideck")
+;;   (set-face-attribute 'fixed-pitch nil :font "Iosevka" :height 150)
+;;   (set-face-attribute 'variable-pitch nil :font "Noto Serif"))
 
 (setq compilation-ask-about-save nil)
 (use-package ob-async)
@@ -551,8 +550,17 @@
 ;; Org
 (add-to-list 'org-export-backends 'md)
 
-(load-file (locate-user-emacs-file "development.el"))
-(load-file (locate-user-emacs-file "eshell.el"))
+(require 'kj-development)
+(require 'kj-eshell)
+
+(defun kj/modules (module-directory)
+  (cl-loop for path in (f-files module-directory)
+           if (string-match "\\([^/]*\\).el" path)
+           collect (intern (match-string 1 path))))
+
+(dolist (module (kj/modules
+                 (expand-file-name "lisp" user-emacs-directory)))
+  (require module))
 
 (setq math-additional-units
       '((ZiB "1024 * EiB" "Zebibyte")
@@ -697,9 +705,15 @@
              (unbind-key "M-r" paredit-mode-map)
              (unbind-key "M-s" paredit-mode-map))))
 
+(defun kj/kill-word-or-region (arg)
+  (interactive "p")
+  (if (region-active-p)
+      (kill-region (region-beginning) (region-end))
+    (backward-kill-word (or arg 1))))
+
 (use-package emacs
   :bind
-  (("C-w" . backward-kill-word)
+  (("C-w" . kj/kill-word-or-region)
    ("C-c d" . kill-region)
    ("C-c m" . smerge-ediff)
    ("C-c b r" . revert-buffer)
@@ -900,7 +914,7 @@
    buffer
    (append (if (> (frame-width) 160)
                '((side . right)
-                 (window-width . 80))
+                 (window-width . 85))
              '((side . bottom)
                (window-height . 0.5)))
            alist)))
@@ -930,3 +944,7 @@
 
 ;; Enabled commands
 (put 'narrow-to-region 'disabled nil)
+(put 'downcase-region 'disabled nil)
+
+;; Restore gc.
+(setq gc-cons-threshold (* 16 1024 1024))
diff --git a/emacs/.config/emacs-kj/development.el b/emacs/.config/emacs-kj/lisp/kj-development.el
index 994a78a..8750ecc 100644
--- a/emacs/.config/emacs-kj/development.el
+++ b/emacs/.config/emacs-kj/lisp/kj-development.el
@@ -1,3 +1,4 @@
+;;; -*- lexical-binding: t; -*-
 (setq tab-stop-list (number-sequence 4 200 4))
 
 (use-package eglot)
@@ -77,3 +78,5 @@
 
 (use-package graphviz-dot-mode
   :ensure t)
+
+(provide 'kj-development)
diff --git a/emacs/.config/emacs-kj/eshell.el b/emacs/.config/emacs-kj/lisp/kj-eshell.el
index cd8d684..bd20f05 100644
--- a/emacs/.config/emacs-kj/eshell.el
+++ b/emacs/.config/emacs-kj/lisp/kj-eshell.el
@@ -42,3 +42,5 @@
     (throw 'eshell-replace-command
            (eshell-parse-command "*ssh"
                                  (eshell-stringify-list (flatten-tree args))))))
+
+(provide 'kj-eshell)
diff --git a/emacs/.config/emacs-kj/yasnippets/README.org b/emacs/.config/emacs-kj/yasnippets/README.org
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/emacs/.config/emacs-kj/yasnippets/README.org
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 299fc1d..a607781 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,5 +1,6 @@
 export TZ=America/New_York
-export EDITOR=nvim
+export ALTERNATE_EDITOR=vim
+export EDITOR=emacsclient
 export TERMINAL=urxvt
 export LEDGER_FILE=$HOME/org/hledger/2021.journal
 export CHEMACS_PROFILE=default