emacs/.emacs.d/config/init-built-ins.el

@@ -35,20 +35,7 @@
   :defer t
   :straight (:type built-in)
   :config
-  (setq ediff-window-setup-function #'ediff-setup-windows-plain)
+  (setq ediff-window-setup-function #'ediff-setup-windows-plain))
-  (evil-collection-ediff-setup)
-
-  ;; Restore window configuration after an ediff session
-  (defvar ediff-last-windows nil)
-
-  (defun store-pre-ediff-winconfig ()
-    (setq ediff-last-windows (current-window-configuration)))
-
-  (defun restore-pre-ediff-winconfig ()
-    (set-window-configuration ediff-last-windows))
-
-  (add-hook 'ediff-before-setup-hook #'store-pre-ediff-winconfig)
-  (add-hook 'ediff-quit-hook #'restore-pre-ediff-winconfig))
 
 (use-package replace
   :defer t

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

@@ -96,13 +96,4 @@
 (use-package ws-butler
   :hook (prog-mode . ws-butler-mode))
 
-;; Inc/dec numbers
-(use-package evil-numbers
-  :straight (:host github :repo "juliapath/evil-numbers")
-  :general
-  (normal "g+" #'evil-numbers/inc-at-pt)
-  (normal "g-" #'evil-numbers/dec-at-pt)
-  (normal "g M-+" #'evil-numbers/inc-at-pt-incremental)
-  (normal "g M--" #'evil-numbers/dec-at-pt-incremental))
-
 (provide 'init-editing)

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

@@ -26,7 +26,8 @@
                        ("View in browser" . mu4e-action-view-in-browser))
    ;; Bookmarked searches
    mu4e-bookmarks '((:name "Inbox"
-                           :query "maildir:/jeremy-dormitzer-gmail-com/Inbox OR maildir:/jeremydormitzer-lola-com/Inbox"
+                           :query (concat "maildir:/jeremy-dormitzer-gmail-com/Inbox"
+                                          " OR maildir:/jeremydormitzer-lola-com/Inbox")
                            :key ?i)
                     (:name "Unread messages"
                            :query "flag:unread AND NOT flag:trashed"

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

@@ -13,4 +13,12 @@
 (use-package evil-collection
   :after evil)
 
+(use-package evil-numbers
+  :straight (:host github :repo "juliapath/evil-numbers")
+  :general
+  (normal "g+" #'evil-numbers/inc-at-pt)
+  (normal "g-" #'evil-numbers/dec-at-pt)
+  (normal "g M-+" #'evil-numbers/inc-at-pt-incremental)
+  (normal "g M--" #'evil-numbers/dec-at-pt-incremental))
+
 (provide 'init-evil)

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

@@ -12,7 +12,6 @@
   ([remap describe-function] #'helpful-callable)
   ([remap describe-variable] #'helpful-variable)
   ([remap describe-key] #'helpful-key)
-  (normal helpful-mode-map "TAB" #'forward-button
+  (normal helpful-mode-map "TAB" #'forward-button))
-          "gr" #'helpful-update))
 
 (provide 'init-help)

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

@@ -1,9 +0,0 @@
-;; -*- lexical-binding: t; -*-
-
-;; An Emacs interface to the Homebrew package manager
-(use-package homebrew
-  :straight (:host github :repo "jdormit/homebrew.el")
-  :if (executable-find "brew")
-  :defer t)
-
-(provide 'init-homebrew)

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

@@ -10,10 +10,9 @@
   (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
+  (general-def run-command-term-minor-mode-map [remap recompile] #'run-command-term-recompile)
-    [remap recompile] #'run-command-term-recompile
-    "g" nil)
   (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

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

@@ -8,14 +8,13 @@
       (call-interactively #'vterm)))
   :config
   (evil-collection-vterm-setup)
-  (general-def 'insert vterm-mode-map "C-<escape>" #'vterm-send-escape)
   ;; Add a hook when vterm changes the directory
   (defvar vterm-directory-change-hook nil
     "Hooks to be run after vterm changes the directory")
   (defun vterm--set-directory (path)
     "Set `default-directory' to PATH."
     (let ((dir (vterm--get-directory path)))
-      (when (and dir (eq major-mode 'vterm-mode))
+      (when dir
         (setq default-directory dir)
         (run-hooks 'vterm-directory-change-hook))))
   (add-hook 'vterm-mode-hook #'hack-dir-local-variables-non-file-buffer)
@@ -24,11 +23,6 @@
   (leader-map "v" #'project-vterm)
   :custom
   (vterm-environment '("TYPEWRITTEN_CURSOR=terminal"))
-  (vterm-ignore-blink-cursor t)
+  (vterm-ignore-blink-cursor t))
-  (vterm-eval-cmds '(("find-file" find-file)
-                     ("message" message)
-                     ("vterm-clear-scrollback" vterm-clear-scrollback)
-                     ("man" man)
-                     ("ediff" ediff))))
 
 (provide 'init-vterm)

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))
@@ -88,7 +90,3 @@
 (require 'init-email)
 (require 'init-kubernetes)
 (require 'init-epub)
-(require 'init-homebrew)
-
-(when (file-exists-p custom-file)
-  (load custom-file 'noerror 'nomessage))

zsh/.zshrc

@@ -122,6 +122,12 @@ function vterm_printf(){
     fi
 }
 
+# Completely clear the buffer. With this, everything that is not on screen
+# is erased.
+if [[ "$INSIDE_EMACS" = 'vterm' ]]; then
+    alias clear='vterm_printf "51;Evterm-clear-scrollback";tput clear'
+fi
+
 # With vterm_cmd you can execute Emacs commands directly from the shell.
 # For example, vterm_cmd message "HI" will print "HI".
 # To enable new commands, you have to customize Emacs's variable
@@ -136,14 +142,6 @@ vterm_cmd() {
     vterm_printf "51;E$vterm_elisp"
 }
 
-if [[ "$INSIDE_EMACS" = 'vterm' ]]; then
-    # Completely clear the buffer. With this, everything that is not on screen
-    # is erased.
-    alias clear='vterm_printf "51;Evterm-clear-scrollback";tput clear'
-    alias man='vterm_cmd man'
-    alias ediff='vterm_cmd ediff'
-fi
-
 # This is to change the title of the buffer based on information provided by the
 # shell. See, http://tldp.org/HOWTO/Xterm-Title-4.html, for the meaning of the
 # various symbols.