about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--init.el81
1 files changed, 64 insertions, 17 deletions
diff --git a/init.el b/init.el index 2312109..815a3d2 100644 --- a/init.el +++ b/init.el
@@ -760,10 +760,11 @@
760 tab-bar-format-add-tab 760 tab-bar-format-add-tab
761 tab-bar-format-align-right 761 tab-bar-format-align-right
762 ;;+tab-bar-misc-info 762 ;;+tab-bar-misc-info
763 tab-bar-separator 763 +tab-bar-org-clock
764 +tab-bar-bongo 764 +tab-bar-bongo
765 ;;+tab-bar-emms 765 ;;+tab-bar-emms
766 +tab-bar-tracking-mode 766 +tab-bar-tracking-mode
767 +tab-bar-notmuch-count
767 +tab-bar-date)) 768 +tab-bar-date))
768 (tab-bar-mode +1) 769 (tab-bar-mode +1)
769 (display-time-mode +1)) 770 (display-time-mode +1))
@@ -816,8 +817,9 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers."
816 (cons input (lambda (str) (orderless--highlight input str))))) 817 (cons input (lambda (str) (orderless--highlight input str)))))
817 (with-eval-after-load 'affe 818 (with-eval-after-load 'affe
818 (setf (alist-get 'affe-grep vertico-multiform-commands) '(buffer) 819 (setf (alist-get 'affe-grep vertico-multiform-commands) '(buffer)
819 (alist-get 'affe-find vertico-multiform-commands) nil) 820 (alist-get 'affe-find vertico-multiform-commands) '(buffer))
820 (:global "M-s g" #'affe-grep))) 821 (:+key "M-s g" #'affe-grep
822 "M-s f" #'affe-find)))
821 823
822(setup (:straight alert) 824(setup (:straight alert)
823 (:option alert-default-style 'libnotify)) 825 (:option alert-default-style 'libnotify))
@@ -1027,17 +1029,18 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers."
1027 #'enable-circe-new-day-notifier 1029 #'enable-circe-new-day-notifier
1028 #'+circe-chat@set-prompt 1030 #'+circe-chat@set-prompt
1029 ;; Filters 1031 ;; Filters
1030 #'+circe-F/C-mode 1032 ;;#'+circe-F/C-mode
1031 ;; For some reason `+circe-shorten-url-mode' won't work right out of 1033 ;; For some reason `+circe-shorten-url-mode' won't work right out of
1032 ;; the gate. 1034 ;; the gate.
1033 (lambda () (run-at-time 0.25 nil #'+circe-shorten-url-mode))) 1035 ;;(lambda () (run-at-time 0.25 nil #'+circe-shorten-url-mode))
1036 )
1034 (:bind "C-c C-s" #'circe-command-SLAP)) 1037 (:bind "C-c C-s" #'circe-command-SLAP))
1035 1038
1036 (:with-mode lui-mode 1039 (:with-mode lui-mode
1037 (:option lui-fill-column (+ fill-column +circe-left-margin) 1040 (:option lui-fill-column (+ fill-column +circe-left-margin)
1038 lui-fill-type nil 1041 lui-fill-type nil
1039 lui-time-stamp-position 'right-margin 1042 lui-time-stamp-position 'right-margin
1040 lui-time-stamp-format "[ %H:%M" 1043 lui-time-stamp-format "| %H:%M"
1041 lui-track-behavior 'before-switch-to-buffer 1044 lui-track-behavior 'before-switch-to-buffer
1042 lui-track-indicator 'bar 1045 lui-track-indicator 'bar
1043 lui-fill-remove-face-from-newline nil 1046 lui-fill-remove-face-from-newline nil
@@ -1170,7 +1173,8 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers."
1170 :preview-key '(:debounce 0.2 any)) 1173 :preview-key '(:debounce 0.2 any))
1171 (consult-customize consult-ripgrep consult-git-grep consult-grep 1174 (consult-customize consult-ripgrep consult-git-grep consult-grep
1172 consult-bookmark consult-recent-file consult-xref 1175 consult-bookmark consult-recent-file consult-xref
1173 consult--source-file consult--source-project-file 1176 consult--source-recent-file
1177 consult--source-project-recent-file
1174 consult--source-bookmark consult-buffer 1178 consult--source-bookmark consult-buffer
1175 :preview-key (kbd "M-,")) 1179 :preview-key (kbd "M-,"))
1176 (consult-history-to-modes ((minibuffer-local-map . nil) 1180 (consult-history-to-modes ((minibuffer-local-map . nil)
@@ -1207,7 +1211,8 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers."
1207 1211
1208(setup (:straight consult-notmuch) 1212(setup (:straight consult-notmuch)
1209 (:load-after consult notmuch) 1213 (:load-after consult notmuch)
1210 (add-to-list 'consult-buffer-sources 'consult-notmuch-buffer-source) 1214 (with-eval-after-load 'consult
1215 (add-to-list 'consult-buffer-sources 'consult-notmuch-buffer-source))
1211 (with-eval-after-load 'vertico-multiform 1216 (with-eval-after-load 'vertico-multiform
1212 (setf (alist-get 'consult-notmuch vertico-multiform-commands) '(buffer) 1217 (setf (alist-get 'consult-notmuch vertico-multiform-commands) '(buffer)
1213 (alist-get 'consult-notmuch-tree vertico-multiform-commands) '(buffer)))) 1218 (alist-get 'consult-notmuch-tree vertico-multiform-commands) '(buffer))))
@@ -1264,6 +1269,19 @@ See also `crux-reopen-as-root-mode'."
1264 "Ask for a word and search it in all dictionaries" t) 1269 "Ask for a word and search it in all dictionaries" t)
1265 (:hook #'reading-mode)) 1270 (:hook #'reading-mode))
1266 1271
1272(setup (:straight dired-git-info)
1273 (:bind-into dired
1274 ")" #'dired-git-info-mode))
1275
1276(setup (:straight dired-open)
1277 (:load-after dired))
1278
1279(setup (:straight dired-subtree)
1280 (:load-after dired)
1281 (:bind-into dired
1282 "TAB" #'dired-subtree-cycle
1283 "i" #'dired-subtree-toggle))
1284
1267(setup (:straight (discord 1285(setup (:straight (discord
1268 :host github 1286 :host github
1269 :repo "davep/discord.el" 1287 :repo "davep/discord.el"
@@ -1309,7 +1327,7 @@ See also `crux-reopen-as-root-mode'."
1309 elfeed-search-remain-on-entry t 1327 elfeed-search-remain-on-entry t
1310 elfeed-show-unique-buffers t 1328 elfeed-show-unique-buffers t
1311 elfeed-db-directory (elfeed/ "db/" t)) 1329 elfeed-db-directory (elfeed/ "db/" t))
1312 (:+key "C-x w" #'elfeed) 1330 (:+leader "f" #'elfeed "C-f" #'elfeed)
1313 (advice-add #'elfeed-search-fetch :after #'beginning-of-buffer) 1331 (advice-add #'elfeed-search-fetch :after #'beginning-of-buffer)
1314 (:with-mode elfeed-search-mode 1332 (:with-mode elfeed-search-mode
1315 (:bind "&" #'+elfeed-search-browse-generic) 1333 (:bind "&" #'+elfeed-search-browse-generic)
@@ -1324,8 +1342,8 @@ See also `crux-reopen-as-root-mode'."
1324 "RET" #'shr-browse-url) 1342 "RET" #'shr-browse-url)
1325 (:hook #'reading-mode) 1343 (:hook #'reading-mode)
1326 (:option +elfeed--update-repeat (* 60 30) ; 1/2 hour 1344 (:option +elfeed--update-repeat (* 60 30) ; 1/2 hour
1327 +elfeed--update-first-time 60) ; 1 minute 1345 +elfeed--update-first-time 60))
1328 (+elfeed-update-async-mode +1))) 1346 (+elfeed-update-async-mode +1))
1329 1347
1330(setup (:straight elfeed-org) 1348(setup (:straight elfeed-org)
1331 (:also-load +org-capture) 1349 (:also-load +org-capture)
@@ -1350,13 +1368,21 @@ See also `crux-reopen-as-root-mode'."
1350 (:bind "C-." #'embark-act 1368 (:bind "C-." #'embark-act
1351 "M-." #'embark-dwim)) 1369 "M-." #'embark-dwim))
1352 (:with-map embark-file-map 1370 (:with-map embark-file-map
1353 (:bind "l" #'vlf))) 1371 (:bind "l" #'vlf))
1372 ;; Integrations
1373 (with-eval-after-load 'vertico-multiform
1374 (setf (alist-get 'embark-prefix-help-command vertico-multiform-commands)
1375 nil)))
1354 1376
1355(setup (:straight embark-consult) 1377(setup (:straight embark-consult)
1356 (:load-after consult embark) 1378 (:load-after consult embark)
1357 (add-hook 'embark-collect-mode-hook #'consult-preview-at-point-mode)) 1379 (add-hook 'embark-collect-mode-hook #'consult-preview-at-point-mode))
1358 1380
1381(setup (:straight embrace)
1382 (:+key "C-," #'embrace-commander))
1383
1359(setup (:straight epithet) 1384(setup (:straight epithet)
1385 (add-hook 'epithet-suggesters #'epithet-for-eww-url)
1360 (dolist (hook '(Info-selection-hook 1386 (dolist (hook '(Info-selection-hook
1361 eww-after-render-hook 1387 eww-after-render-hook
1362 help-mode-hook 1388 help-mode-hook
@@ -1578,20 +1604,23 @@ See also `crux-reopen-as-root-mode'."
1578 1604
1579(setup (:straight (lin :host gitlab :repo "protesilaos/lin")) 1605(setup (:straight (lin :host gitlab :repo "protesilaos/lin"))
1580 (require 'lin) 1606 (require 'lin)
1581 (dolist (hook lin-foreign-hooks) 1607 (+with-ensure-after-init
1582 (add-hook hook #'hl-line-mode) 1608 (dolist (hook lin-foreign-hooks)
1583 (add-hook hook #'lin-mode))) 1609 (add-hook hook #'hl-line-mode)
1610 (add-hook hook #'lin-mode))))
1584 1611
1585(setup (:straight link-hint) 1612(setup (:straight link-hint)
1586 (:require +link-hint) 1613 (:require +link-hint)
1587 (+link-hint-open-secondary-setup) 1614 (+link-hint-open-secondary-setup)
1615 (+link-hint-open-chrome-setup)
1588 (:option link-hint-avy-style 'at-full) 1616 (:option link-hint-avy-style 'at-full)
1589 (:+key "M-l" +link-hint-map) 1617 (:+key "M-l" +link-hint-map)
1590 (:with-map +link-hint-map 1618 (:with-map +link-hint-map
1591 (:bind "M-l" #'+link-hint-open-link "l" #'+link-hint-open-link 1619 (:bind "M-l" #'+link-hint-open-link "l" #'+link-hint-open-link
1592 "M-o" #'+link-hint-open-secondary "o" #'+link-hint-open-secondary 1620 "M-o" #'+link-hint-open-secondary "o" #'+link-hint-open-secondary
1593 "M-m" #'link-hint-open-multiple-links "m" #'link-hint-open-multiple-links 1621 "M-m" #'link-hint-open-multiple-links "m" #'link-hint-open-multiple-links
1594 "M-c" #'link-hint-copy-link "c" #'link-hint-copy-link))) 1622 "M-w" #'link-hint-copy-link "w" #'link-hint-copy-link
1623 "M-c" #'+link-hint-open-chrome "c" #'+link-hint-open-chrome)))
1595 1624
1596(setup (:straight (machine 1625(setup (:straight (machine
1597 :host github :repo "duckwork/machine.el")) 1626 :host github :repo "duckwork/machine.el"))
@@ -1703,6 +1732,16 @@ See also `crux-reopen-as-root-mode'."
1703 (:+key "C-a" #'+mwim-beginning-maybe 1732 (:+key "C-a" #'+mwim-beginning-maybe
1704 "C-e" #'+mwim-end-maybe)) 1733 "C-e" #'+mwim-end-maybe))
1705 1734
1735(setup (:straight notmuch-bookmarks)
1736 (:load-after notmuch)
1737 (:when-loaded
1738 (notmuch-bookmarks-mode +1)))
1739
1740(setup (:straight notmuch-labeler)
1741 (:load-after notmuch))
1742
1743(setup (:straight ol-notmuch))
1744
1706(setup (:straight orderless) 1745(setup (:straight orderless)
1707 (:require +orderless) 1746 (:require +orderless)
1708 (:option completion-styles '(substring orderless basic) 1747 (:option completion-styles '(substring orderless basic)
@@ -1791,6 +1830,8 @@ See also `crux-reopen-as-root-mode'."
1791 1830
1792(setup (:straight pocket-reader) 1831(setup (:straight pocket-reader)
1793 (:option pocket-reader-open-url-default-function #'browse-url) 1832 (:option pocket-reader-open-url-default-function #'browse-url)
1833 (:+leader "p" #'pocket-reader
1834 "C-p" #'pocket-reader)
1794 (dolist (mode '((eww-mode-map . eww) 1835 (dolist (mode '((eww-mode-map . eww)
1795 (w3m-mode-map . w3m) 1836 (w3m-mode-map . w3m)
1796 (elfeed-search-mode-map . elfeed-search) 1837 (elfeed-search-mode-map . elfeed-search)
@@ -1839,7 +1880,6 @@ See also `crux-reopen-as-root-mode'."
1839 (+modeline-concat 1880 (+modeline-concat
1840 '(+modeline-track 1881 '(+modeline-track
1841 simple-modeline-segment-misc-info)))) 1882 simple-modeline-segment-misc-info))))
1842
1843 simple-modeline-segment-process 1883 simple-modeline-segment-process
1844 +modeline-text-scale 1884 +modeline-text-scale
1845 ,(+modeline-concat 1885 ,(+modeline-concat
@@ -2029,6 +2069,13 @@ See also `crux-reopen-as-root-mode'."
2029 (advice-add 'counsel-yank-pop-action :around 2069 (advice-add 'counsel-yank-pop-action :around
2030 #'+vterm-counsel-yank-pop-action)) 2070 #'+vterm-counsel-yank-pop-action))
2031 2071
2072(setup (:straight-when w3m
2073 (executable-find "w3m"))
2074 ;; (+with-ensure-after-init
2075 ;; (:option browse-url-browser-function #'w3m-browse-url
2076 ;; +browse-url-browser-function browse-url-browser-function))
2077 )
2078
2032(setup (:straight web-mode) 2079(setup (:straight web-mode)
2033 (setf (alist-get (rx "." (or "htm" "html" "phtml" "tpl.php" 2080 (setf (alist-get (rx "." (or "htm" "html" "phtml" "tpl.php"
2034 "asp" "gsp" "jsp" "ascx" "aspx" 2081 "asp" "gsp" "jsp" "ascx" "aspx"