diff --git a/core/core-ui.el b/core/core-ui.el index 5809a8ffe..289fc0416 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -71,7 +71,7 @@ disabled.") ;; window config undo/redo (defvar winner-dont-bind-my-keys t) (require 'winner) -(winner-mode 1) +(add-hook 'window-setup-hook 'winner-mode) ;; @@ -87,10 +87,8 @@ disabled.") (setq-default frame-title-format '("DOOM Emacs")) ;; standardize fringe width (fringe-mode doom-ui-fringe-size) - (setq default-frame-alist - (append `((left-fringe . ,doom-ui-fringe-size) - (right-fringe . ,doom-ui-fringe-size)) - default-frame-alist)) + (push (cons 'left-fringe doom-ui-fringe-size) default-frame-alist) + (push (cons 'right-fringe doom-ui-fringe-size) default-frame-alist) ;; no fringe in the minibuffer (@add-hook (emacs-startup minibuffer-setup) (set-window-fringes (minibuffer-window) 0 0 nil))) diff --git a/modules/feature/evil/autoload/files.el b/modules/feature/evil/autoload/files.el index e750e9a8d..2abfe2f00 100644 --- a/modules/feature/evil/autoload/files.el +++ b/modules/feature/evil/autoload/files.el @@ -6,7 +6,7 @@ :repeat nil ;; TODO Test me (interactive "") - (let* ((fname (file-truename (or fname (buffer-file-name)))) + (let* ((fname (file-truename (or filename (buffer-file-name)))) (fbase (file-name-sans-extension (file-name-nondirectory fname))) (buf (current-buffer))) (cond ((not (file-exists-p fname)) @@ -20,7 +20,7 @@ (delete-file fname) (if (file-exists-p fname) (error "Failed to delete %s" (file-relative-name fname)) - (doom/previous-real-buffer) + (doom/previous-buffer) (kill-buffer buf) (when (bound-and-true-p save-place-mode) (save-place-forget-unreadable-files)) diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el index 7885d96c4..ebe0a984f 100644 --- a/modules/feature/evil/config.el +++ b/modules/feature/evil/config.el @@ -44,6 +44,10 @@ (evil-mode +1) (evil-select-search-module 'evil-search-module 'evil-search) + (@set :popup + '("*evil-registers*" :size 0.3) + '("*Command Line*" :size 8)) + ;; Set cursor colors later, presumably once theme is loaded (@add-hook 'after-init-hook (setq evil-default-cursor (face-attribute 'cursor :background nil t) @@ -62,28 +66,16 @@ (add-hook 'evil-operator-state-exit-hook '+evil|show-paren-mode-off) (add-hook 'evil-normal-state-entry-hook '+evil|show-paren-mode-off) - (@set :popup - '("*evil-registers*" :size 0.3) - '("*Command Line*" :size 8)) - - (@set :evil-state - '(compilation-mode . normal) - '(help-mode . normal) - '(message-mode . normal) - '(debugger-mode . normal) - '(image-mode . normal) - '(doc-view-mode . normal) - '(eww-mode . normal) - '(tabulated-list-mode . emacs) - '(profile-report-mode . emacs) - '(Info-mode . emacs) - '(view-mode . emacs) - '(comint-mode . emacs) - '(cider-repl-mode . emacs) - '(term-mode . emacs) - '(calendar-mode . emacs) - '(Man-mode . emacs) - '(grep-mode . emacs))) + (mapc (lambda (args) (evil-set-initial-state (car args) (cdr args))) + '((tabulated-list-mode . emacs) + (profile-report-mode . emacs) + (Info-mode . emacs) + (view-mode . emacs) + (comint-mode . emacs) + (term-mode . emacs) + (calendar-mode . emacs) + (Man-mode . emacs) + (grep-mode . emacs)))) (defsubst +evil--textobj (key inner-fn &optional outer-fn) "Define a text object." @@ -250,7 +242,7 @@ (embrace-add-pair ?\` "`" "'")) (@add-hook (emacs-lisp-mode lisp-mode) (embrace-add-pair-regexp ?f "([^ ]+ " ")" '+evil--embrace-elisp-fn)) - (@add-hook (org-mode latex-mode) + (@add-hook (org-mode LaTeX-mode) (embrace-add-pair-regexp ?l "\\[a-z]+{" "}" '+evil--embrace-latex))) @@ -369,11 +361,10 @@ neotree-find neo-global--with-buffer neo-global--window-exists-p) - :init + :config (setq neo-create-file-auto-open t neo-auto-indent-point nil neo-mode-line-type 'none - neo-persist-show nil neo-window-width 25 neo-show-updir-line nil neo-theme 'nerd ; fallback @@ -391,7 +382,6 @@ "~$" "^#.*#$")) - :config (@set :evil-state 'neotree-mode 'motion) (push neo-buffer-name winner-boring-buffers) diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el index b06342e32..0c628468a 100644 --- a/modules/ui/doom-modeline/config.el +++ b/modules/ui/doom-modeline/config.el @@ -35,24 +35,24 @@ ;;; Flash the mode-line on error ;; TODO More flexible colors (only suits dark themes) ;; FIXME fast key-repeat can make the mode-line bg get stuck (rare) -(defvar doom--visual-bell-bg nil) +(defvar doom--visual-bell-old-bg nil) (setq ring-bell-function 'doom-visual-bell visible-bell nil) (defun doom-visual-bell () "Blink the mode-line red briefly." - (unless doom--visual-bell-bg - (setq doom--visual-bell-bg (face-attribute 'mode-line :background))) + (unless doom--visual-bell-old-bg + (setq doom--visual-bell-old-bg (face-attribute 'mode-line :background))) (set-face-attribute 'mode-line nil :background "#54252C") (run-with-timer 0.1 nil - (lambda () (set-face-attribute 'mode-line nil :background doom--visual-bell-bg)))) + (lambda () (set-face-attribute 'mode-line nil :background doom--visual-bell-old-bg)))) ;; Keep `+doom-modeline-current-window' up-to-date (defvar +doom-modeline-current-window (frame-selected-window)) (defun +doom-modeline|set-selected-window (&rest _) - "sets the variable `+doom-modeline-current-window` appropriately" - (when (not (minibuffer-window-active-p (frame-selected-window))) + "Sets `+doom-modeline-current-window' appropriately" + (unless (minibuffer-window-active-p (frame-selected-window)) (setq +doom-modeline-current-window (frame-selected-window)))) (add-hook 'window-configuration-change-hook '+doom-modeline|set-selected-window) diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el index c7d54bdf7..6e6dc051f 100644 --- a/modules/ui/doom/config.el +++ b/modules/ui/doom/config.el @@ -50,9 +50,9 @@ "Face to hightlight `hideshow' overlays." :group 'doom) - (nconc default-frame-alist - `((background-color . ,(face-background 'default)) - (foreground-color . ,(face-foreground 'default)))) + ;; Dark frames by default + (push (cons 'background-color (face-background 'default)) default-frame-alist) + (push (cons 'foreground-color (face-foreground 'default)) default-frame-alist) ;; brighter source buffers (defun +doom|buffer-mode-on ()