diff --git a/config.el b/config.el index 0dccbed..dd4fee9 100644 --- a/config.el +++ b/config.el @@ -56,15 +56,19 @@ (avy-lead-face-2-fg (internal-get-lisp-face-attribute 'avy-lead-face-2 :background))) (custom-theme-set-faces! 'doom-one - `(avy-lead-face :foreground ,avy-lead-face-fg - :background nil - :weight bold) - `(avy-lead-face-0 :foreground ,avy-lead-face-0-fg - :inherit avy-lead-face) - `(avy-lead-face-1 :foreground ,avy-lead-face-1-fg - :inherit avy-lead-face) - `(avy-lead-face-2 :foreground ,avy-lead-face-2-fg - :inherit avy-lead-face)))) + `(avy-lead-face + :foreground ,avy-lead-face-fg + :background nil + :weight bold) + `(avy-lead-face-0 + :foreground ,avy-lead-face-0-fg + :inherit avy-lead-face) + `(avy-lead-face-1 + :foreground ,avy-lead-face-1-fg + :inherit avy-lead-face) + `(avy-lead-face-2 + :foreground ,avy-lead-face-2-fg + :inherit avy-lead-face)))) (after! symbol-overlay (custom-theme-set-faces! nil '(symbol-overlay-default-face :inherit hl-line))) @@ -285,11 +289,11 @@ ;; The only thing I actually missed from helm. (map! (:when (featurep! :completion vertico) - :map vertico-map - "C-l" (defun +x-vertico/directory-delete-one-word () - "Delete one directory or word before point." - (interactive) - (vertico-directory-delete-word 1)))) + :map vertico-map + "C-l" (defun +x-vertico/directory-delete-one-word () + "Delete one directory or word before point." + (interactive) + (vertico-directory-delete-word 1)))) ;; Extra VTerm configuration. (after! vterm @@ -298,18 +302,18 @@ (map! :leader (:prefix-map ("o" . "open") - (:when (featurep! :term vterm) - :desc "Project VTerm" "p" #'+vterm/project/other-window - :desc "Project VTerm (same window)" "P" #'+vterm/project/here - :desc "VTerm" "t" #'+vterm/other-window - :desc "VTerm (same window)" "T" #'+vterm/here))) + (:when (featurep! :term vterm) + :desc "Project VTerm" "p" #'+vterm/project/other-window + :desc "Project VTerm (same window)" "P" #'+vterm/project/here + :desc "VTerm" "t" #'+vterm/other-window + :desc "VTerm (same window)" "T" #'+vterm/here))) ;; Tab key should indent and absolutely nothing more. (after! yasnippet (map! (:map yas-minor-mode-map - "" nil - "TAB" nil - "" #'yas-expand))) + "" nil + "TAB" nil + "" #'yas-expand))) ;; ----------------------------------------------------------------------------- ;; Configuration for additional packages on top of doom and its modules. @@ -330,11 +334,11 @@ (read-directory-name "Base directory: " nil default-directory t))) :config (map! (:map deadgrep-mode-map - "C-o" (defun +x-deadgrep/open-result-other-window () - "Open the result in other window without changing to it." - (interactive) - (save-selected-window (deadgrep-visit-result-other-window))) - "RET" #'deadgrep-visit-result-other-window))) + "C-o" (defun +x-deadgrep/open-result-other-window () + "Open the result in other window without changing to it." + (interactive) + (save-selected-window (deadgrep-visit-result-other-window))) + "RET" #'deadgrep-visit-result-other-window))) ;; Duplicate things. (use-package! duplicate-thing @@ -442,7 +446,7 @@ (error "No file on this line")))) (map! (:map dired-mode-map - "W" #'+x/browse-url-of-dired-file))) + "W" #'+x/browse-url-of-dired-file))) ;; ----------------------------------------------------------------------------- ;; Global keybindings. @@ -455,7 +459,7 @@ "C->" #'+x/scroll-up-one "M-Q" #'+x/unfill-paragraph (:map org-mode-map - "C-c C-;" #'+x/org-insert-link-with-title) + "C-c C-;" #'+x/org-insert-link-with-title) ;; Faster navigation with avy. "M-g M-c" #'avy-goto-char "M-g M-v" #'avy-goto-char-2 @@ -465,7 +469,7 @@ "M-g M-t" #'avy-goto-char-timer "M-g M-j" #'avy-resume (:map isearch-mode-map - "C-'" #'avy-isearch) + "C-'" #'avy-isearch) ;; Create binding before dired is loaded. "C-x C-j" #'dired-jump ;; More convenient window switching.