about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--init.el54
-rw-r--r--lisp/+emacs.el2
2 files changed, 39 insertions, 17 deletions
diff --git a/init.el b/init.el index 8ad68b3..9819ca6 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)
@@ -1048,17 +1048,25 @@
1048 1048
1049(setup (:straight (cape 1049(setup (:straight (cape
1050 :host github :repo "minad/cape")) 1050 :host github :repo "minad/cape"))
1051 (dolist (fn 1051 (let
1052 ;; All available cape capfs listed here. Add them to the front since 1052 ;; All available cape capfs listed here. Add them to the front since
1053 ;; they're reversed with `add-to-list'. 1053 ;; they're reversed with `add-to-list'.
1054 '(cape-file 1054 ((append-fns '(cape-file
1055 cape-dabbrev 1055 cape-dabbrev
1056 cape-keyword 1056 cape-keyword))
1057 ;;cape-abbrev 1057 (remove-fns '(cap-abbrev
1058 cape-ispell 1058 cape-ispell
1059 ;;cape-dict 1059 cape-dict)))
1060 )) 1060 (dolist (fn append-fns)
1061 (add-to-list 'completion-at-point-functions fn :append))) 1061 (add-to-list 'completion-at-point-functions fn :append))
1062 (dolist (fn remove-fns)
1063 (setq completion-at-point-functions
1064 (delete fn completion-at-point-functions)))
1065 ;; Fix position of t
1066 (when (memq t completion-at-point-functions)
1067 (setq completion-at-point-functions
1068 (append (delq t completion-at-point-functions)
1069 '(t))))))
1062 1070
1063(setup (:straight circe) 1071(setup (:straight circe)
1064 (:require _circe 1072 (:require _circe
@@ -1164,7 +1172,8 @@
1164 (advice-add #'circe-command-GQUIT :after #'+circe-gquit@kill-buffer) 1172 (advice-add #'circe-command-GQUIT :after #'+circe-gquit@kill-buffer)
1165 1173
1166 (:with-mode circe-chat-mode 1174 (:with-mode circe-chat-mode
1167 (:local-set lui-input-function #'+lui-filter) 1175 (:local-set lui-input-function #'+lui-filter
1176 +modeline-position-function 'empty)
1168 (:hook #'enable-circe-color-nicks 1177 (:hook #'enable-circe-color-nicks
1169 #'enable-circe-new-day-notifier 1178 #'enable-circe-new-day-notifier
1170 #'+circe-chat@set-prompt 1179 #'+circe-chat@set-prompt
@@ -2034,7 +2043,17 @@
2034 :foreground ,red-nuanced-fg))) 2043 :foreground ,red-nuanced-fg)))
2035 `(font-lock-todo-face ((,class :inherit font-lock-comment-face 2044 `(font-lock-todo-face ((,class :inherit font-lock-comment-face
2036 :foreground ,fg-header 2045 :foreground ,fg-header
2037 :background ,yellow-intense-bg))))))) 2046 :background ,yellow-intense-bg))))
2047 ;; Major mode in the mode-line
2048 (defface +modeline-text-mode-face `((,class ( :foreground ,blue
2049 :inherit modus-themes-bold)))
2050 "Text-mode major mode face.")
2051 (defface +modeline-prog-mode-face `((,class ( :foreground ,magenta
2052 :inherit modus-themes-bold)))
2053 "Prog-mode major mode face.")
2054 (:option +modeline-major-mode-faces `((text-mode . +modeline-text-mode-face)
2055 (prog-mode . +modeline-prog-mode-face)
2056 (t . bold))))))
2038 2057
2039 (require 'dawn) 2058 (require 'dawn)
2040 (dawn-schedule #'modus-themes-load-operandi 2059 (dawn-schedule #'modus-themes-load-operandi
@@ -2259,7 +2278,7 @@
2259 +modeline-position 2278 +modeline-position
2260 +modeline-major-mode 2279 +modeline-major-mode
2261 +modeline-file-percentage 2280 +modeline-file-percentage
2262 ))) 2281 +modeline-spacer)))
2263 (simple-modeline-mode +1)) 2282 (simple-modeline-mode +1))
2264 2283
2265(setup (:straight slack) 2284(setup (:straight slack)
@@ -2370,7 +2389,10 @@
2370 (define-key +key-mode-map (kbd "C-x 5 t") +transpose-frame-map)) 2389 (define-key +key-mode-map (kbd "C-x 5 t") +transpose-frame-map))
2371 2390
2372(setup (:straight trashed) 2391(setup (:straight trashed)
2373 (:option trashed-action-confirmer #'y-or-n-p)) 2392 (:+leader "t" #'trashed)
2393 (:option trashed-action-confirmer #'y-or-n-p
2394 trashed-use-header-line t
2395 trashed-size-format 'human-readable))
2374 2396
2375(setup (:straight undo-fu) 2397(setup (:straight undo-fu)
2376 (:option undo-fu-allow-undo-in-region t) 2398 (:option undo-fu-allow-undo-in-region t)
diff --git a/lisp/+emacs.el b/lisp/+emacs.el index a0627cf..7851c43 100644 --- a/lisp/+emacs.el +++ b/lisp/+emacs.el
@@ -297,7 +297,7 @@ ARG is passed to `backward-kill-word'."
297 ("C-r" . isearch-backward-regexp) 297 ("C-r" . isearch-backward-regexp)
298 ("C-M-s" . isearch-forward) 298 ("C-M-s" . isearch-forward)
299 ("C-M-r" . isearch-backward))) 299 ("C-M-r" . isearch-backward)))
300 (define-key +key-mode-map (kbd (car binding)) (cdr binding))) 300 (define-key (current-global-map) (kbd (car binding)) (cdr binding)))
301 301
302 302
303;;; Required libraries 303;;; Required libraries