diff options
author | Case Duckworth | 2022-01-11 16:01:03 -0600 |
---|---|---|
committer | Case Duckworth | 2022-01-11 16:01:03 -0600 |
commit | e4f7ed9609d85f80f3f54dae7485f06a49fc4d3c (patch) | |
tree | f45f690e7c720177e359ad4a5d4f2f015f011103 /init.el | |
parent | Merge branch 'main' of https://tildegit.org/acdw/emacs (diff) | |
download | emacs-e4f7ed9609d85f80f3f54dae7485f06a49fc4d3c.tar.gz emacs-e4f7ed9609d85f80f3f54dae7485f06a49fc4d3c.zip |
Lots o changes at work
I need to fix +circe-define-filter or something
Diffstat (limited to 'init.el')
-rw-r--r-- | init.el | 59 |
1 files changed, 44 insertions, 15 deletions
diff --git a/init.el b/init.el index 74d08a6..ca888da 100644 --- a/init.el +++ b/init.el | |||
@@ -163,7 +163,6 @@ | |||
163 | "imgur.com" | 163 | "imgur.com" |
164 | "pixelfed" "instagram.com" "bibliogram.art" | 164 | "pixelfed" "instagram.com" "bibliogram.art" |
165 | "reddit.com" "teddit.net" | 165 | "reddit.com" "teddit.net" |
166 | "tildes.net" | ||
167 | "taskiq" | 166 | "taskiq" |
168 | "twitter.com" "nitter.net" | 167 | "twitter.com" "nitter.net" |
169 | "streamable.com" | 168 | "streamable.com" |
@@ -402,7 +401,12 @@ | |||
402 | ;; context-menu-region | 401 | ;; context-menu-region |
403 | ;; context-menu-undo | 402 | ;; context-menu-undo |
404 | ;; context-menu-dictionary)) | 403 | ;; context-menu-dictionary)) |
405 | (context-menu-mode +1))) | 404 | (context-menu-mode +1)) |
405 | (dolist (click '( ; Fix scrolling in the margin | ||
406 | wheel-down double-wheel-down triple-wheel-down | ||
407 | wheel-up double-wheel-up triple-wheel-up)) | ||
408 | (global-set-key (vector 'right-margin click) 'mwheel-scroll) | ||
409 | (global-set-key (vector 'left-margin click) 'mwheel-scroll))) | ||
406 | 410 | ||
407 | (setup org | 411 | (setup org |
408 | ;; Plain org with the `setup' form for sorting, but I install with straight. | 412 | ;; Plain org with the `setup' form for sorting, but I install with straight. |
@@ -566,9 +570,21 @@ | |||
566 | (:option shr-width (- fill-column 5) ; pad out for wide letters | 570 | (:option shr-width (- fill-column 5) ; pad out for wide letters |
567 | shr-use-fonts t)) | 571 | shr-use-fonts t)) |
568 | 572 | ||
573 | (setup tab-bar | ||
574 | (:require +tab-bar) | ||
575 | (:option tab-bar-tab-name-function '+tab-bar-tab-name-truncated-left | ||
576 | tab-bar-tab-name-truncated-max 20 | ||
577 | tab-bar-tab-name-ellipsis truncate-string-ellipsis) | ||
578 | (tab-bar-mode +1) | ||
579 | (+tab-bar-misc-info-mode +1)) | ||
580 | |||
569 | (setup text | 581 | (setup text |
570 | (:hook #'turn-on-auto-fill)) | 582 | (:hook #'turn-on-auto-fill)) |
571 | 583 | ||
584 | (setup time | ||
585 | (:option display-time-format "%H:%M") | ||
586 | (display-time-mode +1)) | ||
587 | |||
572 | (setup (:straight 0x0) | 588 | (setup (:straight 0x0) |
573 | (:option 0x0-default-server 'ttm) | 589 | (:option 0x0-default-server 'ttm) |
574 | (with-eval-after-load 'embark | 590 | (with-eval-after-load 'embark |
@@ -746,7 +762,7 @@ | |||
746 | #'+circe-F/C-mode | 762 | #'+circe-F/C-mode |
747 | ;; For some reason `+circe-shorten-url-mode' won't work right out of | 763 | ;; For some reason `+circe-shorten-url-mode' won't work right out of |
748 | ;; the gate. | 764 | ;; the gate. |
749 | (lambda () (run-with-idle-timer 0.25 nil #'+circe-shorten-url-mode))) | 765 | (lambda () (run-at-time 0.25 nil #'+circe-shorten-url-mode))) |
750 | (:bind "C-c C-s" #'circe-command-SLAP)) | 766 | (:bind "C-c C-s" #'circe-command-SLAP)) |
751 | 767 | ||
752 | (:with-mode lui-mode | 768 | (:with-mode lui-mode |
@@ -774,13 +790,23 @@ | |||
774 | (:local-set fringes-outside-margins t | 790 | (:local-set fringes-outside-margins t |
775 | right-margin-width (length lui-time-stamp-format) | 791 | right-margin-width (length lui-time-stamp-format) |
776 | scroll-margin 0 | 792 | scroll-margin 0 |
793 | scroll-step 1 | ||
777 | word-wrap t | 794 | word-wrap t |
778 | wrap-prefix (+string-repeat +circe-left-margin " ") | 795 | wrap-prefix (+string-repeat +circe-left-margin " ") |
779 | line-number-mode nil | 796 | line-number-mode nil |
780 | column-number-mode nil | 797 | column-number-mode nil |
781 | file-percentage-mode nil | 798 | file-percentage-mode nil |
782 | visual-fill-column-extra-text-width | 799 | visual-fill-column-extra-text-width |
783 | (cons +circe-left-margin 0))) | 800 | (cons +circe-left-margin 0)) |
801 | (with-eval-after-load 'vertico-multiform | ||
802 | (setf (alist-get 'lui-next-button-or-complete vertico-multiform-commands) | ||
803 | '(flat)))) | ||
804 | |||
805 | (:with-mode tracking-mode | ||
806 | (:option tracking-position 'before-modes) | ||
807 | (add-to-list 'mode-line-misc-info | ||
808 | '(tracking-mode | ||
809 | tracking-mode-line-buffers))) | ||
784 | 810 | ||
785 | (with-eval-after-load 'topsy | 811 | (with-eval-after-load 'topsy |
786 | (:option (append topsy-mode-functions) | 812 | (:option (append topsy-mode-functions) |
@@ -942,6 +968,7 @@ See also `crux-reopen-as-root-mode'." | |||
942 | elfeed-search-trailing-width 24 | 968 | elfeed-search-trailing-width 24 |
943 | elfeed-search-title-min-width 24 | 969 | elfeed-search-title-min-width 24 |
944 | elfeed-search-title-max-width 78 | 970 | elfeed-search-title-max-width 78 |
971 | elfeed-search-remain-on-entry t | ||
945 | elfeed-show-unique-buffers t | 972 | elfeed-show-unique-buffers t |
946 | elfeed-db-directory (elfeed/ "db/" t) | 973 | elfeed-db-directory (elfeed/ "db/" t) |
947 | elfeed-log 'debug ; until I can figure out syncing... | 974 | elfeed-log 'debug ; until I can figure out syncing... |
@@ -1047,7 +1074,9 @@ See also `crux-reopen-as-root-mode'." | |||
1047 | (:option flyspell-correct--cr-key ";") | 1074 | (:option flyspell-correct--cr-key ";") |
1048 | (:bind-into flyspell | 1075 | (:bind-into flyspell |
1049 | "C-;" #'flyspell-correct-wrapper | 1076 | "C-;" #'flyspell-correct-wrapper |
1050 | "<f7>" #'+flyspell-correct-buffer)) | 1077 | "<f7>" #'+flyspell-correct-buffer) |
1078 | (with-eval-after-load 'vertico-multiform | ||
1079 | (setf (alist-get 'flyspell-correct-wrapper vertico-multiform-commands) nil))) | ||
1051 | 1080 | ||
1052 | (setup (:straight-when (forge | 1081 | (setup (:straight-when (forge |
1053 | :host github :repo "magit/forge") | 1082 | :host github :repo "magit/forge") |
@@ -1200,8 +1229,6 @@ See also `crux-reopen-as-root-mode'." | |||
1200 | (setf (alist-get 'gfm-mode apheleia-mode-alist) 'markdownfmt)))) | 1229 | (setf (alist-get 'gfm-mode apheleia-mode-alist) 'markdownfmt)))) |
1201 | 1230 | ||
1202 | (setup (:straight minions) | 1231 | (setup (:straight minions) |
1203 | (:option minions-prominent-modes | ||
1204 | '(tracking-mode)) | ||
1205 | (minions-mode +1)) | 1232 | (minions-mode +1)) |
1206 | 1233 | ||
1207 | (setup (:straight (mode-line-bell | 1234 | (setup (:straight (mode-line-bell |
@@ -1428,12 +1455,17 @@ See also `crux-reopen-as-root-mode'." | |||
1428 | (helpful-function) | 1455 | (helpful-function) |
1429 | (helpful-macro) | 1456 | (helpful-macro) |
1430 | (helpful-callable) | 1457 | (helpful-callable) |
1431 | (helpful-variable)) | 1458 | (helpful-variable) |
1459 | (completion-at-point flat) | ||
1460 | (indent-for-tab-command flat) | ||
1461 | (consult-buffer flat) | ||
1462 | (insert-char)) | ||
1432 | ;; This is applied /after/ the above, so default is at the end of | 1463 | ;; This is applied /after/ the above, so default is at the end of |
1433 | ;; this alist. | 1464 | ;; this alist. |
1434 | vertico-multiform-categories '((file buffer grid) | 1465 | vertico-multiform-categories '((file buffer grid) |
1435 | (t unobtrusive))) | 1466 | (t flat))) |
1436 | (dolist (buf-cmd '(consult-find | 1467 | (dolist (buf-cmd '(consult-find |
1468 | consult-yank-pop | ||
1437 | consult-locate | 1469 | consult-locate |
1438 | consult-grep | 1470 | consult-grep |
1439 | consult-git-grep | 1471 | consult-git-grep |
@@ -1442,7 +1474,9 @@ See also `crux-reopen-as-root-mode'." | |||
1442 | consult-line-multi | 1474 | consult-line-multi |
1443 | consult-multi-occur | 1475 | consult-multi-occur |
1444 | consult-keep-lines | 1476 | consult-keep-lines |
1445 | consult-focus-lines)) | 1477 | consult-focus-lines |
1478 | consult-imenu | ||
1479 | consult-outline)) | ||
1446 | (setf (alist-get buf-cmd vertico-multiform-commands) '(buffer))) | 1480 | (setf (alist-get buf-cmd vertico-multiform-commands) '(buffer))) |
1447 | (:with-map vertico-map | 1481 | (:with-map vertico-map |
1448 | (:bind "RET" #'vertico-directory-enter | 1482 | (:bind "RET" #'vertico-directory-enter |
@@ -1491,8 +1525,3 @@ See also `crux-reopen-as-root-mode'." | |||
1491 | (:require +zzz-to-char) | 1525 | (:require +zzz-to-char) |
1492 | (:option zzz-to-char-reach 1024) | 1526 | (:option zzz-to-char-reach 1024) |
1493 | (:global "M-z" #'+zzz-to-char)) | 1527 | (:global "M-z" #'+zzz-to-char)) |
1494 | |||
1495 | (setup tab-bar | ||
1496 | (:require +tab-bar) | ||
1497 | (tab-bar-mode +1) | ||
1498 | (+tab-bar-misc-info-mode +1)) | ||