diff --git a/core/core-company.el b/core/core-company.el index f3aaccc48..bc1165d8d 100644 --- a/core/core-company.el +++ b/core/core-company.el @@ -30,16 +30,14 @@ (define-key company-active-map "\C-w" nil) - (global-company-mode +1)) + (global-company-mode +1) -;; NOTE: Doesn't look pretty outside of emacs-mac -(use-package company-quickhelp - :after company - :config (company-quickhelp-mode +1)) + ;; NOTE: Doesn't look pretty outside of emacs-mac + (require 'company-quickhelp) + (company-quickhelp-mode +1) -(use-package company-statistics - :after company - :config (company-statistics-mode +1)) + (require 'company-statistics) + (company-statistics-mode +1)) (use-package company-dabbrev :commands company-dabbrev) (use-package company-dabbrev-code :commands company-dabbrev-code) diff --git a/core/core-flycheck.el b/core/core-flycheck.el index 3a5d4a9f1..9f1b0afa3 100644 --- a/core/core-flycheck.el +++ b/core/core-flycheck.el @@ -7,7 +7,10 @@ ;; Removed checks on idle/change for snappiness flycheck-check-syntax-automatically '(save mode-enabled) flycheck-highlighting-mode 'symbols - flycheck-disabled-checkers '(emacs-lisp emacs-lisp-checkdoc make)) + flycheck-disabled-checkers '(emacs-lisp emacs-lisp-checkdoc make) + ;; `flycheck-pos-tip' + flycheck-pos-tip-timeout 10 + flycheck-display-errors-delay 0.5) :config (def-popup! " ?\\*Flycheck.+\\*" :align below :size 14 :noselect t :regexp t) @@ -23,19 +26,14 @@ (advice-add 'evil-force-normal-state :after 'doom*flycheck-buffer) (define-fringe-bitmap 'flycheck-fringe-bitmap-double-arrow - [0 0 0 0 0 4 12 28 60 124 252 124 60 28 12 4 0 0 0 0])) + [0 0 0 0 0 4 12 28 60 124 252 124 60 28 12 4 0 0 0 0]) -(use-package flycheck-package - :after flycheck - :config (flycheck-package-setup)) + (require 'flycheck-package) + (flycheck-package-setup) -(use-package flycheck-pos-tip - :when (eq window-system 'mac) ; NOTE emacs-mac, not ns - :after flycheck - :config - (setq flycheck-pos-tip-timeout 10 - flycheck-display-errors-delay 0.5) - (flycheck-pos-tip-mode +1)) + (when (eq window-system 'mac) + (require 'flycheck-pos-tip) + (flycheck-pos-tip-mode +1))) (use-package flyspell :commands flyspell-mode) diff --git a/core/core-helm.el b/core/core-helm.el index 45ce65770..0068d8b92 100644 --- a/core/core-helm.el +++ b/core/core-helm.el @@ -1,7 +1,6 @@ ;;; core-helm.el (use-package helm - :commands (helm helm-other-buffer) :init (setq helm-quick-update t ;; Speedier without fuzzy matching @@ -51,11 +50,10 @@ ;; A simpler prompt: see `helm-global-prompt' (advice-add 'helm :filter-args 'doom*helm-replace-prompt) ;; Hide mode-line in helm windows - (advice-add 'helm-display-mode-line :override 'doom*helm-hide-header)) + (advice-add 'helm-display-mode-line :override 'doom*helm-hide-header) -(use-package helm-mode - :after helm - :config (helm-mode 1)) + (require 'helm-mode) + (helm-mode +1)) (use-package helm-locate :defer t @@ -82,7 +80,9 @@ helm-projectile-find-dir) :init (defvar helm-projectile-find-file-map (make-sparse-keymap)) - (set-keymap-parent helm-projectile-find-file-map helm-map)) + :config + (set-keymap-parent helm-projectile-find-file-map helm-map) + (setq projectile-completion-system 'helm)) (use-package helm-files :commands (helm-browse-project helm-find helm-find-files helm-for-files helm-multi-files helm-recentf) diff --git a/core/core-popup.el b/core/core-popup.el index 8a38c5e93..181966002 100644 --- a/core/core-popup.el +++ b/core/core-popup.el @@ -16,7 +16,8 @@ ("*minor-modes*" :align below :size 0.5 :noselect t) ("*eval*" :align below :size 16 :noselect t) ;; Doom - ("*doom*" :align below :size 35 :select t) + (" *doom*" :align below :size 35 :select t) + ("^\\*doom:.+\\*$" :align below :size 35 :select t :regexp t) ("^\\*doom.+\\*$" :align below :size 12 :noselect t :regexp t) ;; Emacs ("*Pp Eval Output*" :align below :size 0.3) diff --git a/core/core-project.el b/core/core-project.el index 9dcdd91d9..52682e0ad 100644 --- a/core/core-project.el +++ b/core/core-project.el @@ -146,10 +146,8 @@ (apply orig-fun args))) (advice-add 'projectile-cache-current-file :around 'doom*projectile-cache-current-file) - (push "ido.last" projectile-globally-ignored-files) (push "assets" projectile-globally-ignored-directories) (push ".cask" projectile-globally-ignored-directories) - (push ".elc" projectile-globally-ignored-file-suffixes) (push doom-temp-dir projectile-globally-ignored-directories) diff --git a/core/core-scratch.el b/core/core-scratch.el index bf9ba47f7..5ede7fa91 100644 --- a/core/core-scratch.el +++ b/core/core-scratch.el @@ -8,7 +8,7 @@ (defvar doom-buffer nil "The global and persistent scratch buffer for doom.") -(defvar doom-buffer-name "*doom*" +(defvar doom-buffer-name " *doom*" "The name of the doom scratch buffer.") (defvar doom-buffer-edited nil "If non-nil, the scratch buffer has been edited.") diff --git a/core/core.el b/core/core.el index 5a68da7c5..a0384e044 100644 --- a/core/core.el +++ b/core/core.el @@ -19,13 +19,13 @@ (defalias '! 'eval-when-compile) -(defconst doom-emacs-dir (! (expand-file-name user-emacs-directory))) -(defconst doom-core-dir (! (expand-file-name "core" doom-emacs-dir))) -(defconst doom-modules-dir (! (expand-file-name "modules" doom-emacs-dir))) -(defconst doom-private-dir (! (expand-file-name "private" doom-emacs-dir))) -(defconst doom-packages-dir (! (expand-file-name (concat ".cask/" emacs-version "/elpa") doom-emacs-dir))) -(defconst doom-ext-dir (! (expand-file-name "ext" doom-emacs-dir))) -(defconst doom-themes-dir (! (expand-file-name "themes" doom-private-dir))) +(defconst doom-emacs-dir (! (expand-file-name user-emacs-directory))) +(defconst doom-core-dir (! (expand-file-name "core" doom-emacs-dir))) +(defconst doom-modules-dir (! (expand-file-name "modules" doom-emacs-dir))) +(defconst doom-private-dir (! (expand-file-name "private" doom-emacs-dir))) +(defconst doom-packages-dir (! (expand-file-name (concat ".cask/" emacs-version "/elpa") doom-emacs-dir))) +(defconst doom-ext-dir (! (expand-file-name "ext" doom-emacs-dir))) +(defconst doom-themes-dir (! (expand-file-name "themes" doom-private-dir))) (defconst doom-temp-dir (! (format "%s/cache/%s" doom-private-dir (system-name))) "Hostname-based elisp temp directories") diff --git a/core/defuns/defuns-ui.el b/core/defuns/defuns-ui.el index 7435ff4e8..9fe47febb 100644 --- a/core/defuns/defuns-ui.el +++ b/core/defuns/defuns-ui.el @@ -91,6 +91,9 @@ (put 'doom-hide-mode-line-mode 'permanent-local t) (put 'doom--mode-line 'permanent-local t) +(defvar doom-hide-mode-line-format nil + "Format to use when `doom-hide-mode-line-mode' replaces the modeline") + (defvar-local doom--mode-line nil) ;;;###autoload (define-minor-mode doom-hide-mode-line-mode @@ -99,9 +102,9 @@ :global nil (if doom-hide-mode-line-mode (setq doom--mode-line mode-line-format - mode-line-format nil) + mode-line-format doom-hide-mode-line-format) (setq mode-line-format doom--mode-line - doom--mode-line nil))) + doom--mode-line doom-hide-mode-line-format))) (provide 'defuns-ui) ;;; defuns-ui.el ends here diff --git a/modules/module-lua.el b/modules/module-lua.el index fa12cc641..52ac5585a 100644 --- a/modules/module-lua.el +++ b/modules/module-lua.el @@ -8,8 +8,7 @@ (def-company-backend! lua-mode (lua yasnippet)) (def-electric! lua-mode :words ("else" "end")) (def-repl! lua-mode doom/inf-lua) - (add-hook! lua-mode - (setq-local sp-max-pair-length 9)) + (add-hook! lua-mode (setq-local sp-max-pair-length 9)) (sp-with-modes '(lua-mode) ;; disable defaults (sp-local-pair "if" nil :actions :rem)