2 files changed, 30 insertions, 10 deletions

@@ -21,14 +21,13 @@
                    _work))
   (require (or (car-safe feature) feature) (cdr-safe feature) :noerror))
 
-(setq debug-on-error t)
-
 (setup (:require +emacs)
   (:also-load +lisp)
   ;; +emacs.el contains super-basic defaults that are basically necessary for
   ;; good functioning.  In this block, I add extra things or more "experimental"
   ;; ones that might not belong in a separate file.
-  (:option sentence-end-double-space nil) ; I can't believe I'm doing this...
+  (:option sentence-end-double-space nil ; I can't believe I'm doing this...
+           truncate-string-ellipsis "~")
   ;; Setting `sentence-end-double-space' to nil means that `fill-paragraph'
   ;; fills single-spaced sentences, which I /don't/ like.  This advice will fix
   ;; that.
@@ -39,7 +38,8 @@
   (:global "C-x C-k" #'kill-current-buffer
            "C-x 4 n" #'clone-buffer
            "C-c v" #'visible-mode
-           "C-M-;" #'+lisp-comment-or-uncomment-sexp)
+           "C-M-;" #'+lisp-comment-or-uncomment-sexp
+           "<f12>" #'consult-buffer)
   ;; Unbind stuff, too.
   (dolist (key '("C-M-j"
                  "M-j"))
@@ -97,12 +97,31 @@
 
 (setup browse-url
   (:require +browse-url)
-  (:option browse-url-secondary-browser-function (if (executable-find "firefox")
-                                                     #'browse-url-firefox
-                                                   #'browse-url-default-browser)
-           browse-url-new-window-flag nil
-           browse-url-firefox-arguments '("--new-tab")
-           browse-url-firefox-new-window-is-tab t)
+  (:option
+   browse-url-browser-function #'eww-browse-url
+   browse-url-secondary-browser-function (if (executable-find "firefox")
+                                             #'browse-url-firefox
+                                           #'browse-url-default-browser)
+   browse-url-new-window-flag nil
+   browse-url-firefox-arguments '("--new-tab")
+   browse-url-firefox-new-window-is-tab t)
+  ;; Set up external browsing URLs.
+  (with-eval-after-load custom-file
+    ;; I want to make sure and load these /after/ the custom-file's been loaded
+    ;; so that it doesn't overwrite the following list.
+    (add-to-list '+custom-variable-allowlist
+                 '+browse-url-secondary-browser-regexps)
+    (dolist (domain '("github.com" "twitch.tv"
+                      "gitlab.com"
+                      "google.com"
+                      "imgur.com"
+                      "pixelfed" "instagram.com" "bibliogram.art"
+                      "reddit.com" "teddit.net"
+                      "tildes.net"
+                      "taskiq"
+                      "twitter.com" "nitter.net"
+                      "streamable.com"))
+      (add-to-list '+browse-url-secondary-browser-regexps domain)))
   ;; Set up URL handlers.
   (+browse-url-set-handlers
    (list
@@ -114,6 +114,7 @@ Do this only if the buffer is not visiting a file."
  tab-bar-show 1
  tab-width 4
  tramp-backup-directory-alist backup-directory-alist
+ undo-limit 100000000                   ; 10 MB
  use-dialog-box nil
  use-file-dialog nil
  use-short-answers t