diff --git a/init.example.el b/init.example.el index f74e349a4..638622f33 100644 --- a/init.example.el +++ b/init.example.el @@ -42,14 +42,17 @@ vi-tilde-fringe ; fringe tildes to mark beyond EOB window-select ; visually switch windows - :tools + :emacs dired ; making dired pretty [functional] - editorconfig ; let someone else argue about tabs vs spaces electric-indent ; smarter, keyword-based electric-indent - ;ein ; tame Jupyter notebooks with emacs eshell ; a consistent, cross-platform shell (WIP) - ;gist ; interacting with github gists imenu ; an imenu sidebar and searchable code index + ;term ; terminals in Emacs + + :tools + editorconfig ; let someone else argue about tabs vs spaces + ;ein ; tame Jupyter notebooks with emacs + ;gist ; interacting with github gists ;macos ; MacOS-specific commands ;make ; run make tasks from Emacs ;magit ; @@ -58,7 +61,6 @@ ;prodigy ; FIXME managing external services & code builders ;rgb ; creating color strings rotate-text ; cycle region at point between text candidates - ;term ; terminals in Emacs tmux ; an API for interacting with tmux upload ; map local to remote projects via ssh/ftp diff --git a/modules/tools/dired/config.el b/modules/emacs/dired/config.el similarity index 100% rename from modules/tools/dired/config.el rename to modules/emacs/dired/config.el diff --git a/modules/tools/dired/packages.el b/modules/emacs/dired/packages.el similarity index 100% rename from modules/tools/dired/packages.el rename to modules/emacs/dired/packages.el diff --git a/modules/tools/electric-indent/config.el b/modules/emacs/electric-indent/config.el similarity index 95% rename from modules/tools/electric-indent/config.el rename to modules/emacs/electric-indent/config.el index 01a1f3f86..f823676c5 100644 --- a/modules/tools/electric-indent/config.el +++ b/modules/emacs/electric-indent/config.el @@ -1,4 +1,4 @@ -;;; tools/electric-indent/config.el -*- lexical-binding: t; -*- +;;; emacs/electric-indent/config.el -*- lexical-binding: t; -*- ;; Smarter, keyword-based electric-indent diff --git a/modules/tools/eshell/autoload/eshell.el b/modules/emacs/eshell/autoload/eshell.el similarity index 99% rename from modules/tools/eshell/autoload/eshell.el rename to modules/emacs/eshell/autoload/eshell.el index ae81c4530..e2ff5f261 100644 --- a/modules/tools/eshell/autoload/eshell.el +++ b/modules/emacs/eshell/autoload/eshell.el @@ -1,4 +1,4 @@ -;;; tools/eshell/autoload/eshell.el -*- lexical-binding: t; -*- +;;; emacs/eshell/autoload/eshell.el -*- lexical-binding: t; -*- ;;;###autoload (defface +eshell-prompt-pwd '((t :inherit eshell-prompt)) diff --git a/modules/tools/eshell/autoload/evil.el b/modules/emacs/eshell/autoload/evil.el similarity index 85% rename from modules/tools/eshell/autoload/evil.el rename to modules/emacs/eshell/autoload/evil.el index e331d9d51..608b36354 100644 --- a/modules/tools/eshell/autoload/evil.el +++ b/modules/emacs/eshell/autoload/evil.el @@ -1,4 +1,4 @@ -;;; tools/eshell/autoload/evil.el -*- lexical-binding: t; -*- +;;; emacs/eshell/autoload/evil.el -*- lexical-binding: t; -*- ;;;###if (featurep! :feature evil) ;;;###autoload @@ -19,7 +19,7 @@ already there)." (goto-char (point-max)) (evil-append 1)) -;;;###autoload (autoload '+eshell:run "tools/eshell/autoload/evil" nil t) +;;;###autoload (autoload '+eshell:run "emacs/eshell/autoload/evil" nil t) (evil-define-command +eshell:run (command bang) ;; TODO Add COMMAND support (interactive "") @@ -27,7 +27,7 @@ already there)." (+eshell/open command) (+eshell/open-popup command))) -;;;###autoload (autoload '+eshell/evil-change "tools/eshell/autoload/evil" nil t) +;;;###autoload (autoload '+eshell/evil-change "emacs/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 "") @@ -37,14 +37,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 "tools/eshell/autoload/evil" nil t) +;;;###autoload (autoload '+eshell/evil-change-line "emacs/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 "") (+eshell/evil-change beg end type register yank-handler #'evil-delete-line)) -;;;###autoload (autoload '+eshell/evil-delete "tools/eshell/autoload/evil" nil t) +;;;###autoload (autoload '+eshell/evil-delete "emacs/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 "") @@ -54,7 +54,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 "tools/eshell/autoload/evil" nil t) +;;;###autoload (autoload '+eshell/evil-delete-line "emacs/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 diff --git a/modules/tools/eshell/config.el b/modules/emacs/eshell/config.el similarity index 98% rename from modules/tools/eshell/config.el rename to modules/emacs/eshell/config.el index 45e16e9f2..4e9d5bf23 100644 --- a/modules/tools/eshell/config.el +++ b/modules/emacs/eshell/config.el @@ -1,4 +1,4 @@ -;;; tools/eshell/config.el -*- lexical-binding: t; -*- +;;; emacs/eshell/config.el -*- lexical-binding: t; -*- ;; see: ;; + `+eshell/open': open in current buffer diff --git a/modules/tools/imenu/config.el b/modules/emacs/imenu/config.el similarity index 92% rename from modules/tools/imenu/config.el rename to modules/emacs/imenu/config.el index 577476ab9..4aff311db 100644 --- a/modules/tools/imenu/config.el +++ b/modules/emacs/imenu/config.el @@ -1,4 +1,4 @@ -;;; tools/imenu/config.el -*- lexical-binding: t; -*- +;;; emacs/imenu/config.el -*- lexical-binding: t; -*- ;; `imenu-anywhere' (setq imenu-anywhere-delimiter ": ") diff --git a/modules/tools/imenu/packages.el b/modules/emacs/imenu/packages.el similarity index 74% rename from modules/tools/imenu/packages.el rename to modules/emacs/imenu/packages.el index 0328b7016..60b3cfc93 100644 --- a/modules/tools/imenu/packages.el +++ b/modules/emacs/imenu/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- -;;; tools/imenu/packages.el +;;; emacs/imenu/packages.el (package! imenu-anywhere) (package! imenu-list) diff --git a/modules/tools/term/autoload.el b/modules/emacs/term/autoload.el similarity index 95% rename from modules/tools/term/autoload.el rename to modules/emacs/term/autoload.el index bb4391650..e1dabf554 100644 --- a/modules/tools/term/autoload.el +++ b/modules/emacs/term/autoload.el @@ -1,4 +1,4 @@ -;;; tools/term/autoload.el -*- lexical-binding: t; -*- +;;; emacs/term/autoload.el -*- lexical-binding: t; -*- ;;;###autoload (defun +term/open (&optional project-root) diff --git a/modules/tools/term/config.el b/modules/emacs/term/config.el similarity index 86% rename from modules/tools/term/config.el rename to modules/emacs/term/config.el index 3aaad2453..ac3487f09 100644 --- a/modules/tools/term/config.el +++ b/modules/emacs/term/config.el @@ -1,4 +1,4 @@ -;;; tools/term/config.el -*- lexical-binding: t; -*- +;;; emacs/term/config.el -*- lexical-binding: t; -*- ;; `multi-term' (setq multi-term-dedicated-window-height 20 diff --git a/modules/tools/term/packages.el b/modules/emacs/term/packages.el similarity index 66% rename from modules/tools/term/packages.el rename to modules/emacs/term/packages.el index 87724c0ef..963aff83e 100644 --- a/modules/tools/term/packages.el +++ b/modules/emacs/term/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- -;;; tools/term/packages.el +;;; emacs/term/packages.el (package! multi-term)