Move eshell, term & vterm modules to :term

core/core-modules.el

@@ -25,9 +25,12 @@
               (eval (:tools eval))
               (lookup (:tools lookup))
               (debugger (:tools debugger)))
-    (:tools (rotate-text (:editor rotate-text)))
+    (:tools (rotate-text (:editor rotate-text))
+            (vterm (:term vterm)))
     (:emacs (electric-indent (:emacs electric))
-            (hideshow (:editor fold)))
+            (hideshow (:editor fold))
+            (eshell (:term eshell))
+            (term (:term term)))
     (:ui (doom-modeline (:ui modeline))
          (fci (:ui fill-column))
          (evil-goggles (:ui ophints)))

init.example.el

@@ -59,11 +59,14 @@
        ;;+icons          ; colorful icons for dired-mode
         )
        electric          ; smarter, keyword-based electric-indent
-       ;;eshell            ; a consistent, cross-platform shell (WIP)
        imenu             ; an imenu sidebar and searchable code index
-       ;;term              ; terminals in Emacs
        vc                ; version-control and Emacs, sitting in a tree
 
+       :term
+       ;;eshell            ; a consistent, cross-platform shell (WIP)
+       ;;term              ; terminals in Emacs
+       ;;vterm             ; another terminals in Emacs
+
        :tools
        ;;ansible
        ;;debugger          ; FIXME stepping through code, to help you add bugs
@@ -89,7 +92,6 @@
        ;;tmux              ; an API for interacting with tmux
        ;;upload            ; map local to remote projects via ssh/ftp
        ;;wakatime
-       ;;vterm             ; another terminals in Emacs
 
        :lang
        ;;agda              ; types of types of types of types...

modules/README.org

@@ -5,6 +5,7 @@
 - [[#ui][:ui]]
 - [[#editor][:editor]]
 - [[#emacs][:emacs]]
+- [[#term][:term]]
 - [[#tools][:tools]]
 - [[#lang][:lang]]
 - [[#email][:email]]
@@ -63,11 +64,16 @@ Modules that reconfigure or augment packages or features built into Emacs.
 
 + dired =+ranger +icons=:
 + electric:
-+ eshell:
 + imenu:
-+ term:
 + vc:
 
+* :term
+Modules that offer terminal emulation.
+
++ eshell:
++ term:
++ [[file:term/vterm/README.org][vterm]]:
+
 * :tools
 Small modules that give Emacs access to external tools & services.
 
@@ -93,7 +99,6 @@ Small modules that give Emacs access to external tools & services.
 + tmux:
 + upload:
 + [[file:tools/wakatime/README.org][wakatime]]:
-+ vterm:
 
 * :lang
 Modules that bring support for a language or group of languages to Emacs.

modules/term/eshell/autoload/commands.el

@@ -1,4 +1,4 @@
-;;; emacs/eshell/autoload/commands.el -*- lexical-binding: t; -*-
+;;; term/eshell/autoload/commands.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
 (defun eshell/cd-to-project ()

modules/term/eshell/autoload/eshell.el

@@ -1,4 +1,4 @@
-;;; emacs/eshell/autoload/eshell.el -*- lexical-binding: t; -*-
+;;; term/eshell/autoload/eshell.el -*- lexical-binding: t; -*-
 
 (defvar eshell-buffer-name "*doom:eshell*")
 

modules/term/eshell/autoload/evil.el

@@ -1,4 +1,4 @@
-;;; emacs/eshell/autoload/evil.el -*- lexical-binding: t; -*-
+;;; term/eshell/autoload/evil.el -*- lexical-binding: t; -*-
 ;;;###if (featurep! :editor evil)
 
 ;;;###autoload
@@ -10,7 +10,7 @@ changing to insert mode."
     (remove-hook hook 'evil-collection-eshell-next-prompt-on-insert t)
     (add-hook hook '+eshell|goto-prompt-on-insert nil t)))
 
-;;;###autoload (autoload '+eshell:run "emacs/eshell/autoload/evil" nil t)
+;;;###autoload (autoload '+eshell:run "term/eshell/autoload/evil" nil t)
 (evil-define-command +eshell:run (command bang)
   "TODO"
   (interactive "<fsh><!>")
@@ -40,7 +40,7 @@ already there)."
   (goto-char (point-max))
   (evil-append 1))
 
-;;;###autoload (autoload '+eshell/evil-change "emacs/eshell/autoload/evil" nil t)
+;;;###autoload (autoload '+eshell/evil-change "term/eshell/autoload/evil" nil t)
 (evil-define-operator +eshell/evil-change (beg end type register yank-handler delete-func)
   "Like `evil-change' but will not delete/copy the prompt."
   (interactive "<R><x><y>")
@@ -50,14 +50,14 @@ already there)."
                  (if (eq type 'line) (point-max) (min (or end (point-max)) (point-max)))
                  type register yank-handler delete-func)))
 
-;;;###autoload (autoload '+eshell/evil-change-line "emacs/eshell/autoload/evil" nil t)
+;;;###autoload (autoload '+eshell/evil-change-line "term/eshell/autoload/evil" nil t)
 (evil-define-operator +eshell/evil-change-line (beg end type register yank-handler)
   "Change to end of line."
   :motion evil-end-of-line
   (interactive "<R><x><y>")
   (+eshell/evil-change beg end type register yank-handler #'evil-delete-line))
 
-;;;###autoload (autoload '+eshell/evil-delete "emacs/eshell/autoload/evil" nil t)
+;;;###autoload (autoload '+eshell/evil-delete "term/eshell/autoload/evil" nil t)
 (evil-define-operator +eshell/evil-delete (beg end type register yank-handler)
   "Like `evil-delete' but will not delete/copy the prompt."
   (interactive "<R><x><y>")
@@ -67,7 +67,7 @@ already there)."
                  (if (eq type 'line) (point-max) (min (or end (point-max)) (point-max)))
                  type register yank-handler)))
 
-;;;###autoload (autoload '+eshell/evil-delete-line "emacs/eshell/autoload/evil" nil t)
+;;;###autoload (autoload '+eshell/evil-delete-line "term/eshell/autoload/evil" nil t)
 (evil-define-operator +eshell/evil-delete-line (_beg end type register yank-handler)
   "Change to end of line."
   :motion nil

modules/term/eshell/autoload/prompts.el

@@ -1,4 +1,4 @@
-;;; emacs/eshell/autoload/prompts.el -*- lexical-binding: t; -*-
+;;; term/eshell/autoload/prompts.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
 (defface +eshell-prompt-pwd '((t :inherit font-lock-constant-face))

modules/term/eshell/autoload/settings.el

@@ -1,4 +1,4 @@
-;;; emacs/eshell/autoload/settings.el -*- lexical-binding: t; -*-
+;;; term/eshell/autoload/settings.el -*- lexical-binding: t; -*-
 
 ;;;###autodef
 (defun set-eshell-alias! (&rest aliases)

modules/term/eshell/config.el

@@ -1,4 +1,4 @@
-;;; emacs/eshell/config.el -*- lexical-binding: t; -*-
+;;; term/eshell/config.el -*- lexical-binding: t; -*-
 
 ;; see:
 ;;   + `+eshell/open': open in current buffer

modules/term/eshell/packages.el

@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
-;;; emacs/eshell/packages.el
+;;; term/eshell/packages.el
 
 (package! eshell-up)
 (package! eshell-z)

modules/term/term/autoload.el

@@ -1,4 +1,4 @@
-;;; emacs/term/autoload.el -*- lexical-binding: t; -*-
+;;; term/term/autoload.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
 (defun +term/open (arg)

modules/term/term/config.el

@@ -1,8 +1,8 @@
-;;; emacs/term/config.el -*- lexical-binding: t; -*-
+;;; term/term/config.el -*- lexical-binding: t; -*-
 
-;; `multi-term'
+;;;###package multi-term
 (setq multi-term-dedicated-window-height 20
       multi-term-switch-after-close 'PREVIOUS)
 
-;; `term' (built-in)
+;;;###package term
 (add-hook 'term-mode-hook #'doom|mark-buffer-as-real)

modules/term/term/packages.el

@@ -1,4 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
-;;; emacs/term/packages.el
+;;; term/term/packages.el
 
+(package! term :built-in t)
 (package! multi-term)

modules/term/vterm/README.org

@@ -1,4 +1,4 @@
-#+TITLE:   tools/vterm
+#+TITLE:   term/vterm
 #+DATE:    January 16, 2019
 #+SINCE:   2.1
 #+STARTUP: inlineimages

modules/term/vterm/autoload.el

@@ -1,4 +1,4 @@
-;;; tools/vterm/autoload.el -*- lexical-binding: t; -*-
+;;; term/vterm/autoload.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
 (defun +vterm/open (arg)

modules/term/vterm/config.el

@@ -1,4 +1,4 @@
-;;; tools/vterm/config.el -*- lexical-binding: t; -*-
+;;; term/vterm/config.el -*- lexical-binding: t; -*-
 
 (def-package! vterm
   :when (fboundp 'module-load)

modules/term/vterm/doctor.el

@@ -1,4 +1,4 @@
-;;; tools/vterm/doctor.el -*- lexical-binding: t; -*-
+;;; term/vterm/doctor.el -*- lexical-binding: t; -*-
 
 (unless (executable-find "vterm-ctrl")
   (warn! "Couldn't find libvterm. Vterm module won't compile"))

modules/term/vterm/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
-;;; tools/vterm/packages.el
+;;; term/vterm/packages.el
 
 (package! vterm)