From 0e7254d3121967cfd4816f1bcd4302bb50299220 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 17 Apr 2017 02:20:07 -0400 Subject: [PATCH] General cleanup + refactor --- modules/app/present/autoload.el | 2 ++ modules/app/rss/config.el | 4 ++-- modules/completion/helm/config.el | 2 -- modules/completion/ivy/autoload/evil.el | 2 +- modules/feature/jump/config.el | 4 ++-- modules/feature/version-control/+git.el | 4 ++-- modules/feature/workspaces/autoload/workspaces.el | 8 +++++--- modules/lang/data/config.el | 11 ++++++++--- modules/lang/emacs-lisp/config.el | 8 +++----- modules/lang/org/config.el | 3 ++- modules/tools/eshell/config.el | 2 +- modules/ui/doom-modeline/config.el | 4 ++-- 12 files changed, 30 insertions(+), 24 deletions(-) diff --git a/modules/app/present/autoload.el b/modules/app/present/autoload.el index f17ae78ce..6bfe656e7 100644 --- a/modules/app/present/autoload.el +++ b/modules/app/present/autoload.el @@ -79,6 +79,8 @@ ;;;###autoload (define-minor-mode +present/big-mode + "A global mode that resizes the font, for streams, screen-sharing and +presentations." :init-value nil :lighter " BIG" :global t diff --git a/modules/app/rss/config.el b/modules/app/rss/config.el index 6f0bc75e1..b58253045 100644 --- a/modules/app/rss/config.el +++ b/modules/app/rss/config.el @@ -21,8 +21,8 @@ (def-package! elfeed :commands elfeed :config - (setq-default elfeed-search-filter "@2-week-ago ") - (setq elfeed-db-directory (concat doom-local-dir "elfeed/db/") + (setq elfeed-search-filter "@2-week-ago " + elfeed-db-directory (concat doom-local-dir "elfeed/db/") elfeed-enclosure-default-dir (concat doom-local-dir "elfeed/enclosures/") elfeed-show-entry-switch #'+rss-popup-pane elfeed-show-entry-delete #'+rss/delete-pane diff --git a/modules/completion/helm/config.el b/modules/completion/helm/config.el index 0e43c8547..eaf10b082 100644 --- a/modules/completion/helm/config.el +++ b/modules/completion/helm/config.el @@ -6,8 +6,6 @@ "The helm text prompt prefix string is globally replaced with this string.") - - ;; ;; Packages ;; diff --git a/modules/completion/ivy/autoload/evil.el b/modules/completion/ivy/autoload/evil.el index b24915e4f..f41d996f1 100644 --- a/modules/completion/ivy/autoload/evil.el +++ b/modules/completion/ivy/autoload/evil.el @@ -18,7 +18,7 @@ DIR specifies the default-directory from which ag is run." (if regex-p (rxt-quote-pcre str) str)))) +ivy--ag-last-search))) (setq +ivy--ag-last-search search) - (counsel-ag (if regex-p search (rxt-quote-pcre search)) + (counsel-ag (if regex-p search (regexp-quote search)) (or dir (doom-project-root)) (concat "--nocolor --nogroup" (if regex-p " -Q"))))) diff --git a/modules/feature/jump/config.el b/modules/feature/jump/config.el index 44d038699..66390de58 100644 --- a/modules/feature/jump/config.el +++ b/modules/feature/jump/config.el @@ -6,13 +6,13 @@ ;; you're looking at, with: ;; ;; 1. A dwim Jump-to-definition functionality that "just works", with the help -;; of `dumb-jump'. +;; of `dumb-jump' and `xref'. ;; 2. A dwim interface to the new (and experimental) xref API built into Emacs. ;; Once its API is more stable, backends could be written (or provided by ;; plugins) to create universal find-references and find-definition ;; functionality. Warning: xref may change drastically in future updates. ;; 3. Simple ways to look up the symbol at point in external resources, like -;; stackoverflow, devdocs.io or google. +;; stackoverflow, devdocs.io or google. See `+jump/online' (TODO Test me!) ;; 4. TODO Automatic and transparent integration with cscope databases and ctags ;; files. Databases are optionally isolated to the Emacs environment. diff --git a/modules/feature/version-control/+git.el b/modules/feature/version-control/+git.el index 9f5ceec8e..fcc696c24 100644 --- a/modules/feature/version-control/+git.el +++ b/modules/feature/version-control/+git.el @@ -2,8 +2,8 @@ (def-package! gitconfig-mode :mode "/\\.?git/?config$" - :mode "/\\.gitmodules$" - :init (add-hook 'gitconfig-mode-hook 'flyspell-mode)) + :mode "/\\.gitmodules$") + (def-package! gitignore-mode :mode "/\\.gitignore$") diff --git a/modules/feature/workspaces/autoload/workspaces.el b/modules/feature/workspaces/autoload/workspaces.el index 5049daa7a..7eaf7412a 100644 --- a/modules/feature/workspaces/autoload/workspaces.el +++ b/modules/feature/workspaces/autoload/workspaces.el @@ -10,7 +10,8 @@ (:background "#333333" :foreground "#000000")) ;; FIXME (((class color) (background dark)) (:background "#51afef" :foreground "#181e26"))) - "The face for selected tabs displayed by `+workspace/display'") + "The face for selected tabs displayed by `+workspace/display'" + :group 'doom) (defface +workspace-tab-face '((((class color) (background light)) @@ -19,7 +20,8 @@ (:background "#23272e" :foreground "#5B6268")) (((class color) (background dark)) (:background "#262626" :foreground "#525252"))) - "The face for selected tabs displayed by `+workspace/display'") + "The face for selected tabs displayed by `+workspace/display'" + :group 'doom) ;;;###autoload (defun +workspace-list () @@ -110,7 +112,7 @@ Otherwise return t on success, nil otherwise." "Rename the current workspace named NAME to NEW-NAME. Returns old name on success, nil otherwise." (when (+workspace-protected-p name) - (error "Can't rename '%s' workspace")) + (error "Can't rename '%s' workspace" name)) (persp-rename new-name (+workspace-get name))) ;;;###autoload diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el index e46e67c95..0fd18d370 100644 --- a/modules/lang/data/config.el +++ b/modules/lang/data/config.el @@ -15,13 +15,17 @@ (def-package! yaml-mode :mode "\\.ya?ml$") -(def-package! json-mode :mode "\\.js\\(on\\|[hl]int\\(rc\\)?\\)$" +(def-package! json-mode + :mode "\\.js\\(on\\|[hl]int\\(rc\\)?\\)$" :config (set! :electric 'json-mode :chars '(?\n ?: ?{ ?}))) (def-package! vimrc-mode - :mode ("/\\.?g?vimrc$" "\\.vim$" "/\\.?vimperatorrc$" "\\.vimp$")) + :mode "/\\.?g?vimrc$" + :mode "\\.vim$" + :mode "\\.?vimperatorrc$" + :mode "\\.vimp$") (def-package! dockerfile-mode @@ -35,7 +39,8 @@ ;; For ROM hacking or debugging (def-package! hexl-mode - :mode ("\\.hex$" "\\.nes$")) + :mode "\\.hex$" + :mode "\\.nes$") ;; diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el index 843c806e4..0916c8d89 100644 --- a/modules/lang/emacs-lisp/config.el +++ b/modules/lang/emacs-lisp/config.el @@ -44,7 +44,7 @@ ("Modes" "^\\s-*(define-\\(?:global\\(?:ized\\)?-minor\\|generic\\|minor\\)-mode +\\([^ ()\n]+\\)" 1) ("Macros" "^\\s-*(\\(?:cl-\\)?def\\(?:ine-compile-macro\\|macro\\) +\\([^ )\n]+\\)" 1) ("Inline Functions" "\\s-*(\\(?:cl-\\)?defsubst +\\([^ )\n]+\\)" 1) - ("Functions" "^\\s-*(\\(?:cl-\\)?def\\(?:un\\|un\\*\\|method\\|generic\\) +\\([^ )\n]+\\)" 1) + ("Functions" "^\\s-*(\\(?:cl-\\)?def\\(?:un\\|un\\*\\|method\\|generic\\|-memoized!\\) +\\([^ )\n]+\\)" 1) ("Variables" "^\\s-*(\\(def\\(?:c\\(?:onst\\(?:ant\\)?\\|ustom\\)\\|ine-symbol-macro\\|parameter\\)\\)\\s-+\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)" 2) ("Variables" "^\\s-*(defvar\\(?:-local\\)?\\s-+\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)[[:space:]\n]+[^)]" 1) ("Types" "^\\s-*(\\(cl-def\\(?:struct\\|type\\)\\|def\\(?:class\\|face\\|group\\|ine-\\(?:condition\\|error\\|widget\\)\\|package\\|struct\\|t\\(?:\\(?:hem\\|yp\\)e\\)\\)\\)\\s-+'?\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)" 2) @@ -76,10 +76,8 @@ version is loaded." (def-package! slime :config - (setq inferior-lisp-program "clisp" - ;; enable fuzzy matching in code buffer and SLIME REPL - slime-complete-symbol*-fancy t - slime-complete-symbol-function 'slime-fuzzy-complete-symbol)) + (setq inferior-lisp-program "clisp") + (require 'slime-fuzzy)) ;; diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index bd13e9c59..dbe2845ce 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -170,7 +170,8 @@ ;; Fontify checkboxes and dividers (defface org-list-bullet '((t (:inherit font-lock-keyword-face))) - "Face for list bullets") + "Face for list bullets" + :group 'doom) (font-lock-add-keywords 'org-mode '(("^ *\\([-+]\\|[0-9]+[).]\\) " (1 'org-list-bullet)) ("^ *\\(-----+\\)$" (1 'org-meta-line)))) diff --git a/modules/tools/eshell/config.el b/modules/tools/eshell/config.el index 91db80e94..4bb04b171 100644 --- a/modules/tools/eshell/config.el +++ b/modules/tools/eshell/config.el @@ -22,7 +22,7 @@ eshell-glob-case-insensitive t eshell-error-if-no-glob t ;; em-alias - eshell-aliases-file "~/.eshell-aliases") + eshell-aliases-file (concat doom-local-dir ".eshell-aliases")) :config (set! :popup "^\\*eshell:popup\\*$" :regexp t :size 25) diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el index 9a65474f1..1d28fbc8c 100644 --- a/modules/ui/doom-modeline/config.el +++ b/modules/ui/doom-modeline/config.el @@ -191,8 +191,8 @@ active." s))))) ;; Only support python and ruby for now -(add-hook! python-mode (setq +doom-modeline-env-command "python --version 2>&1 | cut -d' ' -f2")) -(add-hook! ruby-mode (setq +doom-modeline-env-command "ruby --version 2>&1 | cut -d' ' -f2")) +(add-hook! 'python-mode-hook (setq +doom-modeline-env-command "python --version 2>&1 | cut -d' ' -f2")) +(add-hook! 'ruby-mode-hook (setq +doom-modeline-env-command "ruby --version 2>&1 | cut -d' ' -f2")) ;;