Load custom file first

emacs/.emacs.d/config/init-editing.el

@@ -92,4 +92,8 @@
   :config
   (global-so-long-mode))
 
+;; Polite white-space trimming
+(use-package ws-butler
+  :hook (prog-mode . ws-butler-mode))
+
 (provide 'init-editing)

emacs/.emacs.d/config/init-org.el

@@ -5,6 +5,8 @@
   :mode (("\\.org\\'" . org-mode))
   :init
   (leader-def-key "o" '(nil :which-key "org"))
+  :config
+  (add-hook 'org-mode-hook #'auto-fill-mode)
   :custom
   (org-agenda-files `(,(expand-file-name "~/org/todo.org")
                       ,(expand-file-name "~/org/deft/unifydb.org")

emacs/.emacs.d/config/init-python.el

@@ -54,7 +54,14 @@
   (global-pyenv-mode)
   (defun pyenv-switch-buffer-hook (prev curr)
     (pyenv-use-corresponding))
+  (defun pyenv-use-corresponding-vterm-hook ()
+    (when (eq major-mode 'vterm-mode)
+      (vterm-send-C-e)
+      (vterm-send-C-u)
+      (vterm-send-string (format "export PYENV_VERSION=%s\n" (getenv "PYENV_VERSION")))))
   (add-hook 'switch-buffer-functions #'pyenv-switch-buffer-hook)
+  (add-hook 'eshell-directory-change-hook #'pyenv-use-corresponding)
+  (add-hook 'pyenv-mode-hook #'pyenv-use-corresponding-vterm-hook)
   :custom
   (pyenv-show-active-python-in-modeline nil))
 

emacs/.emacs.d/config/init-run-command.el

@@ -10,6 +10,10 @@
   (defvar-local run-command-project-local-commands nil)
   (put 'run-command-project-local-commands 'safe-local-variable (lambda (_) t))
   :config
+  (general-def run-command-term-minor-mode-map [remap recompile] #'run-command-term-recompile)
+  (general-def 'normal run-command-term-minor-mode-map "gr" #'run-command-term-recompile)
+  (general-def 'insert run-command-term-minor-mode-map "g" #'self-insert-command)
+
   (defun run-command-recipe-terraform ()
     (when (directory-files default-directory
                            nil
@@ -192,8 +196,6 @@
 
   :general
   (leader-map "\"" #'run-command)
-  (run-command-term-minor-mode-map [remap recompile] #'run-command-term-recompile)
-  (normal run-command-term-minor-mode-map "gr" #'run-command-term-recompile)
   :custom
   (run-command-run-method 'async-shell)
   (run-command-recipes '(run-command-recipe-terraform

emacs/.emacs.d/init.el

@@ -49,6 +49,8 @@
 
 ;; Don't use this file as the custom-file
 (setq custom-file (expand-file-name "custom.el" user-emacs-directory))
+(when (file-exists-p custom-file)
+  (load custom-file 'noerror 'nomessage))
 
 ;; Load config modules
 (add-to-list 'load-path (expand-file-name "config" user-emacs-directory))
@@ -87,7 +89,3 @@
 (require 'init-direnv)
 (require 'init-email)
 (require 'init-kubernetes)
-
-;; Load the custom file
-(when (file-exists-p custom-file)
-  (load custom-file))