General cleanup

modules/defuns/defuns-eshell.el

@@ -1,5 +1,7 @@
 ;;; defuns-eshell.el
 
+(require 'eshell)
+
 (defun doom--eshell-in-prompt-p (&optional offset)
   (>= (- (point) (or offset 0)) (save-excursion (eshell-bol) (point))))
 
@@ -11,6 +13,16 @@
           (concat " [" (substring branch 2) "]")
         "")))
 
+;;;###autoload
+(defun doom/eshell (&optional same &rest _)
+  (interactive)
+  (let ((buf (get-buffer-create eshell-buffer-name)))
+    (cl-assert (and buf (buffer-live-p buf)))
+    (doom/popup-buffer buf)
+    (with-current-buffer buf
+      (unless (derived-mode-p 'eshell-mode)
+        (eshell-mode)))))
+
 ;;;###autoload
 (defun doom/eshell-prompt ()
   (concat (propertize (abbreviate-file-name (eshell/pwd)) 'face 'eshell-prompt)

modules/module-elisp.el

@@ -34,7 +34,7 @@
 
   (font-lock-add-keywords
    nil `(("(\\(lambda\\)" (1 (doom/show-as ?λ)))
-         ("(\\(\\(doom\\)\\([-:/|][^) ]*\\)?\\)[) ]" (1 font-lock-builtin-face))
+         ("(\\(\\(doom\\)\\([-:/|][^) ]*\\)?\\)[) \n]" (1 font-lock-builtin-face))
          ;; Highlight doom macros (macros are fontified in emacs 25+)
          (,(concat
             "(\\(def-"

modules/module-eshell.el

@@ -2,17 +2,15 @@
 
 (use-package eshell
   :when IS-WINDOWS
-  :defer t
   :init
-  (evil-set-initial-state 'eshell-mode 'normal)
+  (evil-set-initial-state 'eshell-mode 'emacs)
   (setq eshell-directory-name (concat doom-temp-dir "/eshell")
         eshell-scroll-to-bottom-on-input 'all
         eshell-buffer-shorthand t
-
         ;; em-glob
         eshell-glob-case-insensitive t
         eshell-error-if-no-glob t
-
+        eshell-where-to-jump 'end
         ;; em-alias
         eshell-aliases-file (concat doom-temp-dir "/.eshell-aliases"))
 
@@ -21,14 +19,12 @@
 
   ;; plan 9 smart shell
   (require 'em-smart)
-  (add-to-list 'eshell-modules-list 'eshell-smart)
+  (push 'eshell-smart eshell-modules-list)
   (setq eshell-where-to-jump 'begin)
   (setq eshell-review-quick-commands nil)
   (setq eshell-smart-space-goes-to-end t)
-
   ;; em-prompt
   (setq eshell-prompt-function 'doom/eshell-prompt)
-
   (map! :map eshell-mode-map
         :n "i" 'doom/eshell-evil-prepend-maybe
         :n "I" 'doom/eshell-evil-prepend

modules/module-haskell.el

@@ -6,8 +6,7 @@
          ("\\.cabal$" . haskell-cabal-mode))
   :interpreter (("runghc" . haskell-mode)
                 ("runhaskell" . haskell-mode))
-  :init
-  (add-hook! haskell-mode '(interactive-haskell-mode flycheck-mode))
+  :init (add-hook! haskell-mode '(interactive-haskell-mode flycheck-mode))
   :config
   (def-docset! haskell-mode ("Haskell"))
   (def-popup! "*debug:haskell*" :size 20)
@@ -16,8 +15,7 @@
 
 (use-package inf-haskell
   :commands (inferior-haskell-mode inf-haskell-mode switch-to-haskell)
-  :config
-  (map! :map inf-haskell-mode-map "ESC ESC" 'doom/popup-close))
+  :config (map! :map inf-haskell-mode-map "ESC ESC" 'doom/popup-close))
 
 (provide 'module-haskell)
 ;;; module-haskell.el ends here

modules/module-php.el

@@ -32,7 +32,6 @@
   :after php-mode
   :config
   (defun php-extras-company-setup ()) ;; company will set up itself
-
   ;; Generate php-extras documentation and completion asynchronously
   (unless (file-exists-p (concat php-extras-eldoc-functions-file ".el"))
     (async-start `(lambda ()

modules/module-processing.el

@@ -4,9 +4,7 @@
   :when IS-MAC
   :commands (processing-mode processing-find-sketch)
   :mode "\\.pde$"
-  :init
-  (add-hook 'processing-compilation-mode-hook 'doom|hide-mode-line)
-
+  :init (add-hook 'processing-compilation-mode-hook 'doom|hide-mode-line)
   :config
   (def-builder! processing-mode processing-sketch-build)
   (def-docset! processing-mode ("Processing"))

modules/module-rust.el

@@ -8,7 +8,8 @@
   (def-builder! toml-mode "cargo run" "Cargo.toml")
   (def-docset! rust-mode ("Rust")))
 
-(use-package flycheck-rust :after rust-mode)
+(use-package flycheck-rust
+  :after rust-mode)
 
 (use-package racer
   :after rust-mode