diff options
Diffstat (limited to 'init.el')
-rw-r--r-- | init.el | 54 |
1 files changed, 38 insertions, 16 deletions
diff --git a/init.el b/init.el index 2d907a0..2be6de0 100644 --- a/init.el +++ b/init.el | |||
@@ -573,7 +573,7 @@ | |||
573 | (:option org-adapt-indentation nil | 573 | (:option org-adapt-indentation nil |
574 | org-auto-align-tags t | 574 | org-auto-align-tags t |
575 | org-archive-mark-done t | 575 | org-archive-mark-done t |
576 | org-catch-invisible-edits 'show-and-error | 576 | org-fold-catch-invisible-edits 'show-and-error |
577 | org-clock-clocked-in-display 'mode-line | 577 | org-clock-clocked-in-display 'mode-line |
578 | org-clock-frame-title-format (cons | 578 | org-clock-frame-title-format (cons |
579 | '(t org-mode-line-string) | 579 | '(t org-mode-line-string) |
@@ -1054,17 +1054,25 @@ | |||
1054 | 1054 | ||
1055 | (setup (:straight (cape | 1055 | (setup (:straight (cape |
1056 | :host github :repo "minad/cape")) | 1056 | :host github :repo "minad/cape")) |
1057 | (dolist (fn | 1057 | (let |
1058 | ;; All available cape capfs listed here. Add them to the front since | 1058 | ;; All available cape capfs listed here. Add them to the front since |
1059 | ;; they're reversed with `add-to-list'. | 1059 | ;; they're reversed with `add-to-list'. |
1060 | '(cape-file | 1060 | ((append-fns '(cape-file |
1061 | cape-dabbrev | 1061 | cape-dabbrev |
1062 | cape-keyword | 1062 | cape-keyword)) |
1063 | ;;cape-abbrev | 1063 | (remove-fns '(cap-abbrev |
1064 | cape-ispell | 1064 | cape-ispell |
1065 | ;;cape-dict | 1065 | cape-dict))) |
1066 | )) | 1066 | (dolist (fn append-fns) |
1067 | (add-to-list 'completion-at-point-functions fn :append))) | 1067 | (add-to-list 'completion-at-point-functions fn :append)) |
1068 | (dolist (fn remove-fns) | ||
1069 | (setq completion-at-point-functions | ||
1070 | (delete fn completion-at-point-functions))) | ||
1071 | ;; Fix position of t | ||
1072 | (when (memq t completion-at-point-functions) | ||
1073 | (setq completion-at-point-functions | ||
1074 | (append (delq t completion-at-point-functions) | ||
1075 | '(t)))))) | ||
1068 | 1076 | ||
1069 | (setup (:straight circe) | 1077 | (setup (:straight circe) |
1070 | (:require _circe | 1078 | (:require _circe |
@@ -1170,7 +1178,8 @@ | |||
1170 | (advice-add #'circe-command-GQUIT :after #'+circe-gquit@kill-buffer) | 1178 | (advice-add #'circe-command-GQUIT :after #'+circe-gquit@kill-buffer) |
1171 | 1179 | ||
1172 | (:with-mode circe-chat-mode | 1180 | (:with-mode circe-chat-mode |
1173 | (:local-set lui-input-function #'+lui-filter) | 1181 | (:local-set lui-input-function #'+lui-filter |
1182 | +modeline-position-function 'empty) | ||
1174 | (:hook #'enable-circe-color-nicks | 1183 | (:hook #'enable-circe-color-nicks |
1175 | #'enable-circe-new-day-notifier | 1184 | #'enable-circe-new-day-notifier |
1176 | #'+circe-chat@set-prompt | 1185 | #'+circe-chat@set-prompt |
@@ -2040,7 +2049,17 @@ | |||
2040 | :foreground ,red-nuanced-fg))) | 2049 | :foreground ,red-nuanced-fg))) |
2041 | `(font-lock-todo-face ((,class :inherit font-lock-comment-face | 2050 | `(font-lock-todo-face ((,class :inherit font-lock-comment-face |
2042 | :foreground ,fg-header | 2051 | :foreground ,fg-header |
2043 | :background ,yellow-intense-bg))))))) | 2052 | :background ,yellow-intense-bg)))) |
2053 | ;; Major mode in the mode-line | ||
2054 | (defface +modeline-text-mode-face `((,class ( :foreground ,blue | ||
2055 | :inherit modus-themes-bold))) | ||
2056 | "Text-mode major mode face.") | ||
2057 | (defface +modeline-prog-mode-face `((,class ( :foreground ,magenta | ||
2058 | :inherit modus-themes-bold))) | ||
2059 | "Prog-mode major mode face.") | ||
2060 | (:option +modeline-major-mode-faces `((text-mode . +modeline-text-mode-face) | ||
2061 | (prog-mode . +modeline-prog-mode-face) | ||
2062 | (t . bold)))))) | ||
2044 | 2063 | ||
2045 | (require 'dawn) | 2064 | (require 'dawn) |
2046 | (dawn-schedule #'modus-themes-load-operandi | 2065 | (dawn-schedule #'modus-themes-load-operandi |
@@ -2265,7 +2284,7 @@ | |||
2265 | +modeline-position | 2284 | +modeline-position |
2266 | +modeline-major-mode | 2285 | +modeline-major-mode |
2267 | +modeline-file-percentage | 2286 | +modeline-file-percentage |
2268 | ))) | 2287 | +modeline-spacer))) |
2269 | (simple-modeline-mode +1)) | 2288 | (simple-modeline-mode +1)) |
2270 | 2289 | ||
2271 | (setup (:straight slack) | 2290 | (setup (:straight slack) |
@@ -2376,7 +2395,10 @@ | |||
2376 | (define-key +key-mode-map (kbd "C-x 5 t") +transpose-frame-map)) | 2395 | (define-key +key-mode-map (kbd "C-x 5 t") +transpose-frame-map)) |
2377 | 2396 | ||
2378 | (setup (:straight trashed) | 2397 | (setup (:straight trashed) |
2379 | (:option trashed-action-confirmer #'y-or-n-p)) | 2398 | (:+leader "t" #'trashed) |
2399 | (:option trashed-action-confirmer #'y-or-n-p | ||
2400 | trashed-use-header-line t | ||
2401 | trashed-size-format 'human-readable)) | ||
2380 | 2402 | ||
2381 | (setup (:straight undo-fu) | 2403 | (setup (:straight undo-fu) |
2382 | (:option undo-fu-allow-undo-in-region t) | 2404 | (:option undo-fu-allow-undo-in-region t) |