about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-12-31 15:46:16 -0600
committerCase Duckworth2021-12-31 15:46:16 -0600
commit064c946faea9d7e940367d840ffbe10147f43881 (patch)
tree78c71c796070ddfbd4b899f0351f3692b54cb390
parentUse truncate-string-ellipsis by default (diff)
downloademacs-064c946faea9d7e940367d840ffbe10147f43881.tar.gz
emacs-064c946faea9d7e940367d840ffbe10147f43881.zip
Changes of things
-rw-r--r--init.el39
-rw-r--r--lisp/+emacs.el1
2 files changed, 30 insertions, 10 deletions
diff --git a/init.el b/init.el index e5d113b..f0cef0d 100644 --- a/init.el +++ b/init.el
@@ -21,14 +21,13 @@
21 _work)) 21 _work))
22 (require (or (car-safe feature) feature) (cdr-safe feature) :noerror)) 22 (require (or (car-safe feature) feature) (cdr-safe feature) :noerror))
23 23
24(setq debug-on-error t)
25
26(setup (:require +emacs) 24(setup (:require +emacs)
27 (:also-load +lisp) 25 (:also-load +lisp)
28 ;; +emacs.el contains super-basic defaults that are basically necessary for 26 ;; +emacs.el contains super-basic defaults that are basically necessary for
29 ;; good functioning. In this block, I add extra things or more "experimental" 27 ;; good functioning. In this block, I add extra things or more "experimental"
30 ;; ones that might not belong in a separate file. 28 ;; ones that might not belong in a separate file.
31 (:option sentence-end-double-space nil) ; I can't believe I'm doing this... 29 (:option sentence-end-double-space nil ; I can't believe I'm doing this...
30 truncate-string-ellipsis "~")
32 ;; Setting `sentence-end-double-space' to nil means that `fill-paragraph' 31 ;; Setting `sentence-end-double-space' to nil means that `fill-paragraph'
33 ;; fills single-spaced sentences, which I /don't/ like. This advice will fix 32 ;; fills single-spaced sentences, which I /don't/ like. This advice will fix
34 ;; that. 33 ;; that.
@@ -39,7 +38,8 @@
39 (:global "C-x C-k" #'kill-current-buffer 38 (:global "C-x C-k" #'kill-current-buffer
40 "C-x 4 n" #'clone-buffer 39 "C-x 4 n" #'clone-buffer
41 "C-c v" #'visible-mode 40 "C-c v" #'visible-mode
42 "C-M-;" #'+lisp-comment-or-uncomment-sexp) 41 "C-M-;" #'+lisp-comment-or-uncomment-sexp
42 "<f12>" #'consult-buffer)
43 ;; Unbind stuff, too. 43 ;; Unbind stuff, too.
44 (dolist (key '("C-M-j" 44 (dolist (key '("C-M-j"
45 "M-j")) 45 "M-j"))
@@ -97,12 +97,31 @@
97 97
98(setup browse-url 98(setup browse-url
99 (:require +browse-url) 99 (:require +browse-url)
100 (:option browse-url-secondary-browser-function (if (executable-find "firefox") 100 (:option
101 #'browse-url-firefox 101 browse-url-browser-function #'eww-browse-url
102 #'browse-url-default-browser) 102 browse-url-secondary-browser-function (if (executable-find "firefox")
103 browse-url-new-window-flag nil 103 #'browse-url-firefox
104 browse-url-firefox-arguments '("--new-tab") 104 #'browse-url-default-browser)
105 browse-url-firefox-new-window-is-tab t) 105 browse-url-new-window-flag nil
106 browse-url-firefox-arguments '("--new-tab")
107 browse-url-firefox-new-window-is-tab t)
108 ;; Set up external browsing URLs.
109 (with-eval-after-load custom-file
110 ;; I want to make sure and load these /after/ the custom-file's been loaded
111 ;; so that it doesn't overwrite the following list.
112 (add-to-list '+custom-variable-allowlist
113 '+browse-url-secondary-browser-regexps)
114 (dolist (domain '("github.com" "twitch.tv"
115 "gitlab.com"
116 "google.com"
117 "imgur.com"
118 "pixelfed" "instagram.com" "bibliogram.art"
119 "reddit.com" "teddit.net"
120 "tildes.net"
121 "taskiq"
122 "twitter.com" "nitter.net"
123 "streamable.com"))
124 (add-to-list '+browse-url-secondary-browser-regexps domain)))
106 ;; Set up URL handlers. 125 ;; Set up URL handlers.
107 (+browse-url-set-handlers 126 (+browse-url-set-handlers
108 (list 127 (list
diff --git a/lisp/+emacs.el b/lisp/+emacs.el index 792da40..a7c91f0 100644 --- a/lisp/+emacs.el +++ b/lisp/+emacs.el
@@ -114,6 +114,7 @@ Do this only if the buffer is not visiting a file."
114 tab-bar-show 1 114 tab-bar-show 1
115 tab-width 4 115 tab-width 4
116 tramp-backup-directory-alist backup-directory-alist 116 tramp-backup-directory-alist backup-directory-alist
117 undo-limit 100000000 ; 10 MB
117 use-dialog-box nil 118 use-dialog-box nil
118 use-file-dialog nil 119 use-file-dialog nil
119 use-short-answers t 120 use-short-answers t