summary refs log tree commit diff stats
path: root/init.el
diff options
context:
space:
mode:
authorCase Duckworth2022-01-10 23:53:12 -0600
committerCase Duckworth2022-01-10 23:53:12 -0600
commit1c6d042d2fc0b526fd0430b36ba7f985032db3c6 (patch)
tree53c01cb0e65135072511d843fb0bb4ce02cab77e /init.el
parentMerge branch 'main' of https://tildegit.org/acdw/emacs (diff)
parentBleh (diff)
downloademacs-1c6d042d2fc0b526fd0430b36ba7f985032db3c6.tar.gz
emacs-1c6d042d2fc0b526fd0430b36ba7f985032db3c6.zip
Merge branch 'main' of https://tildegit.org/acdw/emacs
Diffstat (limited to 'init.el')
-rw-r--r--init.el66
1 files changed, 41 insertions, 25 deletions
diff --git a/init.el b/init.el index ae61b87..74d08a6 100644 --- a/init.el +++ b/init.el
@@ -113,7 +113,8 @@
113 (+ensure-after-init #'+pulse-location-mode)) 113 (+ensure-after-init #'+pulse-location-mode))
114 114
115(setup (:require reading) 115(setup (:require reading)
116 (:global "C-c C-r" #'reading-mode)) 116 (:hook-into view-mode) ; XXX doesn't go back
117 )
117 118
118(setup (:require user-save) 119(setup (:require user-save)
119 (add-hook 'user-save-hook #'+clean-empty-lines) 120 (add-hook 'user-save-hook #'+clean-empty-lines)
@@ -178,9 +179,12 @@
178 (cond ((executable-find "mpv") #'+browse-image-with-mpv) 179 (cond ((executable-find "mpv") #'+browse-image-with-mpv)
179 (t #'eww-browse-url)) 180 (t #'eww-browse-url))
180 args))) 181 args)))
181 (cons (rx ; videos 182 (cons (rx
182 (or "youtube.com" "youtu.be" "yewtu.be" 183 (or "youtube.com" "youtu.be" "yewtu.be"
183 (seq "." (or "mp4" "gif" "mov" "MOV" "webm") eos))) 184 ;; videos
185 (seq "." (or "mp4" "gif" "mov" "MOV" "webm") eos)
186 ;; music
187 (seq "." (or "ogg" "mp3") eos)))
184 (lambda (&rest args) 188 (lambda (&rest args)
185 (apply (if (executable-find "mpv") 189 (apply (if (executable-find "mpv")
186 #'+browse-url-with-mpv 190 #'+browse-url-with-mpv
@@ -1038,6 +1042,7 @@ See also `crux-reopen-as-root-mode'."
1038 (:+key "M-q" #'filldent-dwim)) 1042 (:+key "M-q" #'filldent-dwim))
1039 1043
1040(setup (:straight flyspell-correct) 1044(setup (:straight flyspell-correct)
1045 (:load-after flyspell)
1041 (:also-load +flyspell-correct) 1046 (:also-load +flyspell-correct)
1042 (:option flyspell-correct--cr-key ";") 1047 (:option flyspell-correct--cr-key ";")
1043 (:bind-into flyspell 1048 (:bind-into flyspell
@@ -1230,7 +1235,8 @@ See also `crux-reopen-as-root-mode'."
1230 (:hook-into org-mode)) 1235 (:hook-into org-mode))
1231 1236
1232(setup (:straight org-sticky-header) 1237(setup (:straight org-sticky-header)
1233 (:hook-into org-mode)) 1238 ;; (:hook-into org-mode)
1239 )
1234 1240
1235(setup (:straight org-visibility) 1241(setup (:straight org-visibility)
1236 (:option org-visibility-state-file (.etc "org-visibility") 1242 (:option org-visibility-state-file (.etc "org-visibility")
@@ -1289,27 +1295,32 @@ See also `crux-reopen-as-root-mode'."
1289(setup (:straight (simple-modeline 1295(setup (:straight (simple-modeline
1290 :fork (:host github :repo "duckwork/simple-modeline"))) 1296 :fork (:host github :repo "duckwork/simple-modeline")))
1291 (:require +modeline) 1297 (:require +modeline)
1292 (:option simple-modeline-segments `((;; left 1298 (:option simple-modeline-segments
1293 +modeline-ace-window-display 1299 `(( ; left
1294 +modeline-modified 1300 +modeline-ace-window-display
1295 ,(+modeline-concat 1301 +modeline-modified
1296 '(+modeline-god-mode 1302 +modeline-buffer-name
1297 +modeline-reading-mode 1303 (lambda () (+modeline-vc ": "))
1298 +modeline-narrowed) 1304 ,(+modeline-concat
1299 ",") 1305 '(+modeline-minions
1300 +modeline-buffer-name 1306 +modeline-major-mode))
1301 +modeline-position 1307 +modeline-anzu
1302 +modeline-anzu 1308 )
1303 ) 1309 ( ; right
1304 (;; right 1310 (lambda ()
1305 +modeline-track 1311 (unless +tab-bar-misc-info-mode
1306 +modeline-vc 1312 (+modeline-concat
1307 simple-modeline-segment-misc-info 1313 '(+modeline-track
1308 simple-modeline-segment-process 1314 simple-modeline-segment-misc-info))))
1309 +modeline-text-scale 1315
1310 +modeline-minions 1316 simple-modeline-segment-process
1311 +modeline-major-mode 1317 +modeline-text-scale
1312 ))) 1318 ,(+modeline-concat
1319 '(+modeline-god-mode
1320 +modeline-reading-mode
1321 +modeline-narrowed)
1322 ",")
1323 +modeline-position)))
1313 (simple-modeline-mode +1)) 1324 (simple-modeline-mode +1))
1314 1325
1315(setup (:straight smartscan) 1326(setup (:straight smartscan)
@@ -1480,3 +1491,8 @@ See also `crux-reopen-as-root-mode'."
1480 (:require +zzz-to-char) 1491 (:require +zzz-to-char)
1481 (:option zzz-to-char-reach 1024) 1492 (:option zzz-to-char-reach 1024)
1482 (:global "M-z" #'+zzz-to-char)) 1493 (:global "M-z" #'+zzz-to-char))
1494
1495(setup tab-bar
1496 (:require +tab-bar)
1497 (tab-bar-mode +1)
1498 (+tab-bar-misc-info-mode +1))