Merge branch 'develop' of https://github.com/hlissner/doom-emacs into develop

modules/lang/nix/config.el

@@ -0,0 +1,4 @@
+;;; lang/nix/config.el -*- lexical-binding: t; -*-
+
+(def-package! nix-mode
+  :mode "\\.nix$")

modules/private/hlissner/+bindings.el

@@ -170,7 +170,7 @@
                                        :v  "r" #'+eval:repl)
 
    (:desc "file" :prefix "f"
-     :desc "File file"                 :n "." #'find-file
+     :desc "Find file"                 :n "." #'find-file
      :desc "Sudo find file"            :n ">" #'doom/sudo-find-file
      :desc "Find file in project"      :n "/" #'projectile-find-file
      :desc "Find file from here"       :n "?" #'counsel-file-jump

modules/tools/eshell/config.el

@@ -67,10 +67,6 @@ redefines its keys every time `eshell-mode' is enabled."
           [remap +workspace/close-window-or-workspace] #'eshell-life-is-too-much))
   (add-hook 'eshell-mode-hook #'+eshell|init-keymap)
 
-  (add-hook! eshell-mode
-    (add-hook 'evil-insert-state-exit-hook  #'hl-line-mode nil t)
-    (add-hook 'evil-insert-state-entry-hook (lambda () (hl-line-mode -1)) nil t))
-
   ;; Aliases
   (setq eshell-command-aliases-list
         '(("q"   "exit")

modules/ui/nav-flash/config.el

@@ -9,6 +9,8 @@
   (advice-add #'recenter :around #'+doom*blink-cursor-maybe)
 
   (after! evil
+    (advice-add #'evil--jumps-jump   :after #'+doom/blink-cursor)
+
     (advice-add #'evil-window-top    :after #'+doom/blink-cursor)
     (advice-add #'evil-window-middle :after #'+doom/blink-cursor)
     (advice-add #'evil-window-bottom :after #'+doom/blink-cursor)))

modules/ui/unicode/config.el

@@ -7,7 +7,7 @@
 
   (defun +unicode|init-fonts (&optional frame)
     "Initialize `unicode-fonts', if in a GUI session."
-    (when (display-graphic-p frame)
+    (when (and frame (display-graphic-p frame))
       (with-selected-frame frame
         (require 'unicode-fonts)
         ;; NOTE will impact startup time on first run