1 files changed, 64 insertions, 17 deletions

@@ -760,10 +760,11 @@
                             tab-bar-format-add-tab
                             tab-bar-format-align-right
                             ;;+tab-bar-misc-info
-                            tab-bar-separator
+                            +tab-bar-org-clock
                             +tab-bar-bongo
                             ;;+tab-bar-emms
                             +tab-bar-tracking-mode
+                            +tab-bar-notmuch-count
                             +tab-bar-date))
   (tab-bar-mode +1)
   (display-time-mode +1))
@@ -816,8 +817,9 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers."
                                (cons input (lambda (str) (orderless--highlight input str)))))
   (with-eval-after-load 'affe
     (setf (alist-get 'affe-grep vertico-multiform-commands) '(buffer)
-          (alist-get 'affe-find vertico-multiform-commands) nil)
-    (:global "M-s g" #'affe-grep)))
+          (alist-get 'affe-find vertico-multiform-commands) '(buffer))
+    (:+key "M-s g" #'affe-grep
+           "M-s f" #'affe-find)))
 
 (setup (:straight alert)
   (:option alert-default-style 'libnotify))
@@ -1027,17 +1029,18 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers."
            #'enable-circe-new-day-notifier
            #'+circe-chat@set-prompt
            ;; Filters
-           #'+circe-F/C-mode
+           ;;#'+circe-F/C-mode
            ;; For some reason `+circe-shorten-url-mode' won't work right out of
            ;; the gate.
-           (lambda () (run-at-time 0.25 nil #'+circe-shorten-url-mode)))
+           ;;(lambda () (run-at-time 0.25 nil #'+circe-shorten-url-mode))
+           )
     (:bind "C-c C-s" #'circe-command-SLAP))
 
   (:with-mode lui-mode
     (:option lui-fill-column (+ fill-column +circe-left-margin)
              lui-fill-type nil
              lui-time-stamp-position 'right-margin
-             lui-time-stamp-format "[ %H:%M"
+             lui-time-stamp-format "| %H:%M"
              lui-track-behavior 'before-switch-to-buffer
              lui-track-indicator 'bar
              lui-fill-remove-face-from-newline nil
@@ -1170,7 +1173,8 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers."
                        :preview-key '(:debounce 0.2 any))
     (consult-customize consult-ripgrep consult-git-grep consult-grep
                        consult-bookmark consult-recent-file consult-xref
-                       consult--source-file consult--source-project-file
+                       consult--source-recent-file
+                       consult--source-project-recent-file
                        consult--source-bookmark consult-buffer
                        :preview-key (kbd "M-,"))
     (consult-history-to-modes ((minibuffer-local-map . nil)
@@ -1207,7 +1211,8 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers."
 
 (setup (:straight consult-notmuch)
   (:load-after consult notmuch)
-  (add-to-list 'consult-buffer-sources 'consult-notmuch-buffer-source)
+  (with-eval-after-load 'consult
+    (add-to-list 'consult-buffer-sources 'consult-notmuch-buffer-source))
   (with-eval-after-load 'vertico-multiform
     (setf (alist-get 'consult-notmuch vertico-multiform-commands) '(buffer)
           (alist-get 'consult-notmuch-tree vertico-multiform-commands) '(buffer))))
@@ -1264,6 +1269,19 @@ See also `crux-reopen-as-root-mode'."
     "Ask for a word and search it in all dictionaries" t)
   (:hook #'reading-mode))
 
+(setup (:straight dired-git-info)
+  (:bind-into dired
+    ")" #'dired-git-info-mode))
+
+(setup (:straight dired-open)
+  (:load-after dired))
+
+(setup (:straight dired-subtree)
+  (:load-after dired)
+  (:bind-into dired
+    "TAB" #'dired-subtree-cycle
+    "i" #'dired-subtree-toggle))
+
 (setup (:straight (discord
                    :host github
                    :repo "davep/discord.el"
@@ -1309,7 +1327,7 @@ See also `crux-reopen-as-root-mode'."
    elfeed-search-remain-on-entry t
    elfeed-show-unique-buffers t
    elfeed-db-directory (elfeed/ "db/" t))
-  (:+key "C-x w" #'elfeed)
+  (:+leader "f" #'elfeed "C-f" #'elfeed)
   (advice-add #'elfeed-search-fetch :after #'beginning-of-buffer)
   (:with-mode elfeed-search-mode
     (:bind "&" #'+elfeed-search-browse-generic)
@@ -1324,8 +1342,8 @@ See also `crux-reopen-as-root-mode'."
            "RET" #'shr-browse-url)
     (:hook #'reading-mode)
     (:option +elfeed--update-repeat (* 60 30) ; 1/2 hour
-             +elfeed--update-first-time 60)   ; 1 minute
-    (+elfeed-update-async-mode +1)))
+             +elfeed--update-first-time 60))
+  (+elfeed-update-async-mode +1))
 
 (setup (:straight elfeed-org)
   (:also-load +org-capture)
@@ -1350,13 +1368,21 @@ See also `crux-reopen-as-root-mode'."
     (:bind "C-." #'embark-act
            "M-." #'embark-dwim))
   (:with-map embark-file-map
-    (:bind "l" #'vlf)))
+    (:bind "l" #'vlf))
+  ;; Integrations
+  (with-eval-after-load 'vertico-multiform
+    (setf (alist-get 'embark-prefix-help-command vertico-multiform-commands)
+          nil)))
 
 (setup (:straight embark-consult)
   (:load-after consult embark)
   (add-hook 'embark-collect-mode-hook #'consult-preview-at-point-mode))
 
+(setup (:straight embrace)
+  (:+key "C-," #'embrace-commander))
+
 (setup (:straight epithet)
+  (add-hook 'epithet-suggesters #'epithet-for-eww-url)
   (dolist (hook '(Info-selection-hook
                   eww-after-render-hook
                   help-mode-hook
@@ -1578,20 +1604,23 @@ See also `crux-reopen-as-root-mode'."
 
 (setup (:straight (lin :host gitlab :repo "protesilaos/lin"))
   (require 'lin)
-  (dolist (hook lin-foreign-hooks)
-    (add-hook hook #'hl-line-mode)
-    (add-hook hook #'lin-mode)))
+  (+with-ensure-after-init
+    (dolist (hook lin-foreign-hooks)
+      (add-hook hook #'hl-line-mode)
+      (add-hook hook #'lin-mode))))
 
 (setup (:straight link-hint)
   (:require +link-hint)
   (+link-hint-open-secondary-setup)
+  (+link-hint-open-chrome-setup)
   (:option link-hint-avy-style 'at-full)
   (:+key "M-l" +link-hint-map)
   (:with-map +link-hint-map
     (:bind "M-l" #'+link-hint-open-link "l" #'+link-hint-open-link
            "M-o" #'+link-hint-open-secondary "o" #'+link-hint-open-secondary
            "M-m" #'link-hint-open-multiple-links "m" #'link-hint-open-multiple-links
-           "M-c" #'link-hint-copy-link "c" #'link-hint-copy-link)))
+           "M-w" #'link-hint-copy-link "w" #'link-hint-copy-link
+           "M-c" #'+link-hint-open-chrome "c" #'+link-hint-open-chrome)))
 
 (setup (:straight (machine
                    :host github :repo "duckwork/machine.el"))
@@ -1703,6 +1732,16 @@ See also `crux-reopen-as-root-mode'."
   (:+key "C-a" #'+mwim-beginning-maybe
          "C-e" #'+mwim-end-maybe))
 
+(setup (:straight notmuch-bookmarks)
+  (:load-after notmuch)
+  (:when-loaded
+    (notmuch-bookmarks-mode +1)))
+
+(setup (:straight notmuch-labeler)
+  (:load-after notmuch))
+
+(setup (:straight ol-notmuch))
+
 (setup (:straight orderless)
   (:require +orderless)
   (:option completion-styles '(substring orderless basic)
@@ -1791,6 +1830,8 @@ See also `crux-reopen-as-root-mode'."
 
 (setup (:straight pocket-reader)
   (:option pocket-reader-open-url-default-function #'browse-url)
+  (:+leader "p" #'pocket-reader
+            "C-p" #'pocket-reader)
   (dolist (mode '((eww-mode-map . eww)
                   (w3m-mode-map . w3m)
                   (elfeed-search-mode-map . elfeed-search)
@@ -1839,7 +1880,6 @@ See also `crux-reopen-as-root-mode'."
                   (+modeline-concat
                    '(+modeline-track
                      simple-modeline-segment-misc-info))))
-
               simple-modeline-segment-process
               +modeline-text-scale
               ,(+modeline-concat
@@ -2029,6 +2069,13 @@ See also `crux-reopen-as-root-mode'."
   (advice-add 'counsel-yank-pop-action :around
               #'+vterm-counsel-yank-pop-action))
 
+(setup (:straight-when w3m
+         (executable-find "w3m"))
+  ;; (+with-ensure-after-init
+  ;;   (:option browse-url-browser-function #'w3m-browse-url
+  ;;            +browse-url-browser-function browse-url-browser-function))
+  )
+
 (setup (:straight web-mode)
   (setf (alist-get (rx "." (or "htm" "html" "phtml" "tpl.php"
                                "asp" "gsp" "jsp" "ascx" "aspx"