about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--init.el69
1 files changed, 41 insertions, 28 deletions
diff --git a/init.el b/init.el index 106393d..2a6bbcb 100644 --- a/init.el +++ b/init.el
@@ -681,7 +681,7 @@ specific to most general, they are these:
681 (:option mouse-1-click-follows-link t)) 681 (:option mouse-1-click-follows-link t))
682 682
683(setup mouse-avoidance 683(setup mouse-avoidance
684 (mouse-avoidance-mode 'exile)) 684 (mouse-avoidance-mode 'banish))
685 685
686(setup page 686(setup page
687 (:option page-delimiter 687 (:option page-delimiter
@@ -1222,8 +1222,8 @@ specific to most general, they are these:
1222 (crux-reopen-as-root-mode +1)) 1222 (crux-reopen-as-root-mode +1))
1223 1223
1224(setup (:straight-if (define-repeat-map 1224(setup (:straight-if (define-repeat-map
1225 :host nil 1225 :host nil
1226 :repo "https://tildegit.org/acdw/define-repeat-map.el") 1226 :repo "https://tildegit.org/acdw/define-repeat-map.el")
1227 (acdw/system :home)) 1227 (acdw/system :home))
1228 1228
1229 (require 'define-repeat-map ; just for me 1229 (require 'define-repeat-map ; just for me
@@ -1746,7 +1746,7 @@ browser defined in `browse-url-secondary-browser-function'."
1746 (:option modus-themes-slanted-constructs t 1746 (:option modus-themes-slanted-constructs t
1747 modus-themes-bold-constructs t 1747 modus-themes-bold-constructs t
1748 modus-themes-fringes nil 1748 modus-themes-fringes nil
1749 modus-themes-mode-line '(borderless moody) 1749 modus-themes-mode-line '(borderless)
1750 modus-themes-region '(bg-only) 1750 modus-themes-region '(bg-only)
1751 modus-themes-org-blocks 'gray-background 1751 modus-themes-org-blocks 'gray-background
1752 modus-themes-headings '((t . (background))) 1752 modus-themes-headings '((t . (background)))
@@ -1904,7 +1904,7 @@ browser defined in `browse-url-secondary-browser-function'."
1904 (:option org-adapt-indentation nil 1904 (:option org-adapt-indentation nil
1905 org-agenda-files nil ; only until I set this up 1905 org-agenda-files nil ; only until I set this up
1906 org-catch-invisible-edits 'show-and-error 1906 org-catch-invisible-edits 'show-and-error
1907 org-clock-clocked-in-display 'frame-title 1907 org-clock-clocked-in-display 'mode-line
1908 org-clock-frame-title-format (cons '(t org-mode-line-string) 1908 org-clock-frame-title-format (cons '(t org-mode-line-string)
1909 (cons " --- " frame-title-format)) 1909 (cons " --- " frame-title-format))
1910 ;;org-clock-string-limit 7 ; gives time and not title 1910 ;;org-clock-string-limit 7 ; gives time and not title
@@ -1953,32 +1953,40 @@ browser defined in `browse-url-secondary-browser-function'."
1953 1953
1954 (:unbind "C-j" ; org-return-and-maybe-indent 1954 (:unbind "C-j" ; org-return-and-maybe-indent
1955 "M-j") 1955 "M-j")
1956
1957 (:local-set unfill-fill-function #'org-fill-paragraph)
1956 1958
1957 (with-eval-after-load 'org-export 1959 (with-eval-after-load 'org-export
1958 (:option (append org-export-filter-final-output-functions) 1960 (:option (append org-export-filter-final-output-functions)
1959 #'org-export-remove-zero-width-spaces)) 1961 #'org-export-remove-zero-width-spaces))
1960 1962
1961 (:hook #'variable-pitch-mode 1963 (:hook ;; #'variable-pitch-mode
1962 1964
1963 ;; This is super ugly because I need to add a function to 1965 ;; (defun org-mode@before-save@fill-buffer ()
1964 ;; `before-save-hook', but only in org-mode buffers. So I make a hook 1966 ;; (add-hook 'before-save-hook
1965 ;; to make a hook. I'm sure there's a better way to do this. 1967 ;; (defun before-save@fill-buffer ()
1966 (defun org-mode@fix-blank-lines-on-save () 1968 ;; (fill-region (point-min) (point-max)))
1967 (add-hook 'before-save-hook 1969 ;; nil :local))
1968 (defun acdw-org/fix-blank-lines-in-buffer () 1970
1969 (acdw-org/fix-blank-lines t)) 1971 ;; This is super ugly because I need to add a function to
1970 0 :local)) 1972 ;; `before-save-hook', but only in org-mode buffers. So I make a hook
1971 1973 ;; to make a hook. I'm sure there's a better way to do this.
1972 (defun org-mode@wc-stupid () 1974 (defun org-mode@fix-blank-lines-on-save ()
1973 (unless (and wc-mode 1975 (add-hook 'before-save-hook
1974 (> 0 (+ (or wc-orig-words 0) 1976 (defun acdw-org/fix-blank-lines-in-buffer ()
1975 (or wc-words-delta 0))))) 1977 (acdw-org/fix-blank-lines t))
1976 (setq-local 1978 0 :local))
1977 wc-count-words-function 1979
1978 (lambda (start end) "Count words stupidly with a limit." 1980 (defun org-mode@wc-stupid ()
1979 (acdw-org/count-words-stupidly start 1981 (unless (and wc-mode
1980 end 1982 (> 0 (+ (or wc-orig-words 0)
1981 999))))) 1983 (or wc-words-delta 0)))))
1984 (setq-local
1985 wc-count-words-function
1986 (lambda (start end) "Count words stupidly with a limit."
1987 (acdw-org/count-words-stupidly start
1988 end
1989 999)))))
1982 1990
1983 (with-eval-after-load 'org 1991 (with-eval-after-load 'org
1984 (org-clock-persistence-insinuate)) 1992 (org-clock-persistence-insinuate))
@@ -2257,7 +2265,10 @@ the default is \"/\"."
2257 (smartparens-strict-mode 1)) 2265 (smartparens-strict-mode 1))
2258 2266
2259 (:bind "C-M-q" #'sp-indent-defun 2267 (:bind "C-M-q" #'sp-indent-defun
2260 "M-r" #'sp-rewrap-sexp)) 2268 "M-r" #'sp-rewrap-sexp)
2269 (:unbind "M-j" ; sp-join-sexp
2270 ))
2271
2261(setup (:straight ssh-config-mode) 2272(setup (:straight ssh-config-mode)
2262 (:file-match (rx "/.ssh/config" eos) 2273 (:file-match (rx "/.ssh/config" eos)
2263 (rx "/ssh" (? "d") "_config" eos)) 2274 (rx "/ssh" (? "d") "_config" eos))
@@ -2341,7 +2352,9 @@ If used with a numeric prefix argument N, N backticks will be inserted."
2341 2352
2342 (global-undo-fu-session-mode +1)) 2353 (global-undo-fu-session-mode +1))
2343 2354
2344(setup (:straight unfill)) 2355(setup (:straight (unfill :host github :repo "purcell/unfill"
2356 :fork (:host github :repo "duckwork/unfill")))
2357 (:global "M-q" #'unfill-toggle))
2345 2358
2346(setup (:straight (unfocused 2359(setup (:straight (unfocused
2347 :host github 2360 :host github