From 77e4cc4d5841a4c0545b35c2d4c08c7d36d1e300 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 21 Apr 2019 19:59:44 -0400 Subject: [PATCH] :boom: Remove :feature category :feature was a "catch-all" category. Many of its modules fit better in other categories, so they've been moved: - feature/debugger -> tools/debugger - feature/evil -> editor/evil - feature/eval -> tools/eval - feature/lookup -> tools/lookup - feature/snippets -> editor/snippets - feature/file-templates -> editor/file-templates - feature/workspaces -> ui/workspaces More potential changes in the future: - A new :term category for terminal emulation modules (eshell, term and vterm). - A new :os category for modules dedicated to os-specific functionality. The :tools macos module would fit here, but so would modules for nixos and arch. - A new :services category for web-service integration, like wakatime, twitter, elfeed, gist and pastebin services. --- core/autoload/help.el | 2 +- core/core-modules.el | 31 ++- core/core-ui.el | 2 +- init.example.el | 20 +- modules/README.org | 26 +-- modules/app/calendar/autoload.el | 4 +- modules/app/email/autoload/evil.el | 2 +- modules/app/irc/autoload/irc.el | 2 +- modules/app/notmuch/autoload.el | 4 +- modules/app/rss/config.el | 2 +- modules/app/twitter/autoload.el | 6 +- modules/app/twitter/config.el | 2 +- modules/completion/company/config.el | 2 +- modules/completion/helm/autoload/evil.el | 2 +- modules/completion/helm/autoload/helm.el | 8 +- modules/completion/helm/config.el | 2 +- modules/completion/ivy/autoload/evil.el | 2 +- modules/completion/ivy/config.el | 2 +- modules/config/default/+emacs-bindings.el | 2 +- modules/config/default/+evil-bindings.el | 203 +++++++++--------- modules/config/default/README.org | 2 +- modules/config/default/packages.el | 2 +- modules/{feature => editor}/evil/+commands.el | 2 +- .../{feature => editor}/evil/+everywhere.el | 2 +- modules/{feature => editor}/evil/README.org | 4 +- .../evil/autoload/advice.el | 6 +- .../evil/autoload/embrace.el | 2 +- .../{feature => editor}/evil/autoload/evil.el | 16 +- .../evil/autoload/files.el | 8 +- modules/{feature => editor}/evil/config.el | 2 +- modules/{feature => editor}/evil/packages.el | 2 +- .../evil/test/test-evil.el | 4 +- .../file-templates/README.org | 2 +- .../file-templates/autoload.el | 2 +- .../file-templates/config.el | 4 +- .../file-templates/packages.el | 2 +- .../file-templates/templates/.editorconfig | 0 .../templates/android-mode/__build.gradle | 0 .../file-templates/templates/c++-mode/__cpp | 0 .../file-templates/templates/c++-mode/__hpp | 0 .../templates/c++-mode/__main.cpp | 0 .../templates/c++-mode/__winmain.cpp | 0 .../file-templates/templates/c-mode/__c | 0 .../file-templates/templates/c-mode/__h | 0 .../templates/dockerfile-mode/__ | 0 .../templates/emacs-ert-mode/__ | 0 .../templates/emacs-lisp-mode/__doom-doctor | 0 .../templates/emacs-lisp-mode/__doom-module | 0 .../templates/emacs-lisp-mode/__doom-packages | 0 .../templates/emacs-lisp-mode/__doom-test | 0 .../templates/emacs-lisp-mode/__initfile | 0 .../file-templates/templates/fish-mode/__ | 0 .../templates/gitignore-mode/__ | 0 .../file-templates/templates/go-mode/__.go | 0 .../templates/go-mode/__main.go | 0 .../templates/java-mode/.yas-setup.el | 0 .../file-templates/templates/java-mode/__ | 0 .../file-templates/templates/java-mode/__main | 0 .../templates/js-mode/__gulpfile.js | 0 .../templates/js-mode/__webpack.config.js | 0 .../file-templates/templates/json-mode/__ | 0 .../templates/json-mode/__bower.json | 0 .../templates/json-mode/__package.json | 0 .../templates/love-mode/__conf.lua | 0 .../templates/love-mode/__main.lua | 0 .../templates/makefile-gmake-mode/__ | 0 .../templates/makefile-gmake-mode/__cpp | 0 .../file-templates/templates/markdown-mode/__ | 0 .../templates/markdown-mode/__jekyll-post | 0 .../file-templates/templates/nose-mode/__ | 0 .../file-templates/templates/org-mode/__ | 0 .../templates/org-mode/__contact.org | 0 .../templates/org-mode/__doom-readme | 0 .../templates/org-mode/__invoice.org | 0 .../templates/org-mode/__project.org | 0 .../file-templates/templates/php-mode/__ | 0 .../templates/php-mode/__.class.php | 0 .../file-templates/templates/python-mode/__ | 0 .../templates/python-mode/__setup.py | 0 .../file-templates/templates/rspec-mode/__ | 0 .../templates/rspec-mode/__.rspec | 0 .../templates/rspec-mode/__helper | 0 .../file-templates/templates/ruby-mode/__ | 0 .../templates/ruby-mode/__.gemspec | 0 .../templates/ruby-mode/__Gemfile | 0 .../templates/ruby-mode/__Rakefile | 0 .../templates/ruby-mode/__module | 0 .../templates/rust-mode/__Cargo.toml | 0 .../templates/rust-mode/__main.rs | 0 .../file-templates/templates/scss-mode/__ | 0 .../templates/scss-mode/__master.scss | 0 .../templates/scss-mode/__normalize.scss | 0 .../file-templates/templates/sh-mode/__ | 0 .../file-templates/templates/sh-mode/__zunit | 0 .../file-templates/templates/slim-mode/__ | 0 .../file-templates/templates/snippet-mode/__ | 0 .../templates/solidity-mode/__sol | 0 .../templates/text-mode/__license | 0 .../templates/text-mode/__license-apache | 0 .../templates/text-mode/__license-apache-bp | 0 .../templates/text-mode/__license-bsd2 | 0 .../templates/text-mode/__license-bsd3 | 0 .../templates/text-mode/__license-gpl3 | 0 .../templates/text-mode/__license-gpl3-bp | 0 .../templates/text-mode/__license-lgpl3 | 0 .../templates/text-mode/__license-mit | 0 .../templates/text-mode/__license-mozilla | 0 .../templates/text-mode/__license-mozilla-bp | 0 .../templates/text-mode/__license-unlicense | 0 .../file-templates/templates/web-mode/__.html | 0 .../templates/web-mode/__jekyll-layout.html | 0 .../templates/yaml-mode/__docker-compose.yml | 0 modules/editor/fold/autoload/evil.el | 2 +- modules/editor/fold/config.el | 4 +- modules/editor/fold/packages.el | 2 +- modules/editor/format/autoload/evil.el | 2 +- modules/editor/lispy/config.el | 2 +- modules/editor/lispy/packages.el | 2 +- .../multiple-cursors/autoload/evil-mc.el | 2 +- modules/editor/multiple-cursors/config.el | 4 +- modules/editor/multiple-cursors/packages.el | 2 +- modules/editor/parinfer/config.el | 2 +- modules/editor/parinfer/packages.el | 2 +- .../{feature => editor}/snippets/README.org | 2 +- .../snippets/autoload/evil.el | 4 +- .../snippets/autoload/settings.el | 2 +- .../snippets/autoload/snippets.el | 3 +- .../{feature => editor}/snippets/config.el | 4 +- .../{feature => editor}/snippets/packages.el | 2 +- modules/emacs/dired/config.el | 2 +- modules/emacs/eshell/autoload/eshell.el | 2 +- modules/emacs/eshell/autoload/evil.el | 2 +- modules/emacs/eshell/config.el | 4 +- modules/emacs/vc/autoload/evil.el | 2 +- modules/lang/cc/README.org | 2 +- modules/lang/clojure/config.el | 2 +- modules/lang/common-lisp/config.el | 2 +- modules/lang/emacs-lisp/config.el | 2 +- modules/lang/go/README.org | 2 +- modules/lang/javascript/config.el | 4 +- modules/lang/javascript/packages.el | 2 +- modules/lang/ledger/config.el | 2 +- modules/lang/ledger/packages.el | 2 +- modules/lang/markdown/config.el | 2 +- modules/lang/ocaml/README.org | 2 +- modules/lang/ocaml/config.el | 2 +- modules/lang/ocaml/doctor.el | 2 +- modules/lang/ocaml/packages.el | 2 +- modules/lang/org/+capture.el | 2 +- modules/lang/org/config.el | 2 +- modules/lang/org/packages.el | 2 +- modules/lang/php/README.org | 2 +- modules/lang/ruby/config.el | 4 +- modules/lang/web/autoload/evil.el | 2 +- .../debugger/autoload/debug.el | 2 +- .../debugger/autoload/evil.el | 8 +- modules/{feature => tools}/debugger/config.el | 2 +- .../{feature => tools}/debugger/packages.el | 2 +- modules/tools/editorconfig/autoload.el | 7 + modules/{feature => tools}/eval/README.org | 2 +- .../{feature => tools}/eval/autoload/eval.el | 2 +- .../{feature => tools}/eval/autoload/evil.el | 10 +- .../{feature => tools}/eval/autoload/repl.el | 2 +- .../eval/autoload/settings.el | 2 +- modules/{feature => tools}/eval/config.el | 2 +- modules/{feature => tools}/eval/packages.el | 2 +- modules/tools/gist/autoload/evil.el | 2 +- modules/{feature => tools}/lookup/README.org | 4 +- .../lookup/autoload/docsets.el | 2 +- .../lookup/autoload/evil.el | 8 +- .../lookup/autoload/lookup.el | 13 +- .../lookup/autoload/online.el | 2 +- modules/{feature => tools}/lookup/config.el | 2 +- modules/{feature => tools}/lookup/packages.el | 2 +- modules/tools/magit/config.el | 2 +- modules/tools/magit/packages.el | 2 +- modules/tools/tmux/autoload/evil.el | 2 +- modules/tools/vterm/config.el | 2 +- modules/ui/modeline/config.el | 2 +- modules/ui/modeline/packages.el | 2 +- modules/ui/nav-flash/config.el | 2 +- modules/ui/ophints/config.el | 4 +- modules/ui/ophints/packages.el | 2 +- modules/ui/popup/config.el | 2 +- modules/ui/treemacs/config.el | 2 +- modules/ui/treemacs/packages.el | 2 +- modules/ui/window-select/README.org | 2 +- modules/{feature => ui}/workspaces/README.org | 2 +- .../workspaces/autoload/evil.el | 4 +- .../workspaces/autoload/workspaces.el | 0 modules/{feature => ui}/workspaces/config.el | 2 +- .../{feature => ui}/workspaces/packages.el | 2 +- .../workspaces/test/test-workspaces.el | 4 +- 193 files changed, 304 insertions(+), 303 deletions(-) rename modules/{feature => editor}/evil/+commands.el (99%) rename modules/{feature => editor}/evil/+everywhere.el (98%) rename modules/{feature => editor}/evil/README.org (98%) rename modules/{feature => editor}/evil/autoload/advice.el (97%) rename modules/{feature => editor}/evil/autoload/embrace.el (94%) rename modules/{feature => editor}/evil/autoload/evil.el (94%) rename modules/{feature => editor}/evil/autoload/files.el (80%) rename modules/{feature => editor}/evil/config.el (99%) rename modules/{feature => editor}/evil/packages.el (96%) rename modules/{feature => editor}/evil/test/test-evil.el (98%) rename modules/{feature => editor}/file-templates/README.org (98%) rename modules/{feature => editor}/file-templates/autoload.el (98%) rename modules/{feature => editor}/file-templates/config.el (98%) rename modules/{feature => editor}/file-templates/packages.el (58%) rename modules/{feature => editor}/file-templates/templates/.editorconfig (100%) rename modules/{feature => editor}/file-templates/templates/android-mode/__build.gradle (100%) rename modules/{feature => editor}/file-templates/templates/c++-mode/__cpp (100%) rename modules/{feature => editor}/file-templates/templates/c++-mode/__hpp (100%) rename modules/{feature => editor}/file-templates/templates/c++-mode/__main.cpp (100%) rename modules/{feature => editor}/file-templates/templates/c++-mode/__winmain.cpp (100%) rename modules/{feature => editor}/file-templates/templates/c-mode/__c (100%) rename modules/{feature => editor}/file-templates/templates/c-mode/__h (100%) rename modules/{feature => editor}/file-templates/templates/dockerfile-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/emacs-ert-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/emacs-lisp-mode/__doom-doctor (100%) rename modules/{feature => editor}/file-templates/templates/emacs-lisp-mode/__doom-module (100%) rename modules/{feature => editor}/file-templates/templates/emacs-lisp-mode/__doom-packages (100%) rename modules/{feature => editor}/file-templates/templates/emacs-lisp-mode/__doom-test (100%) rename modules/{feature => editor}/file-templates/templates/emacs-lisp-mode/__initfile (100%) rename modules/{feature => editor}/file-templates/templates/fish-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/gitignore-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/go-mode/__.go (100%) rename modules/{feature => editor}/file-templates/templates/go-mode/__main.go (100%) rename modules/{feature => editor}/file-templates/templates/java-mode/.yas-setup.el (100%) rename modules/{feature => editor}/file-templates/templates/java-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/java-mode/__main (100%) rename modules/{feature => editor}/file-templates/templates/js-mode/__gulpfile.js (100%) rename modules/{feature => editor}/file-templates/templates/js-mode/__webpack.config.js (100%) rename modules/{feature => editor}/file-templates/templates/json-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/json-mode/__bower.json (100%) rename modules/{feature => editor}/file-templates/templates/json-mode/__package.json (100%) rename modules/{feature => editor}/file-templates/templates/love-mode/__conf.lua (100%) rename modules/{feature => editor}/file-templates/templates/love-mode/__main.lua (100%) rename modules/{feature => editor}/file-templates/templates/makefile-gmake-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/makefile-gmake-mode/__cpp (100%) rename modules/{feature => editor}/file-templates/templates/markdown-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/markdown-mode/__jekyll-post (100%) rename modules/{feature => editor}/file-templates/templates/nose-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/org-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/org-mode/__contact.org (100%) rename modules/{feature => editor}/file-templates/templates/org-mode/__doom-readme (100%) rename modules/{feature => editor}/file-templates/templates/org-mode/__invoice.org (100%) rename modules/{feature => editor}/file-templates/templates/org-mode/__project.org (100%) rename modules/{feature => editor}/file-templates/templates/php-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/php-mode/__.class.php (100%) rename modules/{feature => editor}/file-templates/templates/python-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/python-mode/__setup.py (100%) rename modules/{feature => editor}/file-templates/templates/rspec-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/rspec-mode/__.rspec (100%) rename modules/{feature => editor}/file-templates/templates/rspec-mode/__helper (100%) rename modules/{feature => editor}/file-templates/templates/ruby-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/ruby-mode/__.gemspec (100%) rename modules/{feature => editor}/file-templates/templates/ruby-mode/__Gemfile (100%) rename modules/{feature => editor}/file-templates/templates/ruby-mode/__Rakefile (100%) rename modules/{feature => editor}/file-templates/templates/ruby-mode/__module (100%) rename modules/{feature => editor}/file-templates/templates/rust-mode/__Cargo.toml (100%) rename modules/{feature => editor}/file-templates/templates/rust-mode/__main.rs (100%) rename modules/{feature => editor}/file-templates/templates/scss-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/scss-mode/__master.scss (100%) rename modules/{feature => editor}/file-templates/templates/scss-mode/__normalize.scss (100%) rename modules/{feature => editor}/file-templates/templates/sh-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/sh-mode/__zunit (100%) rename modules/{feature => editor}/file-templates/templates/slim-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/snippet-mode/__ (100%) rename modules/{feature => editor}/file-templates/templates/solidity-mode/__sol (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license-apache (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license-apache-bp (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license-bsd2 (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license-bsd3 (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license-gpl3 (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license-gpl3-bp (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license-lgpl3 (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license-mit (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license-mozilla (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license-mozilla-bp (100%) rename modules/{feature => editor}/file-templates/templates/text-mode/__license-unlicense (100%) rename modules/{feature => editor}/file-templates/templates/web-mode/__.html (100%) rename modules/{feature => editor}/file-templates/templates/web-mode/__jekyll-layout.html (100%) rename modules/{feature => editor}/file-templates/templates/yaml-mode/__docker-compose.yml (100%) rename modules/{feature => editor}/snippets/README.org (96%) rename modules/{feature => editor}/snippets/autoload/evil.el (84%) rename modules/{feature => editor}/snippets/autoload/settings.el (85%) rename modules/{feature => editor}/snippets/autoload/snippets.el (98%) rename modules/{feature => editor}/snippets/config.el (95%) rename modules/{feature => editor}/snippets/packages.el (85%) rename modules/{feature => tools}/debugger/autoload/debug.el (77%) rename modules/{feature => tools}/debugger/autoload/evil.el (80%) rename modules/{feature => tools}/debugger/config.el (97%) rename modules/{feature => tools}/debugger/packages.el (60%) create mode 100644 modules/tools/editorconfig/autoload.el rename modules/{feature => tools}/eval/README.org (99%) rename modules/{feature => tools}/eval/autoload/eval.el (95%) rename modules/{feature => tools}/eval/autoload/evil.el (62%) rename modules/{feature => tools}/eval/autoload/repl.el (98%) rename modules/{feature => tools}/eval/autoload/settings.el (96%) rename modules/{feature => tools}/eval/config.el (95%) rename modules/{feature => tools}/eval/packages.el (64%) rename modules/{feature => tools}/lookup/README.org (98%) rename modules/{feature => tools}/lookup/autoload/docsets.el (98%) rename modules/{feature => tools}/lookup/autoload/evil.el (77%) rename modules/{feature => tools}/lookup/autoload/lookup.el (96%) rename modules/{feature => tools}/lookup/autoload/online.el (97%) rename modules/{feature => tools}/lookup/config.el (98%) rename modules/{feature => tools}/lookup/packages.el (94%) rename modules/{feature => ui}/workspaces/README.org (99%) rename modules/{feature => ui}/workspaces/autoload/evil.el (94%) rename modules/{feature => ui}/workspaces/autoload/workspaces.el (100%) rename modules/{feature => ui}/workspaces/config.el (99%) rename modules/{feature => ui}/workspaces/packages.el (61%) rename modules/{feature => ui}/workspaces/test/test-workspaces.el (98%) diff --git a/core/autoload/help.el b/core/autoload/help.el index feba3d080a9..6b792ed80c7 100644 --- a/core/autoload/help.el +++ b/core/autoload/help.el @@ -147,7 +147,7 @@ selection of all minor-modes, active or not." (defun doom/describe-module (category module) "Open the documentation of CATEGORY MODULE. -CATEGORY is a keyword and MODULE is a symbol. e.g. :feature and 'evil. +CATEGORY is a keyword and MODULE is a symbol. e.g. :editor and 'evil. Automatically selects a) the module at point (in private init files), b) the module derived from a `featurep!' or `require!' call, c) the module that the diff --git a/core/core-modules.el b/core/core-modules.el index 8fb3f5c7d28..763a1e6c671 100644 --- a/core/core-modules.el +++ b/core/core-modules.el @@ -17,21 +17,32 @@ (defconst doom-obsolete-modules '((:feature (version-control (:emacs vc) (:ui vc-gutter)) (spellcheck (:tools flyspell)) - (syntax-checker (:tools flycheck))) + (syntax-checker (:tools flycheck)) + (evil (:editor evil)) + (snippets (:editor snippets)) + (file-templates (:editor file-templates)) + (workspaces (:ui workspaces)) + (eval (:tools eval)) + (lookup (:tools lookup)) + (debugger (:tools debugger))) (:tools (rotate-text (:editor rotate-text))) (:emacs (electric-indent (:emacs electric)) (hideshow (:editor fold))) - (:ui (doom-modeline (:ui modeline))) - (:ui (fci (:ui fill-column))) - (:ui (evil-goggles (:ui ophints)))) - "An alist of deprecated modules, mapping deprecated modules to an optional new -location (which will create an alias). Each CAR and CDR is a (CATEGORY . -MODULES). E.g. + (:ui (doom-modeline (:ui modeline)) + (fci (:ui fill-column)) + (evil-goggles (:ui ophints)))) + "A tree alist that maps deprecated modules to their replacement(s). - ((:emacs . electric-indent) . (:emacs electric)) - ((:feature . version-control) (:emacs vc) (:ui . vc-gutter)) +Each entry is a three-level tree. For example: -A warning will be put out if these deprecated modules are used.") + (:feature (version-control (:emacs vc) (:ui vc-gutter)) + (spellcheck (:tools flyspell)) + (syntax-checker (:tools flycheck))) + +This marks :feature version-control, :feature spellcheck and :feature +syntax-checker modules obsolete. e.g. If :feature version-control is found in +your `doom!' block, a warning is emitted before replacing it with :emacs vc and +:ui vc-gutter.") (defvar doom--current-module nil) (defvar doom--current-flags nil) diff --git a/core/core-ui.el b/core/core-ui.el index d653e11400e..5e0a632ce6c 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -43,7 +43,7 @@ It is recommended you don't set specify a font-size, as to inherit `doom-font's size.") (defvar doom-unicode-font nil - "Fallback font for unicode glyphs. Is ignored if :feature unicode is active. + "Fallback font for unicode glyphs. Is ignored if :ui unicode is active. Expects either a `font-spec', font object, a XFT font string or XLFD string. See `doom-font' for examples. diff --git a/init.example.el b/init.example.el index f7977305ce7..f988d0174b8 100644 --- a/init.example.el +++ b/init.example.el @@ -8,17 +8,7 @@ ;; More information about these modules (and what flags they support) can be ;; found in modules/README.org. -(doom! :feature - ;;debugger ; FIXME stepping through code, to help you add bugs - eval ; run code, run (also, repls) - (evil +everywhere); come to the dark side, we have cookies - file-templates ; auto-snippets for empty files - (lookup ; helps you navigate your code and documentation - +docsets) ; ...or in Dash docsets locally - snippets ; my elves. They type so I don't have to - workspaces ; tab emulation, persistence & separate workspaces - - :completion +(doom! :completion company ; the ultimate code completion backend ;;helm ; the *other* search engine for love and life ;;ido ; the other *other* search engine... @@ -46,14 +36,18 @@ vc-gutter ; vcs diff in the fringe vi-tilde-fringe ; fringe tildes to mark beyond EOB window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces :editor + (evil +everywhere); come to the dark side, we have cookies + file-templates ; auto-snippets for empty files fold ; (nigh) universal code folding ;;(format +onsave) ; automated prettiness ;;lispy ; vim for lisp, for people who dont like vim multiple-cursors ; editing in many places at once ;;parinfer ; turn lisp into python, sort of rotate-text ; cycle region at point between text candidates + snippets ; my elves. They type so I don't have to :emacs (dired ; making dired pretty [functional] @@ -68,13 +62,17 @@ :tools ;;ansible + ;;debugger ; FIXME stepping through code, to help you add bugs ;;direnv ;;docker ;;editorconfig ; let someone else argue about tabs vs spaces ;;ein ; tame Jupyter notebooks with emacs + eval ; run code, run (also, repls) flycheck ; tasing you for every semicolon you forget ;;flyspell ; tasing you for misspelling mispelling ;;gist ; interacting with github gists + (lookup ; helps you navigate your code and documentation + +docsets) ; ...or in Dash docsets locally ;;lsp ;;macos ; MacOS-specific commands magit ; a git porcelain for Emacs diff --git a/modules/README.org b/modules/README.org index 5f404b2935b..4d4041383e1 100644 --- a/modules/README.org +++ b/modules/README.org @@ -1,7 +1,6 @@ #+TITLE: Doom Modules * Table of Contents :TOC:noexport: -- [[#feature][:feature]] - [[#completion][:completion]] - [[#ui][:ui]] - [[#editor][:editor]] @@ -12,19 +11,9 @@ - [[#collab][:collab]] - [[#config][:config]] -* :feature -Broad modules that bring essential IDE functionality to Emacs. - -+ debugger: A (nigh-)universal debugger in Emacs -+ [[file:feature/eval/README.org][eval]]: REPL & code evaluation support for a variety of languages -+ [[file:feature/evil/README.org][evil]] =+everywhere=: Vim in Emacs -+ [[file:feature/file-templates/README.org][file-templates]]: Auto-inserted templates in blank new files -+ [[file:feature/lookup/README.org][lookup]] =+docsets=: Universal jump-to & documentation lookup backend -+ [[file:feature/snippets/README.org][snippets]]: A templating system for Emacs for lazy typers (aka programmers) -+ [[file:feature/workspaces/README.org][workspaces]]: Isolated workspaces - * :completion -Swappable completion modules for quickly narrowing down lists of candidates. +Modules that provide new interfaces or frameworks for completion, including code +completion. + [[file:completion/company/README.org][company]] =+auto +childframe=: The ultimate code completion backend + helm =+fuzzy +childframe=: *Another* search engine for love and life @@ -53,19 +42,23 @@ Aesthetic modules that affect the Emacs interface or user experience. + vc-gutter: + vi-tilde-fringe: + [[file:ui/window-select/README.org][window-select]]: ++ [[file:ui/workspaces/README.org][workspaces]]: Isolated workspaces * :editor -Modules that affect and augment your ability to write and edit text. +Modules that affect and augment your ability to manipulate or insert text. ++ [[file:editor/evil/README.org][evil]] =+everywhere=: transforms Emacs into Vim ++ [[file:editor/file-templates/README.org][file-templates]]: Auto-inserted templates in blank new files + [[file:editor/fold/README.org][fold]]: universal code folding + [[file:editor/format/README.org][format]] =+onsave=: + [[file:editor/lispy/README.org][lispy]]: + multiple-cursors: + [[file:editor/parinfer/README.org][parinfer]]: + rotate-text: ++ [[file:editor/snippets/README.org][snippets]]: Snippet expansion for lazy typists * :emacs -Modules that reconfigure packages or features built into Emacs +Modules that reconfigure or augment packages or features built into Emacs. + dired =+ranger +icons=: + electric: @@ -78,12 +71,15 @@ Modules that reconfigure packages or features built into Emacs Small modules that give Emacs access to external tools & services. + ansible: ++ debugger: A (nigh-)universal debugger in Emacs + docker: + [[file:tools/editorconfig/README.org][editorconfig]]: + [[file:tools/ein/README.org][ein]]: ++ [[file:tools/eval/README.org][eval]]: REPL & code evaluation support for a variety of languages + flycheck: Live error/warning highlights + flyspell: Spell checking + gist: ++ [[file:tools/lookup/README.org][lookup]] =+docsets=: Universal jump-to & documentation lookup backend + [[file:tools/lsp/README.org][lsp]]: + macos: + magit: diff --git a/modules/app/calendar/autoload.el b/modules/app/calendar/autoload.el index 3aa68053d16..65cf2a3a67d 100644 --- a/modules/app/calendar/autoload.el +++ b/modules/app/calendar/autoload.el @@ -13,7 +13,7 @@ (defun =calendar () "Activate (or switch to) `calendar' in its workspace." (interactive) - (if (featurep! :feature workspaces) + (if (featurep! :ui workspaces) (progn (+workspace-switch "Calendar" t) (doom/switch-to-scratch-buffer) @@ -28,7 +28,7 @@ (defun +calendar/quit () "TODO" (interactive) - (if (featurep! :feature workspaces) + (if (featurep! :ui workspaces) (+workspace/delete "Calendar") (doom-kill-matching-buffers "^\\*cfw:") (set-window-configuration +calendar--wconf) diff --git a/modules/app/email/autoload/evil.el b/modules/app/email/autoload/evil.el index d7b64c9c683..be608bda3f4 100644 --- a/modules/app/email/autoload/evil.el +++ b/modules/app/email/autoload/evil.el @@ -1,5 +1,5 @@ ;; app/email/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;;###if (featurep! :editor evil) ;;;###autoload (defun +email/mark (&optional beg end) diff --git a/modules/app/irc/autoload/irc.el b/modules/app/irc/autoload/irc.el index 442f05b7790..51fb63adb51 100644 --- a/modules/app/irc/autoload/irc.el +++ b/modules/app/irc/autoload/irc.el @@ -20,7 +20,7 @@ If INHIBIT-WORKSPACE (the universal argument) is non-nil, don't spawn a new workspace for it." (interactive "P") - (cond ((and (featurep! :feature workspaces) + (cond ((and (featurep! :ui workspaces) (+workspace-exists-p +irc--workspace-name)) (+workspace-switch +irc--workspace-name)) ((not (+irc-setup-wconf inhibit-workspace)) diff --git a/modules/app/notmuch/autoload.el b/modules/app/notmuch/autoload.el index 67f4f5e0c26..340cd40ccfd 100644 --- a/modules/app/notmuch/autoload.el +++ b/modules/app/notmuch/autoload.el @@ -4,8 +4,8 @@ (defun =notmuch () "Activate (or switch to) `notmuch' in its workspace." (interactive) - (unless (featurep! :feature workspaces) - (user-error ":feature workspaces is required, but disabled")) + (unless (featurep! :ui workspaces) + (user-error ":ui workspaces is required, but disabled")) (condition-case-unless-debug e (progn (+workspace-switch "*MAIL*" t) diff --git a/modules/app/rss/config.el b/modules/app/rss/config.el index 59cadfc6c23..06a6e176dc3 100644 --- a/modules/app/rss/config.el +++ b/modules/app/rss/config.el @@ -57,7 +57,7 @@ easier to scroll through.") (define-key! elfeed-show-mode-map [remap next-buffer] #'+rss/next [remap previous-buffer] #'+rss/previous)) - (when (featurep! :feature evil +everywhere) + (when (featurep! :editor evil +everywhere) (evil-define-key 'normal elfeed-search-mode-map "q" #'elfeed-kill-buffer "r" #'elfeed-search-update--force diff --git a/modules/app/twitter/autoload.el b/modules/app/twitter/autoload.el index 274bd02fdb9..44ed04c1ed0 100644 --- a/modules/app/twitter/autoload.el +++ b/modules/app/twitter/autoload.el @@ -29,7 +29,7 @@ that works with the feature/popup module." (interactive "P") (condition-case _ (progn - (if (and (not arg) (featurep! :feature workspaces)) + (if (and (not arg) (featurep! :ui workspaces)) (+workspace/new +twitter-workspace-name) (setq +twitter--old-wconf (current-window-configuration)) (delete-other-windows) @@ -52,7 +52,7 @@ that works with the feature/popup module." (when (eq major-mode 'twittering-mode) (twittering-kill-buffer) (cond ((one-window-p) (+twitter/quit-all)) - ((featurep! :feature workspaces) + ((featurep! :ui workspaces) (+workspace/close-window-or-workspace)) ((delete-window))))) @@ -60,7 +60,7 @@ that works with the feature/popup module." (defun +twitter/quit-all () "Close all open `twitter-mode' buffers and the associated workspace, if any." (interactive) - (when (featurep! :feature workspaces) + (when (featurep! :ui workspaces) (+workspace/delete +twitter-workspace-name)) (when +twitter--old-wconf (set-window-configuration +twitter--old-wconf) diff --git a/modules/app/twitter/config.el b/modules/app/twitter/config.el index bf6680ecdfc..c01d1ec253f 100644 --- a/modules/app/twitter/config.el +++ b/modules/app/twitter/config.el @@ -64,7 +64,7 @@ [remap twittering-kill-buffer] #'+twitter/quit [remap delete-window] #'+twitter/quit [remap +workspace/close-window-or-workspace] #'+twitter/quit) - (when (featurep! :feature evil +everywhere) + (when (featurep! :editor evil +everywhere) (define-key! twittering-mode-map [remap evil-window-delete] #'+twitter/quit "f" #'twittering-favorite diff --git a/modules/completion/company/config.el b/modules/completion/company/config.el index ee673fb9130..55779bffa67 100644 --- a/modules/completion/company/config.el +++ b/modules/completion/company/config.el @@ -18,7 +18,7 @@ company-echo-metadata-frontend)) :config (add-hook 'company-mode-hook #'+company|init-backends) - (when (featurep! :feature evil) + (when (featurep! :editor evil) (add-hook 'company-mode-hook #'evil-normalize-keymaps)) (global-company-mode +1)) diff --git a/modules/completion/helm/autoload/evil.el b/modules/completion/helm/autoload/evil.el index a5cfa3a25bd..486a1a396f9 100644 --- a/modules/completion/helm/autoload/evil.el +++ b/modules/completion/helm/autoload/evil.el @@ -1,5 +1,5 @@ ;;; completion/helm/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;;###if (featurep! :editor evil) ;; ;; Project searching diff --git a/modules/completion/helm/autoload/helm.el b/modules/completion/helm/autoload/helm.el index d798b167cf8..f8d264a9356 100644 --- a/modules/completion/helm/autoload/helm.el +++ b/modules/completion/helm/autoload/helm.el @@ -24,8 +24,8 @@ "A version of `helm-buffers-list' with its buffer list restricted to the current workspace." (interactive) - (unless (featurep! :feature workspaces) - (user-error "This command requires the :feature workspaces module")) + (unless (featurep! :ui workspaces) + (user-error "This command requires the :ui workspaces module")) (with-no-warnings (with-persp-buffer-list nil (helm-buffers-list)))) @@ -34,8 +34,8 @@ current workspace." "A version of `helm-mini' with its buffer list restricted to the current workspace." (interactive) - (unless (featurep! :feature workspaces) - (user-error "This command requires the :feature workspaces module")) + (unless (featurep! :ui workspaces) + (user-error "This command requires the :ui workspaces module")) (with-no-warnings (with-persp-buffer-list nil (helm-mini)))) diff --git a/modules/completion/helm/config.el b/modules/completion/helm/config.el index 32441b5cc24..ae32ddb7ace 100644 --- a/modules/completion/helm/config.el +++ b/modules/completion/helm/config.el @@ -79,7 +79,7 @@ be negative.") ;; disable special behavior for left/right, M-left/right keys. helm-ff-lynx-style-map nil) - (when (featurep! :feature evil +everywhere) + (when (featurep! :editor evil +everywhere) (setq helm-default-prompt-display-function #'+helm--set-prompt-display)) :init diff --git a/modules/completion/ivy/autoload/evil.el b/modules/completion/ivy/autoload/evil.el index 28a83c11f49..e1aca910310 100644 --- a/modules/completion/ivy/autoload/evil.el +++ b/modules/completion/ivy/autoload/evil.el @@ -1,5 +1,5 @@ ;; completion/ivy/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;;###if (featurep! :editor evil) ;;;###autoload (autoload '+ivy:swiper "completion/ivy/autoload/evil" nil t) (evil-define-command +ivy:swiper (&optional search) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index 992b8aac2d4..078ddb3e8c8 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -276,7 +276,7 @@ immediately runs it on the current candidate (ending the ivy session)." ;; ;; Evil key fixes -(map! :when (featurep! :feature evil +everywhere) +(map! :when (featurep! :editor evil +everywhere) :after ivy :map (ivy-occur-mode-map ivy-occur-grep-mode-map) :m "j" #'ivy-occur-next-line diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index 201a5589010..badd288ad2a 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -105,7 +105,7 @@ (:prefix ("q" . "quit/restart") :desc "Quit Emacs" "q" #'kill-emacs :desc "Save and quit Emacs" "Q" #'save-buffers-kill-terminal - (:when (featurep! :feature workspaces) + (:when (featurep! :ui workspaces) :desc "Quit Emacs & forget session" "X" #'+workspace/kill-session-and-quit) :desc "Restart & restore Emacs" "r" #'doom/restart-and-restore :desc "Restart Emacs" "R" #'doom/restart) diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 6c909794475..53fc62fb155 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -19,7 +19,7 @@ ;; Smart tab :i [tab] (general-predicate-dispatch nil ; fall back to nearest keymap - (and (featurep! :feature snippets) + (and (featurep! :editor snippets) (bound-and-true-p yas-minor-mode) (yas-maybe-expand-abbrev-key-filter 'yas-expand)) 'yas-expand @@ -165,90 +165,6 @@ ;; ;;; Module keybinds -;;; :feature -(map! (:when (featurep! :feature debugger) - :after realgud - :map realgud:shortkey-mode-map - :n "j" #'evil-next-line - :n "k" #'evil-previous-line - :n "h" #'evil-backward-char - :n "l" #'evil-forward-char - :n "c" #'realgud:cmd-continue - :m "n" #'realgud:cmd-next - :m "b" #'realgud:cmd-break - :m "B" #'realgud:cmd-clear) - - (:when (featurep! :feature eval) - :g "M-r" #'+eval/buffer - :nv "gr" #'+eval:region - :n "gR" #'+eval/buffer - :v "gR" #'+eval:replace-region) - - (:when (featurep! :feature lookup) - :nv "K" #'+lookup/documentation - :nv "gd" #'+lookup/definition - :nv "gD" #'+lookup/references - :nv "gf" #'+lookup/file) - - (:when (featurep! :feature snippets) - ;; auto-yasnippet - :i [C-tab] #'aya-expand - :nv [C-tab] #'aya-create - ;; yasnippet - (:after yasnippet - (:map yas-keymap - "C-e" #'+snippets/goto-end-of-field - "C-a" #'+snippets/goto-start-of-field - [M-right] #'+snippets/goto-end-of-field - [M-left] #'+snippets/goto-start-of-field - [M-backspace] #'+snippets/delete-to-start-of-field - [backspace] #'+snippets/delete-backward-char - [delete] #'+snippets/delete-forward-char-or-field))) - - (:when (featurep! :tools flyspell) - ;; Keybinds that have no Emacs+evil analogues (i.e. don't exist): - ;; zq - mark word at point as good word - ;; zw - mark word at point as bad - ;; zu{q,w} - undo last marking - ;; Keybinds that evil define: - ;; z= - correct flyspell word at point - ;; ]s - jump to previous spelling error - ;; [s - jump to next spelling error - (:map flyspell-mouse-map - "RET" #'flyspell-correct-word-generic - [return] #'flyspell-correct-word-generic - [mouse-1] #'flyspell-correct-word-generic)) - - (:when (featurep! :tools flycheck) - :m "]e" #'next-error - :m "[e" #'previous-error - (:after flycheck - :map flycheck-error-list-mode-map - :n "C-n" #'flycheck-error-list-next-error - :n "C-p" #'flycheck-error-list-previous-error - :n "j" #'flycheck-error-list-next-error - :n "k" #'flycheck-error-list-previous-error - :n "RET" #'flycheck-error-list-goto-error - :n [return] #'flycheck-error-list-goto-error)) - - (:when (featurep! :feature workspaces) - :n "gt" #'+workspace/switch-right - :n "gT" #'+workspace/switch-left - :n "]w" #'+workspace/switch-right - :n "[w" #'+workspace/switch-left - :g "M-1" (λ! (+workspace/switch-to 0)) - :g "M-2" (λ! (+workspace/switch-to 1)) - :g "M-3" (λ! (+workspace/switch-to 2)) - :g "M-4" (λ! (+workspace/switch-to 3)) - :g "M-5" (λ! (+workspace/switch-to 4)) - :g "M-6" (λ! (+workspace/switch-to 5)) - :g "M-7" (λ! (+workspace/switch-to 6)) - :g "M-8" (λ! (+workspace/switch-to 7)) - :g "M-9" (λ! (+workspace/switch-to 8)) - :g "M-0" #'+workspace/switch-to-last - :g "M-t" #'+workspace/new - :g "M-T" #'+workspace/display)) - ;;; :completion (map! (:when (featurep! :completion company) :i "C-@" #'+company/complete @@ -400,7 +316,25 @@ (:when (featurep! :ui vc-gutter) :m "]d" #'git-gutter:next-hunk - :m "[d" #'git-gutter:previous-hunk)) + :m "[d" #'git-gutter:previous-hunk) + + (:when (featurep! :ui workspaces) + :n "gt" #'+workspace/switch-right + :n "gT" #'+workspace/switch-left + :n "]w" #'+workspace/switch-right + :n "[w" #'+workspace/switch-left + :g "M-1" (λ! (+workspace/switch-to 0)) + :g "M-2" (λ! (+workspace/switch-to 1)) + :g "M-3" (λ! (+workspace/switch-to 2)) + :g "M-4" (λ! (+workspace/switch-to 3)) + :g "M-5" (λ! (+workspace/switch-to 4)) + :g "M-6" (λ! (+workspace/switch-to 5)) + :g "M-7" (λ! (+workspace/switch-to 6)) + :g "M-8" (λ! (+workspace/switch-to 7)) + :g "M-9" (λ! (+workspace/switch-to 8)) + :g "M-0" #'+workspace/switch-to-last + :g "M-t" #'+workspace/new + :g "M-T" #'+workspace/display)) ;;; :editor (map! (:when (featurep! :editor fold) @@ -449,7 +383,22 @@ "C-p" #'evil-multiedit-prev))) (:when (featurep! :editor rotate-text) - :n "!" #'rotate-text)) + :n "!" #'rotate-text) + + (:when (featurep! :editor snippets) + ;; auto-yasnippet + :i [C-tab] #'aya-expand + :nv [C-tab] #'aya-create + ;; yasnippet + (:after yasnippet + (:map yas-keymap + "C-e" #'+snippets/goto-end-of-field + "C-a" #'+snippets/goto-start-of-field + [M-right] #'+snippets/goto-end-of-field + [M-left] #'+snippets/goto-start-of-field + [M-backspace] #'+snippets/delete-to-start-of-field + [backspace] #'+snippets/delete-backward-char + [delete] #'+snippets/delete-forward-char-or-field)))) ;;; :emacs (map! (:when (featurep! :emacs vc) @@ -463,14 +412,49 @@ :n "gb" #'git-timemachine-blame)) ;;; :tools -(map! (:when (featurep! :tools magit) - (:after evil-magit - ;; fix conflicts with private bindings - :map (magit-status-mode-map magit-revision-mode-map) - "C-j" nil - "C-k" nil) - (:map transient-map - "q" #'transient-quit-one)) +(map! (:when (featurep! :tools debugger) + :after realgud + :map realgud:shortkey-mode-map + :n "j" #'evil-next-line + :n "k" #'evil-previous-line + :n "h" #'evil-backward-char + :n "l" #'evil-forward-char + :n "c" #'realgud:cmd-continue + :m "n" #'realgud:cmd-next + :m "b" #'realgud:cmd-break + :m "B" #'realgud:cmd-clear) + + (:when (featurep! :tools eval) + :g "M-r" #'+eval/buffer + :nv "gr" #'+eval:region + :n "gR" #'+eval/buffer + :v "gR" #'+eval:replace-region) + + (:when (featurep! :tools flyspell) + ;; Keybinds that have no Emacs+evil analogues (i.e. don't exist): + ;; zq - mark word at point as good word + ;; zw - mark word at point as bad + ;; zu{q,w} - undo last marking + ;; Keybinds that evil define: + ;; z= - correct flyspell word at point + ;; ]s - jump to previous spelling error + ;; [s - jump to next spelling error + (:map flyspell-mouse-map + "RET" #'flyspell-correct-word-generic + [return] #'flyspell-correct-word-generic + [mouse-1] #'flyspell-correct-word-generic)) + + (:when (featurep! :tools flycheck) + :m "]e" #'next-error + :m "[e" #'previous-error + (:after flycheck + :map flycheck-error-list-mode-map + :n "C-n" #'flycheck-error-list-next-error + :n "C-p" #'flycheck-error-list-previous-error + :n "j" #'flycheck-error-list-next-error + :n "k" #'flycheck-error-list-previous-error + :n "RET" #'flycheck-error-list-goto-error + :n [return] #'flycheck-error-list-goto-error)) (:when (featurep! :tools gist) :after gist @@ -484,7 +468,22 @@ :n "q" #'kill-this-buffer :n "s" #'gist-star :n "S" #'gist-unstar - :n "y" #'gist-print-current-url)) + :n "y" #'gist-print-current-url) + + (:when (featurep! :tools lookup) + :nv "K" #'+lookup/documentation + :nv "gd" #'+lookup/definition + :nv "gD" #'+lookup/references + :nv "gf" #'+lookup/file) + + (:when (featurep! :tools magit) + (:after evil-magit + ;; fix conflicts with private bindings + :map (magit-status-mode-map magit-revision-mode-map) + "C-j" nil + "C-k" nil) + (:map transient-map + "q" #'transient-quit-one))) ;;; :lang (map! (:when (featurep! :lang markdown) @@ -512,7 +511,7 @@ :desc "Find file" "." #'find-file :desc "Switch buffer" "," #'switch-to-buffer - (:when (featurep! :feature workspaces) + (:when (featurep! :ui workspaces) :desc "Switch workspace buffer" "," #'persp-switch-to-buffer :desc "Switch buffer" "<" #'switch-to-buffer) @@ -536,7 +535,7 @@ :desc "Look up online" "o" #'+lookup/online-select :desc "Search project" "p" #'+default/search-project) - (:when (featurep! :feature workspaces) + (:when (featurep! :ui workspaces) (:prefix ("TAB" . "workspace") :desc "Display tab bar" "TAB" #'+workspace/display :desc "Switch workspace" "." #'+workspace/switch-to @@ -564,10 +563,10 @@ :desc "Toggle narrowing" "-" #'doom/clone-and-narrow-buffer :desc "Previous buffer" "[" #'previous-buffer :desc "Next buffer" "]" #'next-buffer - (:when (featurep! :feature workspaces) + (:when (featurep! :ui workspaces) :desc "Switch workspace buffer" "b" #'persp-switch-to-buffer :desc "Switch buffer" "B" #'switch-to-buffer) - (:unless (featurep! :feature workspaces) + (:unless (featurep! :ui workspaces) :desc "Switch buffer" "b" #'switch-to-buffer) :desc "Kill buffer" "k" #'kill-this-buffer :desc "Next buffer" "n" #'next-buffer @@ -763,7 +762,7 @@ :desc "Browse remote files" "." #'ssh-deploy-browse-remote-handler :desc "Detect remote changes" ">" #'ssh-deploy-remote-changes-handler)) - (:when (featurep! :feature snippets) + (:when (featurep! :editor snippets) (:prefix ("s" . "snippets") :desc "New snippet" "n" #'yas-new-snippet :desc "Insert snippet" "i" #'yas-insert-snippet @@ -835,7 +834,7 @@ To change these keys see `+default-repeat-keys'." ;; ;;; Universal evil integration -(when (featurep! :feature evil +everywhere) +(when (featurep! :editor evil +everywhere) ;; Have C-u behave similarly to `doom/backward-to-bol-or-indent'. ;; NOTE SPC u replaces C-u as the universal argument. (map! :gi "C-u" #'doom/backward-kill-to-bol-and-indent diff --git a/modules/config/default/README.org b/modules/config/default/README.org index aa282ffb097..6256a39709c 100644 --- a/modules/config/default/README.org +++ b/modules/config/default/README.org @@ -43,7 +43,7 @@ Don't want to use provided one? Then add this to your private module, #+END_SRC ** I'm not an evil user... -That's fine. All evil configuration is ignored if =:feature evil= is disabled. +That's fine. All evil configuration is ignored if =:editor evil= is disabled. * Appendix ** Commands diff --git a/modules/config/default/packages.el b/modules/config/default/packages.el index 54cfa79b15c..1aabc86101d 100644 --- a/modules/config/default/packages.el +++ b/modules/config/default/packages.el @@ -1,6 +1,6 @@ ;; -*- no-byte-compile: t; -*- ;;; config/default/packages.el -(unless (featurep! :feature evil) +(unless (featurep! :editor evil) (package! winum) (package! expand-region)) diff --git a/modules/feature/evil/+commands.el b/modules/editor/evil/+commands.el similarity index 99% rename from modules/feature/evil/+commands.el rename to modules/editor/evil/+commands.el index 82dedee36e6..555c4fa0ba7 100644 --- a/modules/feature/evil/+commands.el +++ b/modules/editor/evil/+commands.el @@ -1,4 +1,4 @@ -;;; feature/evil/+commands.el -*- lexical-binding: t; -*- +;;; editor/evil/+commands.el -*- lexical-binding: t; -*- (evil-define-operator +evil:open-scratch-buffer (bang) (interactive "") diff --git a/modules/feature/evil/+everywhere.el b/modules/editor/evil/+everywhere.el similarity index 98% rename from modules/feature/evil/+everywhere.el rename to modules/editor/evil/+everywhere.el index 71c2e09e2b6..18acea36ee6 100644 --- a/modules/feature/evil/+everywhere.el +++ b/modules/editor/evil/+everywhere.el @@ -1,4 +1,4 @@ -;;; feature/evil/+everywhere.el -*- lexical-binding: t; -*- +;;; editor/evil/+everywhere.el -*- lexical-binding: t; -*- ;; We load evil-collection ourselves for these reasons: ;; diff --git a/modules/feature/evil/README.org b/modules/editor/evil/README.org similarity index 98% rename from modules/feature/evil/README.org rename to modules/editor/evil/README.org index 0998398c018..0d936443357 100644 --- a/modules/feature/evil/README.org +++ b/modules/editor/evil/README.org @@ -137,7 +137,7 @@ And these are text objects added by this module: ** Removing evil-mode You must do two things to remove Evil: -1. Remove =:feature evil= from =~/.doom.d/init.el=, +1. Remove =:editor evil= from =~/.doom.d/init.el=, 2. Run ~doom refresh~ to clean up lingering dependencies and refresh yuor autoloads files. 3. [OPTIONAL] You may want to assign new values to ~doom-leader-alt-key~ and @@ -149,7 +149,7 @@ non-evil sessions. #+end_quote Evil-specific configuration and keybindings (defined with ~map!~) will be -ignored without =:feature evil= present (and omitted when byte-compiling). +ignored without =:editor evil= present (and omitted when byte-compiling). Keep in mind that, at the time of this writing, Doom was designed by a vimmer, for vimmers. Little consideration has been put into designing a keybind scheme diff --git a/modules/feature/evil/autoload/advice.el b/modules/editor/evil/autoload/advice.el similarity index 97% rename from modules/feature/evil/autoload/advice.el rename to modules/editor/evil/autoload/advice.el index ee16df71dd2..5c74d90a2b5 100644 --- a/modules/feature/evil/autoload/advice.el +++ b/modules/editor/evil/autoload/advice.el @@ -1,4 +1,4 @@ -;;; feature/evil/autoload/advice.el -*- lexical-binding: t; -*- +;;; editor/evil/autoload/advice.el -*- lexical-binding: t; -*- (defun +evil--insert-newline (&optional above _noextranewline) (let ((pos (save-excursion (beginning-of-line-text) (point))) @@ -148,7 +148,7 @@ more information on modifiers." path file-name t t 1)))) (replace-regexp-in-string regexp "\\1" file-name t))) -;;;###autoload (autoload '+evil*window-split "feature/evil/autoload/advice" nil t) +;;;###autoload (autoload '+evil*window-split "editor/evil/autoload/advice" nil t) (evil-define-command +evil*window-split (&optional count file) "Same as `evil-window-split', but focuses (and recenters) the new split." :repeat nil @@ -164,7 +164,7 @@ more information on modifiers." (balance-windows (window-parent))) (if file (evil-edit file))) -;;;###autoload (autoload '+evil*window-vsplit "feature/evil/autoload/advice" nil t) +;;;###autoload (autoload '+evil*window-vsplit "editor/evil/autoload/advice" nil t) (evil-define-command +evil*window-vsplit (&optional count file) "Same as `evil-window-vsplit', but focuses (and recenters) the new split." :repeat nil diff --git a/modules/feature/evil/autoload/embrace.el b/modules/editor/evil/autoload/embrace.el similarity index 94% rename from modules/feature/evil/autoload/embrace.el rename to modules/editor/evil/autoload/embrace.el index 82737b825fd..4ed3fb2f6f6 100644 --- a/modules/feature/evil/autoload/embrace.el +++ b/modules/editor/evil/autoload/embrace.el @@ -1,4 +1,4 @@ -;;; feature/evil/autoload/embrace.el -*- lexical-binding: t; -*- +;;; editor/evil/autoload/embrace.el -*- lexical-binding: t; -*- ;;;###autoload (defun +evil--embrace-get-pair (char) diff --git a/modules/feature/evil/autoload/evil.el b/modules/editor/evil/autoload/evil.el similarity index 94% rename from modules/feature/evil/autoload/evil.el rename to modules/editor/evil/autoload/evil.el index cac9a022e0c..7e44de4d067 100644 --- a/modules/feature/evil/autoload/evil.el +++ b/modules/editor/evil/autoload/evil.el @@ -1,5 +1,5 @@ -;; feature/evil/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;; editor/evil/autoload/evil.el -*- lexical-binding: t; -*- +;;;###if (featurep! :editor evil) ;;;###autodef (defun set-evil-initial-state! (modes state) @@ -113,7 +113,7 @@ integration." ;; ;;; Evil commands/operators -;;;###autoload (autoload '+evil:apply-macro "feature/evil/autoload/evil" nil t) +;;;###autoload (autoload '+evil:apply-macro "editor/evil/autoload/evil" nil t) (evil-define-operator +evil:apply-macro (beg end) "Apply macro to each line." :move-point nil @@ -139,14 +139,14 @@ integration." (apply-macro-to-region-lines beg end macro) (message "Applied macro in %c register %d times...DONE" register lines))))) -;;;###autoload (autoload '+evil:retab "feature/evil/autoload/evil" nil t) +;;;###autoload (autoload '+evil:retab "editor/evil/autoload/evil" nil t) (evil-define-operator +evil:retab (&optional beg end) "Wrapper around `doom/retab'." :motion nil :move-point nil :type line (interactive "") (doom/retab beg end)) -;;;###autoload (autoload '+evil:narrow-buffer "feature/evil/autoload/evil" nil t) +;;;###autoload (autoload '+evil:narrow-buffer "editor/evil/autoload/evil" nil t) (evil-define-operator +evil:narrow-buffer (beg end &optional bang) "Wrapper around `doom/clone-and-narrow-buffer'." :move-point nil @@ -219,7 +219,7 @@ integration." (let ((result (car-safe (evil-delimited-arguments arg 2)))) (+evil--ex-buffer-match result hl-name nil (point-min) (point-max)))))) -;;;###autoload (autoload '+evil:align "feature/evil/autoload/evil" nil t) +;;;###autoload (autoload '+evil:align "editor/evil/autoload/evil" nil t) (evil-define-operator +evil:align (beg end pattern &optional bang) "Ex interface to `align-regexp'. PATTERN is a vim-style regexp. If BANG, repeat the alignment for all matches (otherwise just the first match on each @@ -230,7 +230,7 @@ line)." (concat "\\(\\s-*\\)" (evil-transform-vim-style-regexp pattern)) 1 1 bang)) -;;;###autoload (autoload '+evil:align-right "feature/evil/autoload/evil" nil t) +;;;###autoload (autoload '+evil:align-right "editor/evil/autoload/evil" nil t) (evil-define-operator +evil:align-right (beg end pattern &optional bang) "Like `+evil:align', except alignments are right-justified. PATTERN is a vim-style regexp. If BANG, repeat the alignment for all matches (otherwise just @@ -245,7 +245,7 @@ the first match on each line)." ;; ;;; wgrep -;;;###autoload (autoload '+evil-delete "feature/evil/autoload/evil" nil t) +;;;###autoload (autoload '+evil-delete "editor/evil/autoload/evil" nil t) (evil-define-operator +evil-delete (beg end type register yank-handler) "A wrapper around `evil-delete' for `wgrep' buffers that will invoke `wgrep-mark-deletion' on lines you try to delete." diff --git a/modules/feature/evil/autoload/files.el b/modules/editor/evil/autoload/files.el similarity index 80% rename from modules/feature/evil/autoload/files.el rename to modules/editor/evil/autoload/files.el index d94705021c0..ec871ede78a 100644 --- a/modules/feature/evil/autoload/files.el +++ b/modules/editor/evil/autoload/files.el @@ -1,6 +1,6 @@ -;;; feature/evil/autoload/files.el -*- lexical-binding: t; -*- +;;; editor/evil/autoload/files.el -*- lexical-binding: t; -*- -;;;###autoload (autoload '+evil:delete-this-file "feature/evil/autoload/files" nil t) +;;;###autoload (autoload '+evil:delete-this-file "editor/evil/autoload/files" nil t) (evil-define-command +evil:delete-this-file (&optional filename force-p) "Delete FILENAME (defaults to the file associated with current buffer) and kills the buffer. If FORCE-P, force the deletion (don't ask for confirmation)." @@ -9,7 +9,7 @@ kills the buffer. If FORCE-P, force the deletion (don't ask for confirmation)." (doom/delete-this-file (or filename (file-truename buffer-file-name)) force-p)) -;;;###autoload (autoload '+evil:move-this-file "feature/evil/autoload/files" nil t) +;;;###autoload (autoload '+evil:move-this-file "editor/evil/autoload/files" nil t) (evil-define-command +evil:move-this-file (new-path &optional force-p) "Move current buffer's file to NEW-PATH. Replaces %, # and other vim-esque filename modifiers (see `+evil*ex-replace-special-filenames'). If FORCE-P, @@ -20,7 +20,7 @@ overwrite the destination file if it exists, without confirmation." (user-error "No new path was specified")) (doom/move-this-file new-path force-p)) -;;;###autoload (autoload '+evil:copy-this-file "feature/evil/autoload/files" nil nil) +;;;###autoload (autoload '+evil:copy-this-file "editor/evil/autoload/files" nil nil) (evil-define-command +evil:copy-this-file (new-path &optional force-p) "Copy current buffer's file to NEW-PATH. Replaces %, # and other vim-esque filename modifiers (see `+evil*ex-replace-special-filenames'). If FORCE-P, diff --git a/modules/feature/evil/config.el b/modules/editor/evil/config.el similarity index 99% rename from modules/feature/evil/config.el rename to modules/editor/evil/config.el index aaa0a9e4950..5e85f6f2e78 100644 --- a/modules/feature/evil/config.el +++ b/modules/editor/evil/config.el @@ -1,4 +1,4 @@ -;;; feature/evil/config.el -*- lexical-binding: t; -*- +;;; editor/evil/config.el -*- lexical-binding: t; -*- ;; I'm a vimmer at heart. Its modal philosophy suits me better, and this module ;; strives to make Emacs a much better vim than vim was. diff --git a/modules/feature/evil/packages.el b/modules/editor/evil/packages.el similarity index 96% rename from modules/feature/evil/packages.el rename to modules/editor/evil/packages.el index 0503783060e..e0125558e6c 100644 --- a/modules/feature/evil/packages.el +++ b/modules/editor/evil/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- -;;; feature/evil/packages.el +;;; editor/evil/packages.el (package! evil) (package! evil-args) diff --git a/modules/feature/evil/test/test-evil.el b/modules/editor/evil/test/test-evil.el similarity index 98% rename from modules/feature/evil/test/test-evil.el rename to modules/editor/evil/test/test-evil.el index 41fe1b3a9e0..40aedb594b4 100644 --- a/modules/feature/evil/test/test-evil.el +++ b/modules/editor/evil/test/test-evil.el @@ -1,10 +1,10 @@ ;; -*- no-byte-compile: t; -*- -;;; feature/evil/test/test-evil.el +;;; editor/evil/test/test-evil.el (describe "feature/evil" :var (resv project-root) (before-all - (require! :feature evil) + (require! :editor evil) (require 'evil) (load! "../autoload/evil")) (after-all diff --git a/modules/feature/file-templates/README.org b/modules/editor/file-templates/README.org similarity index 98% rename from modules/feature/file-templates/README.org rename to modules/editor/file-templates/README.org index 8e47464eb91..519c0ee4772 100644 --- a/modules/feature/file-templates/README.org +++ b/modules/editor/file-templates/README.org @@ -1,4 +1,4 @@ -#+TITLE: feature/file-templates +#+TITLE: editor/file-templates #+DATE: February 11, 2017 #+SINCE: v2.0 #+STARTUP: inlineimages diff --git a/modules/feature/file-templates/autoload.el b/modules/editor/file-templates/autoload.el similarity index 98% rename from modules/feature/file-templates/autoload.el rename to modules/editor/file-templates/autoload.el index 4bcd8a1ad22..489b8f777ee 100644 --- a/modules/feature/file-templates/autoload.el +++ b/modules/editor/file-templates/autoload.el @@ -1,4 +1,4 @@ -;;; feature/file-templates/autoload.el -*- lexical-binding: t; -*- +;;; editor/file-templates/autoload.el -*- lexical-binding: t; -*- (defun +file-templates--set (pred plist) (if (null (car-safe plist)) diff --git a/modules/feature/file-templates/config.el b/modules/editor/file-templates/config.el similarity index 98% rename from modules/feature/file-templates/config.el rename to modules/editor/file-templates/config.el index f058d6c9c3d..47fc04127f8 100644 --- a/modules/feature/file-templates/config.el +++ b/modules/editor/file-templates/config.el @@ -1,4 +1,4 @@ -;;; feature/file-templates/config.el -*- lexical-binding: t; -*- +;;; editor/file-templates/config.el -*- lexical-binding: t; -*- (defvar +file-templates-dir (expand-file-name "templates/" (file-name-directory load-file-name)) @@ -122,7 +122,7 @@ must be non-read-only, empty, and there must be a rule in ;; Bootstrap (after! yasnippet - (if (featurep! :feature snippets) + (if (featurep! :editor snippets) (add-to-list 'yas-snippet-dirs '+file-templates-dir 'append #'eq) (setq yas-prompt-functions (delq #'yas-dropdown-prompt yas-prompt-functions) yas-snippet-dirs '(+file-templates-dir)) diff --git a/modules/feature/file-templates/packages.el b/modules/editor/file-templates/packages.el similarity index 58% rename from modules/feature/file-templates/packages.el rename to modules/editor/file-templates/packages.el index 0c62823abe0..7a059ca3d21 100644 --- a/modules/feature/file-templates/packages.el +++ b/modules/editor/file-templates/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- -;;; feature/file-templates/packages.el +;;; editor/file-templates/packages.el (package! yasnippet) diff --git a/modules/feature/file-templates/templates/.editorconfig b/modules/editor/file-templates/templates/.editorconfig similarity index 100% rename from modules/feature/file-templates/templates/.editorconfig rename to modules/editor/file-templates/templates/.editorconfig diff --git a/modules/feature/file-templates/templates/android-mode/__build.gradle b/modules/editor/file-templates/templates/android-mode/__build.gradle similarity index 100% rename from modules/feature/file-templates/templates/android-mode/__build.gradle rename to modules/editor/file-templates/templates/android-mode/__build.gradle diff --git a/modules/feature/file-templates/templates/c++-mode/__cpp b/modules/editor/file-templates/templates/c++-mode/__cpp similarity index 100% rename from modules/feature/file-templates/templates/c++-mode/__cpp rename to modules/editor/file-templates/templates/c++-mode/__cpp diff --git a/modules/feature/file-templates/templates/c++-mode/__hpp b/modules/editor/file-templates/templates/c++-mode/__hpp similarity index 100% rename from modules/feature/file-templates/templates/c++-mode/__hpp rename to modules/editor/file-templates/templates/c++-mode/__hpp diff --git a/modules/feature/file-templates/templates/c++-mode/__main.cpp b/modules/editor/file-templates/templates/c++-mode/__main.cpp similarity index 100% rename from modules/feature/file-templates/templates/c++-mode/__main.cpp rename to modules/editor/file-templates/templates/c++-mode/__main.cpp diff --git a/modules/feature/file-templates/templates/c++-mode/__winmain.cpp b/modules/editor/file-templates/templates/c++-mode/__winmain.cpp similarity index 100% rename from modules/feature/file-templates/templates/c++-mode/__winmain.cpp rename to modules/editor/file-templates/templates/c++-mode/__winmain.cpp diff --git a/modules/feature/file-templates/templates/c-mode/__c b/modules/editor/file-templates/templates/c-mode/__c similarity index 100% rename from modules/feature/file-templates/templates/c-mode/__c rename to modules/editor/file-templates/templates/c-mode/__c diff --git a/modules/feature/file-templates/templates/c-mode/__h b/modules/editor/file-templates/templates/c-mode/__h similarity index 100% rename from modules/feature/file-templates/templates/c-mode/__h rename to modules/editor/file-templates/templates/c-mode/__h diff --git a/modules/feature/file-templates/templates/dockerfile-mode/__ b/modules/editor/file-templates/templates/dockerfile-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/dockerfile-mode/__ rename to modules/editor/file-templates/templates/dockerfile-mode/__ diff --git a/modules/feature/file-templates/templates/emacs-ert-mode/__ b/modules/editor/file-templates/templates/emacs-ert-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/emacs-ert-mode/__ rename to modules/editor/file-templates/templates/emacs-ert-mode/__ diff --git a/modules/feature/file-templates/templates/emacs-lisp-mode/__doom-doctor b/modules/editor/file-templates/templates/emacs-lisp-mode/__doom-doctor similarity index 100% rename from modules/feature/file-templates/templates/emacs-lisp-mode/__doom-doctor rename to modules/editor/file-templates/templates/emacs-lisp-mode/__doom-doctor diff --git a/modules/feature/file-templates/templates/emacs-lisp-mode/__doom-module b/modules/editor/file-templates/templates/emacs-lisp-mode/__doom-module similarity index 100% rename from modules/feature/file-templates/templates/emacs-lisp-mode/__doom-module rename to modules/editor/file-templates/templates/emacs-lisp-mode/__doom-module diff --git a/modules/feature/file-templates/templates/emacs-lisp-mode/__doom-packages b/modules/editor/file-templates/templates/emacs-lisp-mode/__doom-packages similarity index 100% rename from modules/feature/file-templates/templates/emacs-lisp-mode/__doom-packages rename to modules/editor/file-templates/templates/emacs-lisp-mode/__doom-packages diff --git a/modules/feature/file-templates/templates/emacs-lisp-mode/__doom-test b/modules/editor/file-templates/templates/emacs-lisp-mode/__doom-test similarity index 100% rename from modules/feature/file-templates/templates/emacs-lisp-mode/__doom-test rename to modules/editor/file-templates/templates/emacs-lisp-mode/__doom-test diff --git a/modules/feature/file-templates/templates/emacs-lisp-mode/__initfile b/modules/editor/file-templates/templates/emacs-lisp-mode/__initfile similarity index 100% rename from modules/feature/file-templates/templates/emacs-lisp-mode/__initfile rename to modules/editor/file-templates/templates/emacs-lisp-mode/__initfile diff --git a/modules/feature/file-templates/templates/fish-mode/__ b/modules/editor/file-templates/templates/fish-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/fish-mode/__ rename to modules/editor/file-templates/templates/fish-mode/__ diff --git a/modules/feature/file-templates/templates/gitignore-mode/__ b/modules/editor/file-templates/templates/gitignore-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/gitignore-mode/__ rename to modules/editor/file-templates/templates/gitignore-mode/__ diff --git a/modules/feature/file-templates/templates/go-mode/__.go b/modules/editor/file-templates/templates/go-mode/__.go similarity index 100% rename from modules/feature/file-templates/templates/go-mode/__.go rename to modules/editor/file-templates/templates/go-mode/__.go diff --git a/modules/feature/file-templates/templates/go-mode/__main.go b/modules/editor/file-templates/templates/go-mode/__main.go similarity index 100% rename from modules/feature/file-templates/templates/go-mode/__main.go rename to modules/editor/file-templates/templates/go-mode/__main.go diff --git a/modules/feature/file-templates/templates/java-mode/.yas-setup.el b/modules/editor/file-templates/templates/java-mode/.yas-setup.el similarity index 100% rename from modules/feature/file-templates/templates/java-mode/.yas-setup.el rename to modules/editor/file-templates/templates/java-mode/.yas-setup.el diff --git a/modules/feature/file-templates/templates/java-mode/__ b/modules/editor/file-templates/templates/java-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/java-mode/__ rename to modules/editor/file-templates/templates/java-mode/__ diff --git a/modules/feature/file-templates/templates/java-mode/__main b/modules/editor/file-templates/templates/java-mode/__main similarity index 100% rename from modules/feature/file-templates/templates/java-mode/__main rename to modules/editor/file-templates/templates/java-mode/__main diff --git a/modules/feature/file-templates/templates/js-mode/__gulpfile.js b/modules/editor/file-templates/templates/js-mode/__gulpfile.js similarity index 100% rename from modules/feature/file-templates/templates/js-mode/__gulpfile.js rename to modules/editor/file-templates/templates/js-mode/__gulpfile.js diff --git a/modules/feature/file-templates/templates/js-mode/__webpack.config.js b/modules/editor/file-templates/templates/js-mode/__webpack.config.js similarity index 100% rename from modules/feature/file-templates/templates/js-mode/__webpack.config.js rename to modules/editor/file-templates/templates/js-mode/__webpack.config.js diff --git a/modules/feature/file-templates/templates/json-mode/__ b/modules/editor/file-templates/templates/json-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/json-mode/__ rename to modules/editor/file-templates/templates/json-mode/__ diff --git a/modules/feature/file-templates/templates/json-mode/__bower.json b/modules/editor/file-templates/templates/json-mode/__bower.json similarity index 100% rename from modules/feature/file-templates/templates/json-mode/__bower.json rename to modules/editor/file-templates/templates/json-mode/__bower.json diff --git a/modules/feature/file-templates/templates/json-mode/__package.json b/modules/editor/file-templates/templates/json-mode/__package.json similarity index 100% rename from modules/feature/file-templates/templates/json-mode/__package.json rename to modules/editor/file-templates/templates/json-mode/__package.json diff --git a/modules/feature/file-templates/templates/love-mode/__conf.lua b/modules/editor/file-templates/templates/love-mode/__conf.lua similarity index 100% rename from modules/feature/file-templates/templates/love-mode/__conf.lua rename to modules/editor/file-templates/templates/love-mode/__conf.lua diff --git a/modules/feature/file-templates/templates/love-mode/__main.lua b/modules/editor/file-templates/templates/love-mode/__main.lua similarity index 100% rename from modules/feature/file-templates/templates/love-mode/__main.lua rename to modules/editor/file-templates/templates/love-mode/__main.lua diff --git a/modules/feature/file-templates/templates/makefile-gmake-mode/__ b/modules/editor/file-templates/templates/makefile-gmake-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/makefile-gmake-mode/__ rename to modules/editor/file-templates/templates/makefile-gmake-mode/__ diff --git a/modules/feature/file-templates/templates/makefile-gmake-mode/__cpp b/modules/editor/file-templates/templates/makefile-gmake-mode/__cpp similarity index 100% rename from modules/feature/file-templates/templates/makefile-gmake-mode/__cpp rename to modules/editor/file-templates/templates/makefile-gmake-mode/__cpp diff --git a/modules/feature/file-templates/templates/markdown-mode/__ b/modules/editor/file-templates/templates/markdown-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/markdown-mode/__ rename to modules/editor/file-templates/templates/markdown-mode/__ diff --git a/modules/feature/file-templates/templates/markdown-mode/__jekyll-post b/modules/editor/file-templates/templates/markdown-mode/__jekyll-post similarity index 100% rename from modules/feature/file-templates/templates/markdown-mode/__jekyll-post rename to modules/editor/file-templates/templates/markdown-mode/__jekyll-post diff --git a/modules/feature/file-templates/templates/nose-mode/__ b/modules/editor/file-templates/templates/nose-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/nose-mode/__ rename to modules/editor/file-templates/templates/nose-mode/__ diff --git a/modules/feature/file-templates/templates/org-mode/__ b/modules/editor/file-templates/templates/org-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/org-mode/__ rename to modules/editor/file-templates/templates/org-mode/__ diff --git a/modules/feature/file-templates/templates/org-mode/__contact.org b/modules/editor/file-templates/templates/org-mode/__contact.org similarity index 100% rename from modules/feature/file-templates/templates/org-mode/__contact.org rename to modules/editor/file-templates/templates/org-mode/__contact.org diff --git a/modules/feature/file-templates/templates/org-mode/__doom-readme b/modules/editor/file-templates/templates/org-mode/__doom-readme similarity index 100% rename from modules/feature/file-templates/templates/org-mode/__doom-readme rename to modules/editor/file-templates/templates/org-mode/__doom-readme diff --git a/modules/feature/file-templates/templates/org-mode/__invoice.org b/modules/editor/file-templates/templates/org-mode/__invoice.org similarity index 100% rename from modules/feature/file-templates/templates/org-mode/__invoice.org rename to modules/editor/file-templates/templates/org-mode/__invoice.org diff --git a/modules/feature/file-templates/templates/org-mode/__project.org b/modules/editor/file-templates/templates/org-mode/__project.org similarity index 100% rename from modules/feature/file-templates/templates/org-mode/__project.org rename to modules/editor/file-templates/templates/org-mode/__project.org diff --git a/modules/feature/file-templates/templates/php-mode/__ b/modules/editor/file-templates/templates/php-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/php-mode/__ rename to modules/editor/file-templates/templates/php-mode/__ diff --git a/modules/feature/file-templates/templates/php-mode/__.class.php b/modules/editor/file-templates/templates/php-mode/__.class.php similarity index 100% rename from modules/feature/file-templates/templates/php-mode/__.class.php rename to modules/editor/file-templates/templates/php-mode/__.class.php diff --git a/modules/feature/file-templates/templates/python-mode/__ b/modules/editor/file-templates/templates/python-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/python-mode/__ rename to modules/editor/file-templates/templates/python-mode/__ diff --git a/modules/feature/file-templates/templates/python-mode/__setup.py b/modules/editor/file-templates/templates/python-mode/__setup.py similarity index 100% rename from modules/feature/file-templates/templates/python-mode/__setup.py rename to modules/editor/file-templates/templates/python-mode/__setup.py diff --git a/modules/feature/file-templates/templates/rspec-mode/__ b/modules/editor/file-templates/templates/rspec-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/rspec-mode/__ rename to modules/editor/file-templates/templates/rspec-mode/__ diff --git a/modules/feature/file-templates/templates/rspec-mode/__.rspec b/modules/editor/file-templates/templates/rspec-mode/__.rspec similarity index 100% rename from modules/feature/file-templates/templates/rspec-mode/__.rspec rename to modules/editor/file-templates/templates/rspec-mode/__.rspec diff --git a/modules/feature/file-templates/templates/rspec-mode/__helper b/modules/editor/file-templates/templates/rspec-mode/__helper similarity index 100% rename from modules/feature/file-templates/templates/rspec-mode/__helper rename to modules/editor/file-templates/templates/rspec-mode/__helper diff --git a/modules/feature/file-templates/templates/ruby-mode/__ b/modules/editor/file-templates/templates/ruby-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/ruby-mode/__ rename to modules/editor/file-templates/templates/ruby-mode/__ diff --git a/modules/feature/file-templates/templates/ruby-mode/__.gemspec b/modules/editor/file-templates/templates/ruby-mode/__.gemspec similarity index 100% rename from modules/feature/file-templates/templates/ruby-mode/__.gemspec rename to modules/editor/file-templates/templates/ruby-mode/__.gemspec diff --git a/modules/feature/file-templates/templates/ruby-mode/__Gemfile b/modules/editor/file-templates/templates/ruby-mode/__Gemfile similarity index 100% rename from modules/feature/file-templates/templates/ruby-mode/__Gemfile rename to modules/editor/file-templates/templates/ruby-mode/__Gemfile diff --git a/modules/feature/file-templates/templates/ruby-mode/__Rakefile b/modules/editor/file-templates/templates/ruby-mode/__Rakefile similarity index 100% rename from modules/feature/file-templates/templates/ruby-mode/__Rakefile rename to modules/editor/file-templates/templates/ruby-mode/__Rakefile diff --git a/modules/feature/file-templates/templates/ruby-mode/__module b/modules/editor/file-templates/templates/ruby-mode/__module similarity index 100% rename from modules/feature/file-templates/templates/ruby-mode/__module rename to modules/editor/file-templates/templates/ruby-mode/__module diff --git a/modules/feature/file-templates/templates/rust-mode/__Cargo.toml b/modules/editor/file-templates/templates/rust-mode/__Cargo.toml similarity index 100% rename from modules/feature/file-templates/templates/rust-mode/__Cargo.toml rename to modules/editor/file-templates/templates/rust-mode/__Cargo.toml diff --git a/modules/feature/file-templates/templates/rust-mode/__main.rs b/modules/editor/file-templates/templates/rust-mode/__main.rs similarity index 100% rename from modules/feature/file-templates/templates/rust-mode/__main.rs rename to modules/editor/file-templates/templates/rust-mode/__main.rs diff --git a/modules/feature/file-templates/templates/scss-mode/__ b/modules/editor/file-templates/templates/scss-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/scss-mode/__ rename to modules/editor/file-templates/templates/scss-mode/__ diff --git a/modules/feature/file-templates/templates/scss-mode/__master.scss b/modules/editor/file-templates/templates/scss-mode/__master.scss similarity index 100% rename from modules/feature/file-templates/templates/scss-mode/__master.scss rename to modules/editor/file-templates/templates/scss-mode/__master.scss diff --git a/modules/feature/file-templates/templates/scss-mode/__normalize.scss b/modules/editor/file-templates/templates/scss-mode/__normalize.scss similarity index 100% rename from modules/feature/file-templates/templates/scss-mode/__normalize.scss rename to modules/editor/file-templates/templates/scss-mode/__normalize.scss diff --git a/modules/feature/file-templates/templates/sh-mode/__ b/modules/editor/file-templates/templates/sh-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/sh-mode/__ rename to modules/editor/file-templates/templates/sh-mode/__ diff --git a/modules/feature/file-templates/templates/sh-mode/__zunit b/modules/editor/file-templates/templates/sh-mode/__zunit similarity index 100% rename from modules/feature/file-templates/templates/sh-mode/__zunit rename to modules/editor/file-templates/templates/sh-mode/__zunit diff --git a/modules/feature/file-templates/templates/slim-mode/__ b/modules/editor/file-templates/templates/slim-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/slim-mode/__ rename to modules/editor/file-templates/templates/slim-mode/__ diff --git a/modules/feature/file-templates/templates/snippet-mode/__ b/modules/editor/file-templates/templates/snippet-mode/__ similarity index 100% rename from modules/feature/file-templates/templates/snippet-mode/__ rename to modules/editor/file-templates/templates/snippet-mode/__ diff --git a/modules/feature/file-templates/templates/solidity-mode/__sol b/modules/editor/file-templates/templates/solidity-mode/__sol similarity index 100% rename from modules/feature/file-templates/templates/solidity-mode/__sol rename to modules/editor/file-templates/templates/solidity-mode/__sol diff --git a/modules/feature/file-templates/templates/text-mode/__license b/modules/editor/file-templates/templates/text-mode/__license similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license rename to modules/editor/file-templates/templates/text-mode/__license diff --git a/modules/feature/file-templates/templates/text-mode/__license-apache b/modules/editor/file-templates/templates/text-mode/__license-apache similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license-apache rename to modules/editor/file-templates/templates/text-mode/__license-apache diff --git a/modules/feature/file-templates/templates/text-mode/__license-apache-bp b/modules/editor/file-templates/templates/text-mode/__license-apache-bp similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license-apache-bp rename to modules/editor/file-templates/templates/text-mode/__license-apache-bp diff --git a/modules/feature/file-templates/templates/text-mode/__license-bsd2 b/modules/editor/file-templates/templates/text-mode/__license-bsd2 similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license-bsd2 rename to modules/editor/file-templates/templates/text-mode/__license-bsd2 diff --git a/modules/feature/file-templates/templates/text-mode/__license-bsd3 b/modules/editor/file-templates/templates/text-mode/__license-bsd3 similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license-bsd3 rename to modules/editor/file-templates/templates/text-mode/__license-bsd3 diff --git a/modules/feature/file-templates/templates/text-mode/__license-gpl3 b/modules/editor/file-templates/templates/text-mode/__license-gpl3 similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license-gpl3 rename to modules/editor/file-templates/templates/text-mode/__license-gpl3 diff --git a/modules/feature/file-templates/templates/text-mode/__license-gpl3-bp b/modules/editor/file-templates/templates/text-mode/__license-gpl3-bp similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license-gpl3-bp rename to modules/editor/file-templates/templates/text-mode/__license-gpl3-bp diff --git a/modules/feature/file-templates/templates/text-mode/__license-lgpl3 b/modules/editor/file-templates/templates/text-mode/__license-lgpl3 similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license-lgpl3 rename to modules/editor/file-templates/templates/text-mode/__license-lgpl3 diff --git a/modules/feature/file-templates/templates/text-mode/__license-mit b/modules/editor/file-templates/templates/text-mode/__license-mit similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license-mit rename to modules/editor/file-templates/templates/text-mode/__license-mit diff --git a/modules/feature/file-templates/templates/text-mode/__license-mozilla b/modules/editor/file-templates/templates/text-mode/__license-mozilla similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license-mozilla rename to modules/editor/file-templates/templates/text-mode/__license-mozilla diff --git a/modules/feature/file-templates/templates/text-mode/__license-mozilla-bp b/modules/editor/file-templates/templates/text-mode/__license-mozilla-bp similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license-mozilla-bp rename to modules/editor/file-templates/templates/text-mode/__license-mozilla-bp diff --git a/modules/feature/file-templates/templates/text-mode/__license-unlicense b/modules/editor/file-templates/templates/text-mode/__license-unlicense similarity index 100% rename from modules/feature/file-templates/templates/text-mode/__license-unlicense rename to modules/editor/file-templates/templates/text-mode/__license-unlicense diff --git a/modules/feature/file-templates/templates/web-mode/__.html b/modules/editor/file-templates/templates/web-mode/__.html similarity index 100% rename from modules/feature/file-templates/templates/web-mode/__.html rename to modules/editor/file-templates/templates/web-mode/__.html diff --git a/modules/feature/file-templates/templates/web-mode/__jekyll-layout.html b/modules/editor/file-templates/templates/web-mode/__jekyll-layout.html similarity index 100% rename from modules/feature/file-templates/templates/web-mode/__jekyll-layout.html rename to modules/editor/file-templates/templates/web-mode/__jekyll-layout.html diff --git a/modules/feature/file-templates/templates/yaml-mode/__docker-compose.yml b/modules/editor/file-templates/templates/yaml-mode/__docker-compose.yml similarity index 100% rename from modules/feature/file-templates/templates/yaml-mode/__docker-compose.yml rename to modules/editor/file-templates/templates/yaml-mode/__docker-compose.yml diff --git a/modules/editor/fold/autoload/evil.el b/modules/editor/fold/autoload/evil.el index 3a16c060ed1..7ae386f3d45 100644 --- a/modules/editor/fold/autoload/evil.el +++ b/modules/editor/fold/autoload/evil.el @@ -1,5 +1,5 @@ ;;; editor/fold/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;;###if (featurep! :editor evil) (require 'hideshow) diff --git a/modules/editor/fold/config.el b/modules/editor/fold/config.el index f14221525ae..74391f1810d 100644 --- a/modules/editor/fold/config.el +++ b/modules/editor/fold/config.el @@ -1,6 +1,6 @@ ;;; editor/fold/config.el -*- lexical-binding: t; -*- -(when (featurep! :feature evil) +(when (featurep! :editor evil) ;; Add vimish-fold, outline-mode & hideshow support to folding commands (define-key! 'global [remap evil-toggle-fold] #'+fold/toggle @@ -57,7 +57,7 @@ (def-package! evil-vimish-fold - :when (featurep! :feature evil) + :when (featurep! :editor evil) :commands (evil-vimish-fold/next-fold evil-vimish-fold/previous-fold evil-vimish-fold/delete evil-vimish-fold/delete-all evil-vimish-fold/create evil-vimish-fold/create-line) diff --git a/modules/editor/fold/packages.el b/modules/editor/fold/packages.el index 40b63a21535..bb672122e52 100644 --- a/modules/editor/fold/packages.el +++ b/modules/editor/fold/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- ;;; editor/fold/packages.el -(when (featurep! :feature evil) +(when (featurep! :editor evil) (package! evil-vimish-fold)) diff --git a/modules/editor/format/autoload/evil.el b/modules/editor/format/autoload/evil.el index c84caa83b38..d9e00f989f3 100644 --- a/modules/editor/format/autoload/evil.el +++ b/modules/editor/format/autoload/evil.el @@ -1,5 +1,5 @@ ;;; editor/format/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;;###if (featurep! :editor evil) ;;;###autoload (autoload '+format:region "editor/format/autoload/evil" nil t) (evil-define-operator +format:region (beg end) diff --git a/modules/editor/lispy/config.el b/modules/editor/lispy/config.el index 0e32a789311..21e1d64dd43 100644 --- a/modules/editor/lispy/config.el +++ b/modules/editor/lispy/config.el @@ -13,7 +13,7 @@ (add-hook 'lispy-mode-hook #'turn-off-smartparens-mode)) (def-package! lispyville - :when (featurep! :feature evil) + :when (featurep! :editor evil) :hook (lispy-mode . lispyville-mode) :config (lispyville-set-key-theme diff --git a/modules/editor/lispy/packages.el b/modules/editor/lispy/packages.el index 953527d2769..a423e54a665 100644 --- a/modules/editor/lispy/packages.el +++ b/modules/editor/lispy/packages.el @@ -3,5 +3,5 @@ (package! lispy) -(when (featurep! :feature evil) +(when (featurep! :editor evil) (package! lispyville)) diff --git a/modules/editor/multiple-cursors/autoload/evil-mc.el b/modules/editor/multiple-cursors/autoload/evil-mc.el index c83f1d52dfe..5b59281823a 100644 --- a/modules/editor/multiple-cursors/autoload/evil-mc.el +++ b/modules/editor/multiple-cursors/autoload/evil-mc.el @@ -1,5 +1,5 @@ ;;; editor/multiple-cursors/autoload/evil-mc.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;;###if (featurep! :editor evil) ;;;###autoload (defun +multiple-cursors/evil-mc-toggle-cursors () diff --git a/modules/editor/multiple-cursors/config.el b/modules/editor/multiple-cursors/config.el index 86ec2bb0ca9..8e061ba02f1 100644 --- a/modules/editor/multiple-cursors/config.el +++ b/modules/editor/multiple-cursors/config.el @@ -1,7 +1,7 @@ ;;; editor/multiple-cursors/config.el -*- lexical-binding: t; -*- (def-package! evil-mc - :when (featurep! :feature evil) + :when (featurep! :editor evil) :commands (evil-mc-make-cursor-here evil-mc-make-all-cursors evil-mc-undo-all-cursors evil-mc-pause-cursors evil-mc-resume-cursors evil-mc-make-and-goto-first-cursor @@ -65,7 +65,7 @@ ;; mc doesn't play well with evil, this attempts to assuage some of its ;; problems so that any plugins that depend on multiple-cursors (which I have ;; no control over) can still use it in relative safety. - (when (featurep! :feature evil) + (when (featurep! :editor evil) (evil-define-key* '(normal emacs) mc/keymap [escape] #'mc/keyboard-quit) (defvar +mc--compat-evil-prev-state nil) diff --git a/modules/editor/multiple-cursors/packages.el b/modules/editor/multiple-cursors/packages.el index 5519a9a4eed..470ebbea6bc 100644 --- a/modules/editor/multiple-cursors/packages.el +++ b/modules/editor/multiple-cursors/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; editor/multiple-cursors/packages.el -(cond ((featurep! :feature evil) +(cond ((featurep! :editor evil) (package! evil-multiedit) (package! evil-mc)) diff --git a/modules/editor/parinfer/config.el b/modules/editor/parinfer/config.el index fc24cb37ac3..15f59cac549 100644 --- a/modules/editor/parinfer/config.el +++ b/modules/editor/parinfer/config.el @@ -8,7 +8,7 @@ pretty-parens smart-tab smart-yank)) - (when (featurep! :feature evil +everywhere) + (when (featurep! :editor evil +everywhere) (push 'evil parinfer-extensions)) :config (map! :map parinfer-mode-map diff --git a/modules/editor/parinfer/packages.el b/modules/editor/parinfer/packages.el index 13875d6a6f2..377bb70b161 100644 --- a/modules/editor/parinfer/packages.el +++ b/modules/editor/parinfer/packages.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; editor/parinfer/packages.el -(when (featurep! :feature evil) +(when (featurep! :editor evil) ;; Parinfer uses `evil-define-key' without loading evil, so if evil is ;; installed *after* parinfer, parinfer will throw up void-function errors. ;; because evil-define-key (a macro) wasn't expanded at compile-time. So we diff --git a/modules/feature/snippets/README.org b/modules/editor/snippets/README.org similarity index 96% rename from modules/feature/snippets/README.org rename to modules/editor/snippets/README.org index 7f28da666d1..9dd3a0957e3 100644 --- a/modules/feature/snippets/README.org +++ b/modules/editor/snippets/README.org @@ -1,4 +1,4 @@ -#+TITLE: feature/snippets +#+TITLE: editor/snippets #+DATE: February 11, 2017 #+SINCE: v2.0 #+STARTUP: inlineimages diff --git a/modules/feature/snippets/autoload/evil.el b/modules/editor/snippets/autoload/evil.el similarity index 84% rename from modules/feature/snippets/autoload/evil.el rename to modules/editor/snippets/autoload/evil.el index e56fffe8597..8cb8ccd9c4b 100644 --- a/modules/feature/snippets/autoload/evil.el +++ b/modules/editor/snippets/autoload/evil.el @@ -1,5 +1,5 @@ -;;; feature/snippets/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;; editor/snippets/autoload/evil.el -*- lexical-binding: t; -*- +;;;###if (featurep! :editor evil) ;;;###autoload (defun +snippets/expand-on-region () diff --git a/modules/feature/snippets/autoload/settings.el b/modules/editor/snippets/autoload/settings.el similarity index 85% rename from modules/feature/snippets/autoload/settings.el rename to modules/editor/snippets/autoload/settings.el index 6bb99df2279..09880ed66ce 100644 --- a/modules/feature/snippets/autoload/settings.el +++ b/modules/editor/snippets/autoload/settings.el @@ -1,4 +1,4 @@ -;;; feature/snippets/autoload/settings.el -*- lexical-binding: t; -*- +;;; editor/snippets/autoload/settings.el -*- lexical-binding: t; -*- ;;;###autodef (defun set-yas-minor-mode! (modes) diff --git a/modules/feature/snippets/autoload/snippets.el b/modules/editor/snippets/autoload/snippets.el similarity index 98% rename from modules/feature/snippets/autoload/snippets.el rename to modules/editor/snippets/autoload/snippets.el index 35f3b8ee900..b03d3f35449 100644 --- a/modules/feature/snippets/autoload/snippets.el +++ b/modules/editor/snippets/autoload/snippets.el @@ -1,4 +1,4 @@ -;;; feature/snippets/autoload/snippets.el -*- lexical-binding: t; -*- +;;; editor/snippets/autoload/snippets.el -*- lexical-binding: t; -*- (defun +snippets--remove-p (x y) (and (equal (yas--template-key x) (yas--template-key y)) @@ -119,4 +119,3 @@ buggy behavior when is pressed in an empty field." (if (file-directory-p +snippets-dir) (doom-project-find-file +snippets-dir) (yas-visit-snippet-file))) - diff --git a/modules/feature/snippets/config.el b/modules/editor/snippets/config.el similarity index 95% rename from modules/feature/snippets/config.el rename to modules/editor/snippets/config.el index 50ce7fce7b4..06a8496a325 100644 --- a/modules/feature/snippets/config.el +++ b/modules/editor/snippets/config.el @@ -1,4 +1,4 @@ -;;; feature/snippets/config.el -*- lexical-binding: t; -*- +;;; editor/snippets/config.el -*- lexical-binding: t; -*- (defvar +snippets-dir (expand-file-name "snippets/" doom-private-dir) "Directory where `yasnippet' will search for your private snippets.") @@ -45,7 +45,7 @@ ;; tell smartparens overlays not to interfere with yasnippet keybinds (advice-add #'yas-expand :before #'sp-remove-active-pair-overlay)) - (when (featurep! :feature evil) + (when (featurep! :editor evil) ;; evil visual-mode integration for `yas-insert-snippet' (define-key yas-minor-mode-map [remap yas-insert-snippet] #'+snippets/expand-on-region))) diff --git a/modules/feature/snippets/packages.el b/modules/editor/snippets/packages.el similarity index 85% rename from modules/feature/snippets/packages.el rename to modules/editor/snippets/packages.el index 4ace1fb9060..a0f023c42f4 100644 --- a/modules/feature/snippets/packages.el +++ b/modules/editor/snippets/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- -;;; feature/snippets/packages.el +;;; editor/snippets/packages.el (package! yasnippet) (package! auto-yasnippet) diff --git a/modules/emacs/dired/config.el b/modules/emacs/dired/config.el index bcfe7cc002f..f919bbeca6e 100644 --- a/modules/emacs/dired/config.el +++ b/modules/emacs/dired/config.el @@ -108,7 +108,7 @@ ;; ;; Evil integration -(map! :when (featurep! :feature evil +everywhere) +(map! :when (featurep! :editor evil +everywhere) :after dired :map dired-mode-map :n "q" #'quit-window diff --git a/modules/emacs/eshell/autoload/eshell.el b/modules/emacs/eshell/autoload/eshell.el index 884889801bf..a1d1f0633ef 100644 --- a/modules/emacs/eshell/autoload/eshell.el +++ b/modules/emacs/eshell/autoload/eshell.el @@ -109,7 +109,7 @@ ;;;###autoload (defun +eshell/open-fullscreen (arg &optional command) - "Open eshell in a separate workspace. Requires the (:feature workspaces) + "Open eshell in a separate workspace. Requires the (:ui workspaces) module to be loaded." (interactive "P") (let ((default-directory (or (if arg default-directory (doom-project-root)) diff --git a/modules/emacs/eshell/autoload/evil.el b/modules/emacs/eshell/autoload/evil.el index a6fd3c9112c..753a0cddfc7 100644 --- a/modules/emacs/eshell/autoload/evil.el +++ b/modules/emacs/eshell/autoload/evil.el @@ -1,5 +1,5 @@ ;;; emacs/eshell/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;;###if (featurep! :editor evil) ;;;###autoload (defun +eshell|init-evil () diff --git a/modules/emacs/eshell/config.el b/modules/emacs/eshell/config.el index 42ed6a6ea60..d21c50b8b10 100644 --- a/modules/emacs/eshell/config.el +++ b/modules/emacs/eshell/config.el @@ -81,7 +81,7 @@ You should use `det-eshell-alias!' to change this.") (add-hook 'eshell-mode-hook #'smartparens-mode) ;; Persp-mode/workspaces integration - (when (featurep! :feature workspaces) + (when (featurep! :ui workspaces) (add-hook 'persp-activated-functions #'+eshell|switch-workspace) (add-hook 'persp-before-switch-functions #'+eshell|save-workspace)) @@ -115,7 +115,7 @@ You should use `det-eshell-alias!' to change this.") +eshell-aliases))) (add-hook 'eshell-alias-load-hook #'+eshell|init-aliases) - (when (featurep! :feature evil +everywhere) + (when (featurep! :editor evil +everywhere) (add-hook 'eshell-mode-hook #'+eshell|init-evil)) (defun +eshell|init-keymap () diff --git a/modules/emacs/vc/autoload/evil.el b/modules/emacs/vc/autoload/evil.el index 7803f94c9d6..085fc2ed13d 100644 --- a/modules/emacs/vc/autoload/evil.el +++ b/modules/emacs/vc/autoload/evil.el @@ -1,5 +1,5 @@ ;;; emacs/vc/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;;###if (featurep! :editor evil) ;;;###autoload (autoload '+vc:git-browse "emacs/vc/autoload/evil" nil t) (evil-define-command +vc:git-browse (bang) diff --git a/modules/lang/cc/README.org b/modules/lang/cc/README.org index d08a988a71b..8ee27857098 100644 --- a/modules/lang/cc/README.org +++ b/modules/lang/cc/README.org @@ -23,7 +23,7 @@ This module adds support for the C-family of languages: C, C++, and Objective-C. + eldoc support (~irony-eldoc~) + Syntax-checking (~flycheck-irony~) + Code navigation (~rtags~) -+ File Templates ([[../../feature/file-templates/templates/c-mode][c-mode]], [[../../feature/file-templates/templates/c++-mode][c++-mode]]) ++ File Templates ([[../../editor/file-templates/templates/c-mode][c-mode]], [[../../editor/file-templates/templates/c++-mode][c++-mode]]) + Snippets ([[https://github.com/hlissner/emacs-snippets/tree/master/cc-mode][cc-mode]], [[https://github.com/hlissner/emacs-snippets/tree/master/c-mode][c-mode]], [[https://github.com/hlissner/emacs-snippets/tree/master/c++-mode][c++-mode]]) + Several improvements to C++11 indentation and syntax highlighting. diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el index 2cd426c2106..76c6a1bf28e 100644 --- a/modules/lang/clojure/config.el +++ b/modules/lang/clojure/config.el @@ -84,7 +84,7 @@ "B" #'+clojure/cider-switch-to-repl-buffer-and-switch-ns "c" #'cider-find-and-clear-repl-output))) - (:when (featurep! :feature evil +everywhere) + (:when (featurep! :editor evil +everywhere) :map cider-repl-mode-map :i [S-return] #'cider-repl-newline-and-indent (:localleader diff --git a/modules/lang/common-lisp/config.el b/modules/lang/common-lisp/config.el index 816561db6f6..5e658d362cb 100644 --- a/modules/lang/common-lisp/config.el +++ b/modules/lang/common-lisp/config.el @@ -135,7 +135,7 @@ bin/doom while packages at compile-time (not a runtime though)." :desc "Toggle (fancy)" "T" #'sly-toggle-fancy-trace :desc "Untrace all" "u" #'sly-untrace-all)) - (when (featurep! :feature evil +everywhere) + (when (featurep! :editor evil +everywhere) (add-hook 'sly-mode-hook #'evil-normalize-keymaps) (add-hook 'sly-popup-buffer-mode-hook #'evil-normalize-keymaps) (unless evil-move-beyond-eol diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el index 63faeb3bcc7..9b515a8d507 100644 --- a/modules/lang/emacs-lisp/config.el +++ b/modules/lang/emacs-lisp/config.el @@ -84,7 +84,7 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.") ;; `macrostep' -(when (featurep! :feature evil) +(when (featurep! :editor evil) (after! macrostep (evil-define-key* 'normal macrostep-keymap [return] #'macrostep-expand diff --git a/modules/lang/go/README.org b/modules/lang/go/README.org index 53cbe4192fc..be726307ea3 100644 --- a/modules/lang/go/README.org +++ b/modules/lang/go/README.org @@ -24,7 +24,7 @@ This module adds [[https://golang.org][Go]] support. + Syntax-checking (~flycheck~) + Auto-formatting on save (~gofmt~) + Code navigation & refactoring (~go-guru~) -+ [[../../feature/file-templates/templates/go-mode][File templates]] ++ [[../../editor/file-templates/templates/go-mode][File templates]] + [[https://github.com/hlissner/emacs-snippets/tree/master/go-mode][Snippets]] ** Module Flags diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index dd2e2fa3187..0ff61fdfdc0 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -179,7 +179,7 @@ (def-package! xref-js2 - :when (featurep! :feature lookup) + :when (featurep! :tools lookup) :after (:or js2-mode rjsx-mode) :config (set-lookup-handlers! '(js2-mode rjsx-mode) @@ -189,7 +189,7 @@ (def-package! js2-refactor :hook ((js2-mode rjsx-mode) . js2-refactor-mode) :config - (when (featurep! :feature evil +everywhere) + (when (featurep! :editor evil +everywhere) (let ((js2-refactor-mode-map (evil-get-auxiliary-keymap js2-refactor-mode-map 'normal t t))) (js2r-add-keybindings-with-prefix (format "%s r" doom-localleader-key))))) diff --git a/modules/lang/javascript/packages.el b/modules/lang/javascript/packages.el index c7474537c69..5a0c00b4b5a 100644 --- a/modules/lang/javascript/packages.el +++ b/modules/lang/javascript/packages.el @@ -14,7 +14,7 @@ (package! npm-mode) (package! skewer-mode) -(when (featurep! :feature lookup) +(when (featurep! :tools lookup) (package! xref-js2)) (unless (featurep! +lsp) diff --git a/modules/lang/ledger/config.el b/modules/lang/ledger/config.el index 26fd8c4b846..8980990852e 100644 --- a/modules/lang/ledger/config.el +++ b/modules/lang/ledger/config.el @@ -26,7 +26,7 @@ (def-package! evil-ledger - :when (featurep! :feature evil +everywhere) + :when (featurep! :editor evil +everywhere) :hook (ledger-mode . evil-ledger-mode) :config (set-evil-initial-state! 'ledger-report-mode 'normal) diff --git a/modules/lang/ledger/packages.el b/modules/lang/ledger/packages.el index 4661ee7a8d5..7142c61b2ed 100644 --- a/modules/lang/ledger/packages.el +++ b/modules/lang/ledger/packages.el @@ -3,7 +3,7 @@ (package! ledger-mode) -(when (featurep! :feature evil) +(when (featurep! :editor evil) (package! evil-ledger)) (when (featurep! :tools flycheck) diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el index c17879cc5e0..09148e0d38d 100644 --- a/modules/lang/markdown/config.el +++ b/modules/lang/markdown/config.el @@ -29,7 +29,7 @@ :i "M-b" #'markdown-insert-bold :i "M-i" #'markdown-insert-italic :i "M-`" #'+markdown/insert-del - (:when (featurep! :feature evil +everywhere) + (:when (featurep! :editor evil +everywhere) :m "gj" #'markdown-next-visible-heading :m "gk" #'markdown-previous-visible-heading ;; TODO: Make context sensitive diff --git a/modules/lang/ocaml/README.org b/modules/lang/ocaml/README.org index 1ba19938719..e05d2764f39 100644 --- a/modules/lang/ocaml/README.org +++ b/modules/lang/ocaml/README.org @@ -54,7 +54,7 @@ opam install merlin utop ocp-indent dune ocamlformat on-the-fly syntax/type checking via =merlin=, otherwise this is only done when the file is saved. + spell checking is activated in comments if =:tools flyspell= is active -+ a REPL is provided if =utop= is installed and =:feature eval= is active ++ a REPL is provided if =utop= is installed and =:tools eval= is active + if =:editor format= is enabled, the =ocamlformat= executable is available and there is an =.ocamlformat= file present then =format-all-buffer= is bound to =ocamlformat=, otherwise to =ocp-indent= diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el index db17fbdbb1f..0465d0beda5 100644 --- a/modules/lang/ocaml/config.el +++ b/modules/lang/ocaml/config.el @@ -72,7 +72,7 @@ (def-package! utop - :when (featurep! :feature eval) + :when (featurep! :tools eval) :defer t ; loaded by hook below :init (set-repl-handler! 'tuareg-mode #'utop) diff --git a/modules/lang/ocaml/doctor.el b/modules/lang/ocaml/doctor.el index 7429c68c60d..7ae390f98fd 100644 --- a/modules/lang/ocaml/doctor.el +++ b/modules/lang/ocaml/doctor.el @@ -8,7 +8,7 @@ (unless (executable-find "ocp-indent") (warn! "Couldn't find ocp-indent. Auto-indentation will be less precise")) -(when (featurep! :feature eval) +(when (featurep! :tools eval) (unless (executable-find "utop") (warn! "Couldn't find utop. REPL won't be available"))) diff --git a/modules/lang/ocaml/packages.el b/modules/lang/ocaml/packages.el index 7482744999c..9a5a84a4023 100644 --- a/modules/lang/ocaml/packages.el +++ b/modules/lang/ocaml/packages.el @@ -9,7 +9,7 @@ (when (featurep! :tools flycheck) (package! flycheck-ocaml)) -(when (featurep! :feature eval) +(when (featurep! :tools eval) (package! utop)) (when (featurep! :editor format) diff --git a/modules/lang/org/+capture.el b/modules/lang/org/+capture.el index bec8bdf7166..3c610039783 100644 --- a/modules/lang/org/+capture.el +++ b/modules/lang/org/+capture.el @@ -86,7 +86,7 @@ underlying, modified buffer. This fixes that." header-line-format))) (add-hook 'org-capture-mode-hook #'+org|show-target-in-capture-header) -(when (featurep! :feature evil) +(when (featurep! :editor evil) (add-hook 'org-capture-mode-hook #'evil-insert-state)) (when (featurep! :ui doom-dashboard) diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 18ee476a300..78717d13acd 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -27,7 +27,7 @@ (advice-add #'toc-org-insert-toc :before #'+org*unfold-toc) (def-package! evil-org - :when (featurep! :feature evil +everywhere) + :when (featurep! :editor evil +everywhere) :hook (org-mode . evil-org-mode) :init (defvar evil-org-key-theme '(navigation insert textobjects)) diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index 8652ea76907..ea34a43b238 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -16,7 +16,7 @@ (package! org-yt :recipe (:fetcher github :repo "TobiasZawada/org-yt")) (package! toc-org) -(when (featurep! :feature evil) +(when (featurep! :editor evil) (package! evil-org)) (when (featurep! :tools pdf) diff --git a/modules/lang/php/README.org b/modules/lang/php/README.org index 418ce8fde56..1b09a4cb110 100644 --- a/modules/lang/php/README.org +++ b/modules/lang/php/README.org @@ -8,7 +8,7 @@ This module adds support for PHP 5.3+ (including PHP7). + Code refactoring commands (~php-refactor-mode~) + Unit-test commands (~phpunit~) + Support for ~laravel~ and ~composer~ projects (with project-specific snippets) -+ [[../../feature/file-templates/templates/php-mode][File templates]] ++ [[../../editor/file-templates/templates/php-mode][File templates]] + [[https://github.com/hlissner/emacs-snippets/tree/master/php-mode][Snippets]] #+begin_quote diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el index b2cba8e0662..2e514fe1579 100644 --- a/modules/lang/ruby/config.el +++ b/modules/lang/ruby/config.el @@ -121,7 +121,7 @@ ;; Rake (("task" "namespace") () "end"))) - (when (featurep! :feature evil) + (when (featurep! :editor evil) (add-hook 'rspec-mode-hook #'evil-normalize-keymaps)) :config (map! :localleader @@ -149,7 +149,7 @@ (def-package! minitest :defer t :config - (when (featurep! :feature evil) + (when (featurep! :editor evil) (add-hook 'minitest-mode-hook #'evil-normalize-keymaps)) (map! :localleader :map minitest-mode-map diff --git a/modules/lang/web/autoload/evil.el b/modules/lang/web/autoload/evil.el index 8886f1ae0f1..c9a11f132aa 100644 --- a/modules/lang/web/autoload/evil.el +++ b/modules/lang/web/autoload/evil.el @@ -1,5 +1,5 @@ ;;; lang/html/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;;###if (featurep! :editor evil) ;;;###autoload (autoload '+web:encode-html-entities "lang/web/autoload/evil" nil t) (evil-define-operator +web:encode-html-entities (beg end &optional input) diff --git a/modules/feature/debugger/autoload/debug.el b/modules/tools/debugger/autoload/debug.el similarity index 77% rename from modules/feature/debugger/autoload/debug.el rename to modules/tools/debugger/autoload/debug.el index 650e431703b..691ea909c20 100644 --- a/modules/feature/debugger/autoload/debug.el +++ b/modules/tools/debugger/autoload/debug.el @@ -1,4 +1,4 @@ -;;; feature/debugger/autoload/debug.el -*- lexical-binding: t; -*- +;;; tools/debugger/autoload/debug.el -*- lexical-binding: t; -*- ;;;###autoload (defun +debugger/quit () diff --git a/modules/feature/debugger/autoload/evil.el b/modules/tools/debugger/autoload/evil.el similarity index 80% rename from modules/feature/debugger/autoload/evil.el rename to modules/tools/debugger/autoload/evil.el index 7ae3027efc1..b43af436dc1 100644 --- a/modules/feature/debugger/autoload/evil.el +++ b/modules/tools/debugger/autoload/evil.el @@ -1,7 +1,7 @@ -;; feature/debugger/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;; tools/debugger/autoload/evil.el -*- lexical-binding: t; -*- +;;;###if (featurep! :editor evil) -;;;###autoload (autoload '+debugger:start "feature/debugger/autoload/evil" nil t) +;;;###autoload (autoload '+debugger:start "tools/debugger/autoload/evil" nil t) (evil-define-command +debugger:start (&optional path) "Initiate debugger for current major mode" (interactive "") @@ -28,7 +28,7 @@ ('haskell-mode (haskell-debug)) (_ (user-error "No debugger for %s" major-mode))))) -;;;###autoload (autoload '+debugger:toggle-breakpoint "feature/debugger/autoload/evil" nil t) +;;;###autoload (autoload '+debugger:toggle-breakpoint "tools/debugger/autoload/evil" nil t) (evil-define-command +debugger:toggle-breakpoint (&optional bang) (interactive "") (call-interactively (if bang #'realgud:cmd-clear #'realgud:cmd-break))) diff --git a/modules/feature/debugger/config.el b/modules/tools/debugger/config.el similarity index 97% rename from modules/feature/debugger/config.el rename to modules/tools/debugger/config.el index 7cfb631a059..c0ebc29477e 100644 --- a/modules/feature/debugger/config.el +++ b/modules/tools/debugger/config.el @@ -1,4 +1,4 @@ -;;; feature/debugger/config.el -*- lexical-binding: t; -*- +;;; tools/debugger/config.el -*- lexical-binding: t; -*- (def-package! realgud :commands (realgud:gdb realgud:trepanjs realgud:bashdb realgud:zshdb) diff --git a/modules/feature/debugger/packages.el b/modules/tools/debugger/packages.el similarity index 60% rename from modules/feature/debugger/packages.el rename to modules/tools/debugger/packages.el index e16548605f0..cb2b24789d5 100644 --- a/modules/feature/debugger/packages.el +++ b/modules/tools/debugger/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- -;;; feature/debugger/packages.el +;;; tools/debugger/packages.el (package! realgud) diff --git a/modules/tools/editorconfig/autoload.el b/modules/tools/editorconfig/autoload.el new file mode 100644 index 00000000000..211b22e13ec --- /dev/null +++ b/modules/tools/editorconfig/autoload.el @@ -0,0 +1,7 @@ +;;; tools/editorconfig/autoload.el -*- lexical-binding: t; -*- + +;;;###autodef +(defun set-editorconfig-indent-var! (mode &rest vars) + "Add (MODE VARS...) to `editorconfig-indentation-alist'." + (after! editorconfig + (nconc editorconfig-indentation-alist (cons mode vars)))) diff --git a/modules/feature/eval/README.org b/modules/tools/eval/README.org similarity index 99% rename from modules/feature/eval/README.org rename to modules/tools/eval/README.org index f52e6c1a3f4..86ad8420941 100644 --- a/modules/feature/eval/README.org +++ b/modules/tools/eval/README.org @@ -1,4 +1,4 @@ -#+TITLE: feature/eval +#+TITLE: tools/eval #+DATE: February 13, 2017 #+SINCE: v2.0 #+STARTUP: inlineimages diff --git a/modules/feature/eval/autoload/eval.el b/modules/tools/eval/autoload/eval.el similarity index 95% rename from modules/feature/eval/autoload/eval.el rename to modules/tools/eval/autoload/eval.el index d7f8df29cc8..877a2c206f3 100644 --- a/modules/feature/eval/autoload/eval.el +++ b/modules/tools/eval/autoload/eval.el @@ -1,4 +1,4 @@ -;;; feature/eval/autoload/eval.el -*- lexical-binding: t; -*- +;;; tools/eval/autoload/eval.el -*- lexical-binding: t; -*- ;;;###autoload (defun +eval/buffer () diff --git a/modules/feature/eval/autoload/evil.el b/modules/tools/eval/autoload/evil.el similarity index 62% rename from modules/feature/eval/autoload/evil.el rename to modules/tools/eval/autoload/evil.el index 279b41e325e..7defa9b6de6 100644 --- a/modules/feature/eval/autoload/evil.el +++ b/modules/tools/eval/autoload/evil.el @@ -1,20 +1,20 @@ -;; feature/eval/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;; tools/eval/autoload/evil.el -*- lexical-binding: t; -*- +;;;###if (featurep! :editor evil) -;;;###autoload (autoload '+eval:region "feature/eval/autoload/evil" nil t) +;;;###autoload (autoload '+eval:region "tools/eval/autoload/evil" nil t) (evil-define-operator +eval:region (beg end) "Send region to the currently open repl, if available." :move-point nil (interactive "") (+eval/region beg end)) -;;;###autoload (autoload '+eval:replace-region "feature/eval/autoload/evil" nil t) +;;;###autoload (autoload '+eval:replace-region "tools/eval/autoload/evil" nil t) (evil-define-operator +eval:replace-region (beg end) :move-point nil (interactive "") (+eval/region-and-replace beg end)) -;;;###autoload (autoload '+eval:repl "feature/eval/autoload/evil" nil t) +;;;###autoload (autoload '+eval:repl "tools/eval/autoload/evil" nil t) (evil-define-operator +eval:repl (beg end &optional bang) :move-point nil (interactive "") diff --git a/modules/feature/eval/autoload/repl.el b/modules/tools/eval/autoload/repl.el similarity index 98% rename from modules/feature/eval/autoload/repl.el rename to modules/tools/eval/autoload/repl.el index 58fde8c07e7..d534e906cfc 100644 --- a/modules/feature/eval/autoload/repl.el +++ b/modules/tools/eval/autoload/repl.el @@ -1,4 +1,4 @@ -;;; feature/eval/autoload/repl.el -*- lexical-binding: t; -*- +;;; tools/eval/autoload/repl.el -*- lexical-binding: t; -*- (defvar +eval-repl-buffers (make-hash-table :test 'equal) "The buffer of the last open repl.") diff --git a/modules/feature/eval/autoload/settings.el b/modules/tools/eval/autoload/settings.el similarity index 96% rename from modules/feature/eval/autoload/settings.el rename to modules/tools/eval/autoload/settings.el index 0cf6185140e..f9f7e71f22e 100644 --- a/modules/feature/eval/autoload/settings.el +++ b/modules/tools/eval/autoload/settings.el @@ -1,4 +1,4 @@ -;;; feature/eval/autoload/settings.el -*- lexical-binding: t; -*- +;;; tools/eval/autoload/settings.el -*- lexical-binding: t; -*- ;; ;; REPLs diff --git a/modules/feature/eval/config.el b/modules/tools/eval/config.el similarity index 95% rename from modules/feature/eval/config.el rename to modules/tools/eval/config.el index b5c21ef7ef4..b2ee708ed52 100644 --- a/modules/feature/eval/config.el +++ b/modules/tools/eval/config.el @@ -1,4 +1,4 @@ -;;; feature/eval/config.el -*- lexical-binding: t; -*- +;;; tools/eval/config.el -*- lexical-binding: t; -*- ;; remove ellipsis when printing sexps in message buffer (setq eval-expression-print-length nil diff --git a/modules/feature/eval/packages.el b/modules/tools/eval/packages.el similarity index 64% rename from modules/feature/eval/packages.el rename to modules/tools/eval/packages.el index d3c231de68a..f27dff02563 100644 --- a/modules/feature/eval/packages.el +++ b/modules/tools/eval/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- -;;; feature/eval/packages.el +;;; tools/eval/packages.el (package! quickrun) diff --git a/modules/tools/gist/autoload/evil.el b/modules/tools/gist/autoload/evil.el index 3633fe87634..de7f4d2f112 100644 --- a/modules/tools/gist/autoload/evil.el +++ b/modules/tools/gist/autoload/evil.el @@ -1,5 +1,5 @@ ;;; tools/gist/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;;###if (featurep! :editor evil) ;;;###autoload (autoload '+gist:send "tools/gist/autoload/evil" nil t) (evil-define-operator +gist:send (bang) diff --git a/modules/feature/lookup/README.org b/modules/tools/lookup/README.org similarity index 98% rename from modules/feature/lookup/README.org rename to modules/tools/lookup/README.org index d42b753f707..d7fe31c1bfc 100644 --- a/modules/feature/lookup/README.org +++ b/modules/tools/lookup/README.org @@ -1,4 +1,4 @@ -#+TITLE: feature/lookup +#+TITLE: tools/lookup #+DATE: January 4, 2018 #+SINCE: v2.0.9 #+STARTUP: inlineimages @@ -40,7 +40,7 @@ up definitions, references and documentation. + [[https://github.com/nathankot/counsel-dash][counsel-dash]] or [[https://github.com/areina/helm-dash][helm-dash]] * Install -To enable the module add =:feature lookup= to your ~doom!~ block in +To enable the module add =:tools lookup= to your ~doom!~ block in =~/.emacs.d/init.el=. ** Module flags diff --git a/modules/feature/lookup/autoload/docsets.el b/modules/tools/lookup/autoload/docsets.el similarity index 98% rename from modules/feature/lookup/autoload/docsets.el rename to modules/tools/lookup/autoload/docsets.el index 4055412110b..6831de4f18e 100644 --- a/modules/feature/lookup/autoload/docsets.el +++ b/modules/tools/lookup/autoload/docsets.el @@ -1,4 +1,4 @@ -;;; feature/lookup/autoload/docsets.el -*- lexical-binding: t; -*- +;;; tools/lookup/autoload/docsets.el -*- lexical-binding: t; -*- ;;;###if (featurep! +docsets) (defvar +lookup-docset-alist nil diff --git a/modules/feature/lookup/autoload/evil.el b/modules/tools/lookup/autoload/evil.el similarity index 77% rename from modules/feature/lookup/autoload/evil.el rename to modules/tools/lookup/autoload/evil.el index 16084bba435..da4925de845 100644 --- a/modules/feature/lookup/autoload/evil.el +++ b/modules/tools/lookup/autoload/evil.el @@ -1,7 +1,7 @@ -;;; feature/lookup/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;; tools/lookup/autoload/evil.el -*- lexical-binding: t; -*- +;;;###if (featurep! :editor evil) -;;;###autoload (autoload '+lookup:online "feature/lookup/autoload/evil" nil t) +;;;###autoload (autoload '+lookup:online "tools/lookup/autoload/evil" nil t) (evil-define-command +lookup:online (query &optional bang) "Look up QUERY online. Will prompt for search engine the first time, then reuse it on consecutive uses of this command. If BANG, always prompt for search @@ -9,7 +9,7 @@ engine." (interactive "") (+lookup/online query (+lookup--online-provider bang 'evil-ex))) -;;;###autoload (autoload '+lookup:dash "feature/lookup/autoload/evil" nil t) +;;;###autoload (autoload '+lookup:dash "tools/lookup/autoload/evil" nil t) (evil-define-command +lookup:dash (query &optional bang) "Look up QUERY in your dash docsets. If BANG, prompt to select a docset (and install it if necessary)." diff --git a/modules/feature/lookup/autoload/lookup.el b/modules/tools/lookup/autoload/lookup.el similarity index 96% rename from modules/feature/lookup/autoload/lookup.el rename to modules/tools/lookup/autoload/lookup.el index af4d30c852e..df58b3bec1b 100644 --- a/modules/feature/lookup/autoload/lookup.el +++ b/modules/tools/lookup/autoload/lookup.el @@ -1,4 +1,4 @@ -;;; feature/lookup/autoload/lookup.el -*- lexical-binding: t; -*- +;;; tools/lookup/autoload/lookup.el -*- lexical-binding: t; -*- (defvar +lookup--handler-alist nil) @@ -92,10 +92,7 @@ Otherwise, these properties are available to be set: (doom-log "Looking up '%s' with '%s'" identifier handler) (condition-case e (let ((plist (get handler '+lookup-plist))) - (cond ((plist-get plist :direct) - (+lookup--run-handler handler identifier) - t) - ((plist-get plist :async) + (cond ((plist-get plist :async) (when other-window ;; If async, we can't catch the window change or destination ;; buffer reliably, so we set up the new window ahead of time. @@ -321,9 +318,3 @@ DOCSETS is a list of docset strings. Docsets can be installed with ((featurep! :completion ivy) (counsel-dash query)) ((user-error "No dash backend is installed, enable ivy or helm."))))) - -(after! evil - (evil-set-command-property '+lookup/definition :jump t) - (evil-set-command-property '+lookup/references :jump t) - (evil-set-command-property '+lookup/documentation :jump t) - (evil-set-command-property '+lookup/file :jump t)) diff --git a/modules/feature/lookup/autoload/online.el b/modules/tools/lookup/autoload/online.el similarity index 97% rename from modules/feature/lookup/autoload/online.el rename to modules/tools/lookup/autoload/online.el index 8d088480f86..11a00517e3c 100644 --- a/modules/feature/lookup/autoload/online.el +++ b/modules/tools/lookup/autoload/online.el @@ -1,4 +1,4 @@ -;;; feature/lookup/autoload/online.el -*- lexical-binding: t; -*- +;;; tools/lookup/autoload/online.el -*- lexical-binding: t; -*- (defvar +lookup--last-provider nil) diff --git a/modules/feature/lookup/config.el b/modules/tools/lookup/config.el similarity index 98% rename from modules/feature/lookup/config.el rename to modules/tools/lookup/config.el index 701d9895976..43a0667db14 100644 --- a/modules/feature/lookup/config.el +++ b/modules/tools/lookup/config.el @@ -1,4 +1,4 @@ -;;; feature/lookup/config.el -*- lexical-binding: t; -*- +;;; tools/lookup/config.el -*- lexical-binding: t; -*- ;; "What am I looking at?" This module helps you answer this question. ;; diff --git a/modules/feature/lookup/packages.el b/modules/tools/lookup/packages.el similarity index 94% rename from modules/feature/lookup/packages.el rename to modules/tools/lookup/packages.el index c127ebbfcaf..d4a9361388e 100644 --- a/modules/feature/lookup/packages.el +++ b/modules/tools/lookup/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- -;;; feature/lookup/packages.el +;;; tools/lookup/packages.el ;; `dumb-jump' uses the `helm-build-sync-source' macro, but this requires helm ;; be loaded before it is byte-compiled during installation. To ensure this, we diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 7ad1b535074..706d95dfd7d 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -68,7 +68,7 @@ It is passed a user and repository name.") (def-package! evil-magit - :when (featurep! :feature evil +everywhere) + :when (featurep! :editor evil +everywhere) :after magit :init (setq evil-magit-state 'normal diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el index c02d5dcc7f3..c9e45de546a 100644 --- a/modules/tools/magit/packages.el +++ b/modules/tools/magit/packages.el @@ -5,5 +5,5 @@ (package! forge) (package! magit-gitflow) (package! magit-todos) - (when (featurep! :feature evil +everywhere) + (when (featurep! :editor evil +everywhere) (package! evil-magit))) diff --git a/modules/tools/tmux/autoload/evil.el b/modules/tools/tmux/autoload/evil.el index df32842905f..58fe5574f64 100644 --- a/modules/tools/tmux/autoload/evil.el +++ b/modules/tools/tmux/autoload/evil.el @@ -1,5 +1,5 @@ ;;; tools/tmux/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;;###if (featurep! :editor evil) ;;;###autoload (autoload '+tmux:run "tools/tmux/autoload/evil" nil t) (evil-define-command +tmux:run (bang &optional command) diff --git a/modules/tools/vterm/config.el b/modules/tools/vterm/config.el index 2751cfdfe0a..1c05141378f 100644 --- a/modules/tools/vterm/config.el +++ b/modules/tools/vterm/config.el @@ -11,7 +11,7 @@ ;; Automatically kill buffer when vterm exits. (add-to-list 'vterm-exit-functions (lambda (buffer) (if buffer (kill-buffer buffer)))) - (when (featurep! :feature evil) + (when (featurep! :editor evil) (evil-set-initial-state 'vterm-mode 'insert) ;; Go back to normal state but don't move cursor backwards. Moving cursor ;; backwards is the default Vim behavior but it is not appropriate in some diff --git a/modules/ui/modeline/config.el b/modules/ui/modeline/config.el index e66bdeebd8f..1ad7cef13c3 100644 --- a/modules/ui/modeline/config.el +++ b/modules/ui/modeline/config.el @@ -107,5 +107,5 @@ :after-call isearch-mode) (def-package! evil-anzu - :when (featurep! :feature evil) + :when (featurep! :editor evil) :after-call (evil-ex-start-search evil-ex-start-word-search)) diff --git a/modules/ui/modeline/packages.el b/modules/ui/modeline/packages.el index 5933333f49a..f01d2c78a16 100644 --- a/modules/ui/modeline/packages.el +++ b/modules/ui/modeline/packages.el @@ -3,5 +3,5 @@ (package! doom-modeline) (package! anzu) -(when (featurep! :feature evil) +(when (featurep! :editor evil) (package! evil-anzu)) diff --git a/modules/ui/nav-flash/config.el b/modules/ui/nav-flash/config.el index e84837bbb4d..7aa48b90888 100644 --- a/modules/ui/nav-flash/config.el +++ b/modules/ui/nav-flash/config.el @@ -8,7 +8,7 @@ (def-package! nav-flash :defer t :init - ;; NOTE In :feature lookup `recenter' is hooked to a bunch of jumping + ;; NOTE In :tools lookup `recenter' is hooked to a bunch of jumping ;; commands, which will trigger nav-flash. (add-hook! '(doom-switch-window-hook diff --git a/modules/ui/ophints/config.el b/modules/ui/ophints/config.el index 1382822d5bd..c448ca2fb5b 100644 --- a/modules/ui/ophints/config.el +++ b/modules/ui/ophints/config.el @@ -1,7 +1,7 @@ ;;; ui/ophints/config.el -*- lexical-binding: t; -*- (def-package! evil-goggles - :when (featurep! :feature evil) + :when (featurep! :editor evil) :after-call pre-command-hook :init (setq evil-goggles-duration 0.1 @@ -15,7 +15,7 @@ (def-package! volatile-highlights - :unless (featurep! :feature evil) + :unless (featurep! :editor evil) :after-call pre-command-hook :config (volatile-highlights-mode) diff --git a/modules/ui/ophints/packages.el b/modules/ui/ophints/packages.el index 44502c72700..f1ef7d8093a 100644 --- a/modules/ui/ophints/packages.el +++ b/modules/ui/ophints/packages.el @@ -1,6 +1,6 @@ ;; -*- no-byte-compile: t; -*- ;;; ui/ophints/packages.el -(if (featurep! :feature evil) +(if (featurep! :editor evil) (package! evil-goggles) (package! volatile-highlights)) diff --git a/modules/ui/popup/config.el b/modules/ui/popup/config.el index 6f7b308f5cd..8f9511f3905 100644 --- a/modules/ui/popup/config.el +++ b/modules/ui/popup/config.el @@ -42,7 +42,7 @@ adjustment.") (defvar +popup-buffer-mode-map (let ((map (make-sparse-keymap))) - (when (featurep! :feature evil) + (when (featurep! :editor evil) ;; For maximum escape coverage in emacs state buffers; this only works in ;; GUI Emacs, in tty Emacs use C-g instead (define-key map [escape] #'doom/escape)) diff --git a/modules/ui/treemacs/config.el b/modules/ui/treemacs/config.el index b45958886bd..a128aaf5be5 100644 --- a/modules/ui/treemacs/config.el +++ b/modules/ui/treemacs/config.el @@ -28,7 +28,7 @@ (def-package! treemacs-evil - :when (featurep! :feature evil +everywhere) + :when (featurep! :editor evil +everywhere) :after treemacs :config (define-key! evil-treemacs-state-map diff --git a/modules/ui/treemacs/packages.el b/modules/ui/treemacs/packages.el index 8d203580fda..7fb38f19a29 100644 --- a/modules/ui/treemacs/packages.el +++ b/modules/ui/treemacs/packages.el @@ -2,6 +2,6 @@ ;;; ui/treemacs/packages.el (package! treemacs) -(when (featurep! :feature evil +everywhere) +(when (featurep! :editor evil +everywhere) (package! treemacs-evil)) (package! treemacs-projectile) diff --git a/modules/ui/window-select/README.org b/modules/ui/window-select/README.org index 9d70524b25a..268ea151789 100644 --- a/modules/ui/window-select/README.org +++ b/modules/ui/window-select/README.org @@ -11,7 +11,7 @@ This module provides the user with a visual way to switch windows. By default, t - [[#switch-window][switch-window]] * Install -Add =:feature lookup= to your init.el. +Add =:tools lookup= to your init.el. ** Module flags This module provides two flags: diff --git a/modules/feature/workspaces/README.org b/modules/ui/workspaces/README.org similarity index 99% rename from modules/feature/workspaces/README.org rename to modules/ui/workspaces/README.org index 877280479e5..690d940ad03 100644 --- a/modules/feature/workspaces/README.org +++ b/modules/ui/workspaces/README.org @@ -1,4 +1,4 @@ -#+TITLE: :feature workspaces +#+TITLE: :ui workspaces This module adds support for workspaces, powered by persp_mode, as well as a API for manipulating them. diff --git a/modules/feature/workspaces/autoload/evil.el b/modules/ui/workspaces/autoload/evil.el similarity index 94% rename from modules/feature/workspaces/autoload/evil.el rename to modules/ui/workspaces/autoload/evil.el index a18d06f7400..3f5671e8332 100644 --- a/modules/feature/workspaces/autoload/evil.el +++ b/modules/ui/workspaces/autoload/evil.el @@ -1,5 +1,5 @@ -;;; feature/workspaces/autoload/evil.el -*- lexical-binding: t; -*- -;;;###if (featurep! :feature evil) +;;; ui/workspaces/autoload/evil.el -*- lexical-binding: t; -*- +;;;###if (featurep! :editor evil) ;;;###autoload (autoload '+workspace:save "feature/workspaces/autoload/evil" nil t) (evil-define-command +workspace:save (&optional name) diff --git a/modules/feature/workspaces/autoload/workspaces.el b/modules/ui/workspaces/autoload/workspaces.el similarity index 100% rename from modules/feature/workspaces/autoload/workspaces.el rename to modules/ui/workspaces/autoload/workspaces.el diff --git a/modules/feature/workspaces/config.el b/modules/ui/workspaces/config.el similarity index 99% rename from modules/feature/workspaces/config.el rename to modules/ui/workspaces/config.el index 2a7bc495a96..48a87382772 100644 --- a/modules/feature/workspaces/config.el +++ b/modules/ui/workspaces/config.el @@ -1,4 +1,4 @@ -;;; feature/workspaces/config.el -*- lexical-binding: t; -*- +;;; ui/workspaces/config.el -*- lexical-binding: t; -*- ;; `persp-mode' gives me workspaces, a workspace-restricted `buffer-list', and ;; file-based session persistence. I used workgroups2 before this, but abandoned diff --git a/modules/feature/workspaces/packages.el b/modules/ui/workspaces/packages.el similarity index 61% rename from modules/feature/workspaces/packages.el rename to modules/ui/workspaces/packages.el index f3c63aba6f9..9b9cb3ffed2 100644 --- a/modules/feature/workspaces/packages.el +++ b/modules/ui/workspaces/packages.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; -*- -;;; feature/workspaces/packages.el +;;; ui/workspaces/packages.el (package! persp-mode) diff --git a/modules/feature/workspaces/test/test-workspaces.el b/modules/ui/workspaces/test/test-workspaces.el similarity index 98% rename from modules/feature/workspaces/test/test-workspaces.el rename to modules/ui/workspaces/test/test-workspaces.el index 4e50901da7a..8c301c20256 100644 --- a/modules/feature/workspaces/test/test-workspaces.el +++ b/modules/ui/workspaces/test/test-workspaces.el @@ -1,7 +1,7 @@ ;; -*- no-byte-compile: t; -*- -;;; feature/workspaces/test/test-workspaces.el +;;; ui/workspaces/test/test-workspaces.el -(describe "feature/workspaces" +(describe "ui/workspaces" :var (persp-auto-resume-time persp-auto-save-opt persp-switch-to-added-buffer