1 files changed, 23 insertions, 20 deletions

@@ -106,10 +106,10 @@
             "gitlab.com"
             "google.com"
             "imgur.com"
-            "pixelfed"
-            "reddit.com"
+            "pixelfed" "instagram.com" "bibliogram.art"
+            "reddit.com" "teddit.net"
             "taskiq"
-            "twitter.com" "nitter.com"
+            "twitter.com" "nitter.net"
             ))
           browse-url-secondary-browser-function)
     (cons "."                           ; everything else
@@ -117,7 +117,16 @@
   ;; Transform URLs before passing to `browse-url'
   (:option +browse-url-transformations `((,(rx "//" (or "youtube.com"
                                                         "youtu.be"))
-                                          . "//yewtu.be")))
+                                          . "//yewtu.be")
+                                         ("twitter\\.com"
+                                          . "nitter.net")
+                                         ("instagram\\.com"
+                                          . "bibilogram.art")
+                                         (,(rx (or "reddit.com"
+                                                   "old.reddit.com"))
+                                          . "teddit.net")
+                                         ("medium\\.com"
+                                          . "scribe.rip")))
   (+browse-url-transform-url-global-mode +1))
 
 (setup calendar
@@ -257,10 +266,8 @@
          [remap query-replace-regexp] 'anzu-query-replace-regexp)
   (global-anzu-mode +1)
   (:bind-into isearch
-    [remap isearch-query-replace]
-    'anzu-isearch-query-replace
-    [remap isearch-query-replace-regexp]
-    'anzu-isearch-query-replace-regexp))
+    [remap isearch-query-replace] 'anzu-isearch-query-replace
+    [remap isearch-query-replace-regexp] 'anzu-isearch-query-replace-regexp))
 
 (setup (:straight avy)
   (:also-load +avy)
@@ -374,7 +381,11 @@
                 visual-fill-column-extra-text-width
                 (cons +circe-left-margin 0)))
 
-  (add-hook 'modus-themes-after-load-theme-hook 'circe-nick-color-reset)
+  (with-eval-after-load 'topsy
+    (:option (append topsy-mode-functions)
+             '(circe-channel-mode . +circe-current-topic)))
+
+  (add-hook 'circadian-after-load-theme-hook 'circe-nick-color-reset)
   (add-hook 'kill-emacs-hook '+circe-quit-all@kill-emacs))
 
 (setup (:straight consult)
@@ -460,7 +471,6 @@
 
 (setup (:straight crux)
   (:+key "C-o" 'crux-smart-open-line
-         "M-o" 'crux-other-window-or-switch-buffer
          "C-x 4 t" 'crux-transpose-windows)
 
   (el-patch-feature crux)
@@ -508,9 +518,6 @@ See also `crux-reopen-as-root-mode'."
 (setup (:straight electric-cursor)
   (electric-cursor-mode +1))
 
-(setup (:straight electric-cursor)
-  (electric-cursor-mode +1))
-
 (setup (:straight elfeed)
   (:also-load +elfeed)
   (:option elfeed-use-curl t
@@ -586,6 +593,9 @@ See also `crux-reopen-as-root-mode'."
   (:option hungry-delete-chars-to-skip " \t"
            hungry-delete-join-reluctantly nil)
   (:bind-into paredit
+    ;; I define these functions here because they really require both packages
+    ;; to make any sense.  So, would I put them in `+hungry-delete' or
+    ;; `+paredit' ?  There's no satisfactory answer.
     [remap paredit-backward-delete]
     (defun acdw/paredit-hungry-delete-backward (arg)
       (interactive "P")
@@ -810,13 +820,6 @@ See also `crux-reopen-as-root-mode'."
 (setup (:straight smartscan)
   (smartscan-mode +1))
 
-(setup (:straight (sophomore
-                   :host github
-                   :repo "duckwork/sophomore.el"))
-  (:option disabled-command-function 'sophomore-dispatch
-           sophomore-dispatch-alist '((fatfinger . sophomore-fat-finger)))
-  (put 'save-buffers-kill-terminal 'disabled 'fatfinger))
-
 (setup (:straight ssh-config-mode)
   (:file-match (rx "/.ssh/config" eos)
                (rx "/ssh" (? "d") "_config" eos))