Emacs: Back to vterm

.config/emacs/init.org

@@ -156,16 +156,16 @@ Finish up
 #+END_SRC
 ** Package Management
 #+begin_src emacs-lisp
-;; Also read: <https://protesilaos.com/codelog/2022-05-13-emacs-elpa-devel/>
-(setq package-archives
+  ;; Also read: <https://protesilaos.com/codelog/2022-05-13-emacs-elpa-devel/>
+  (setq package-archives
         '(("elpa" . "https://elpa.gnu.org/packages/")
           ("elpa-devel" . "https://elpa.gnu.org/devel/")
           ("nongnu" . "https://elpa.nongnu.org/nongnu/")
           ("melpa" . "https://melpa.org/packages/")))
 
 
-;; Proof-of-concept to install a list of packages
-(mapc
+  ;; Proof-of-concept to install a list of packages
+  (mapc
    (lambda (package)
      (unless (package-installed-p package)
       (package-install package)))
@@ -204,7 +204,7 @@ Finish up
      consult-eglot
      all-the-icons-completion
      helpful
-   ;; vterm
+     vterm
      eat
      ;; Enhancements
      olivetti
@@ -255,14 +255,14 @@ Finish up
      disaster
      magit))
 
-(setopt package-vc-selected-packages
+  (setopt package-vc-selected-packages
           '((dotenv :url "https://github.com/pkulev/dotenv.el")
             (indent-bars :url "https://github.com/jdtsmith/indent-bars")
             (doom-themes :url "https://github.com/JosephFerano/doom-themes")
             (org-timeblock :url "https://github.com/ichernyshovvv/org-timeblock")
             (dape :url "https://github.com/svaante/dape")
             (app-launcher :url "https://github.com/SebastienWae/app-launcher")))
-(package-initialize)
+  (package-initialize)
 
 #+end_src
 ** COMMENT Benchmarking
@@ -894,8 +894,10 @@ Fill region is great, except when you don't need it...
     (kbd "SPC br") 'joe/revert-buffer-no-confirm
     (kbd "SPC gg") 'magit-status
     (kbd "SPC gc") 'magit-clone
-    (kbd "SPC ss") 'eat
-    (kbd "SPC sv") 'eat-other-window
+    ;; (kbd "SPC ss") 'eat
+    ;; (kbd "SPC sv") 'eat-other-window
+    (kbd "SPC ss") 'joe/vterm-here
+    (kbd "SPC sv") 'vterm-other-window
     (kbd "SPC Ba") 'joe/bookmark-set-and-save
     (kbd "SPC Bd") 'bookmark-delete
     (kbd "SPC mr") 'joe/compile-run
@@ -1994,7 +1996,7 @@ be kept here commented out in case we want to try it again.
 (global-set-key (kbd "C-h C") #'helpful-command)
 #+end_src
 ** Terminals/Shells
-*** COMMENT vterm
+*** vterm
 #+begin_src emacs-lisp
 (require 'vterm)
 (setq vterm-shell "/bin/fish")
@@ -2026,8 +2028,8 @@ be kept here commented out in case we want to try it again.
 (defun joe/vterm-mode-hook ()
   (define-key vterm-mode-map (kbd "C-c C-x") #'vterm-send-C-x)
   (when (boundp 'evil-mode)
-    (evil-define-key 'insert vterm-mode-map (kbd "C-f") #'vterm-send-C-f)
-    (evil-define-key 'insert vterm-mode-map (kbd "C-w") #'vterm-send-C-w)
+    (evil-define-key 'insert vterm-mode-map (kbd "C-f") (lambda () (interactive) (vterm-send-key (kbd "C-f"))))
+    (evil-define-key 'insert vterm-mode-map (kbd "C-w") (lambda () (interactive) (vterm-send-key (kbd "C-w"))))
     (evil-define-key 'insert vterm-mode-map (kbd "<delete>") #'vterm-send-delete))
   (setq-local global-hl-line-mode nil)
   (setq buffer-face-mode-face '(:family "Fira Code Nerd Font"))
@@ -2079,7 +2081,7 @@ the right frame, I'm going to use the frame's name to close and remove the hook
       (add-hook 'delete-frame-functions #'joe/kill-vterm-scratch)
       (add-hook 'kill-buffer-hook #'joe/kill-frame))))
 #+end_src
-*** eat
+*** COMMENT eat
 #+begin_src emacs-lisp
 (defun joe/eat-mode-hook ()
   (setq-local global-hl-line-mode nil)