summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-08-23 17:29:40 -0500
committerCase Duckworth2021-08-23 17:29:40 -0500
commit07b6e5cdb0eab8b46c3c70d6b9e36e9fc52e206c (patch)
tree9f6bd7f5464ea0a2676781e9afb4adb3bdb43a40
parentChange font loading order to look for Consolas first (diff)
downloademacs-07b6e5cdb0eab8b46c3c70d6b9e36e9fc52e206c.tar.gz
emacs-07b6e5cdb0eab8b46c3c70d6b9e36e9fc52e206c.zip
IDK change stuff
LOL
-rw-r--r--init.el47
-rw-r--r--lisp/acdw-erc.el20
2 files changed, 48 insertions, 19 deletions
diff --git a/init.el b/init.el index 3266f92..693f046 100644 --- a/init.el +++ b/init.el
@@ -240,7 +240,11 @@
240 ;; Add advice to pulse evaluated regions 240 ;; Add advice to pulse evaluated regions
241 (define-advice eval-region (:around (fn start end &rest args) pulse-region) 241 (define-advice eval-region (:around (fn start end &rest args) pulse-region)
242 (pulse-momentary-highlight-region start end) 242 (pulse-momentary-highlight-region start end)
243 (apply fn start end args))) 243 (apply fn start end args))
244
245 (setup (:straight elisp-slime-nav)
246 (:hook-into emacs-lisp-mode
247 ielm-mode)))
244 248
245(setup encoding 249(setup encoding
246 (:option locale-coding-system 'utf-8-unix 250 (:option locale-coding-system 'utf-8-unix
@@ -416,6 +420,19 @@ like a dumbass."
416 (defun unfocused@save-buffers () 420 (defun unfocused@save-buffers ()
417 (save-some-buffers t)))) 421 (save-some-buffers t))))
418 422
423(setup flyspell
424 (add-hook 'text-mode-hook #'flyspell-mode))
425
426(setup (:straight flyspell-correct)
427 (add-hook 'flyspell-mode-hook
428 (defun flyspell-mode@flyspell-correct ()
429 (dolist (keybind '(("C-;" . flyspell-correct-wrapper)
430 ("C-," . nil)
431 ("C-." . nil)
432 ("C-M-i" . nil)))
433 (define-key flyspell-mode-map
434 (kbd (car keybind)) (cdr keybind))))))
435
419;; (setup flyspell 436;; (setup flyspell
420;; ;; follow the directions here: https://old.reddit.com/r/emacs/comments/dgj0ae 437;; ;; follow the directions here: https://old.reddit.com/r/emacs/comments/dgj0ae
421;; ;; in short: 438;; ;; in short:
@@ -784,11 +801,13 @@ like a dumbass."
784 801
785(setup variable-pitch-mode 802(setup variable-pitch-mode
786 803
787 (defun variable-pitch@disable-fill-column-indicator () 804 ;; I might want to change this to `buffer-face-mode-hook'...
788 (display-fill-column-indicator-mode -1)) 805 (advice-add 'variable-pitch-mode :after
789 806 (defun variable-pitch-mode@setup (&rest _)
790 (:hook acdw-fonts/adapt-variable-pitch 807 "Set up `variable-pitch-mode' with my customizations."
791 variable-pitch@disable-fill-column-indicator)) 808 (display-fill-column-indicator-mode (if buffer-face-mode
809 -1
810 +1)))))
792 811
793(setup view 812(setup view
794 (:option view-read-only t) 813 (:option view-read-only t)
@@ -853,9 +872,9 @@ like a dumbass."
853 (:global "M-=" count-words 872 (:global "M-=" count-words
854 "C-w" kill-region-or-backward-word 873 "C-w" kill-region-or-backward-word
855 "<help> h" nil ; HELLO takes a long time to load on Windows 874 "<help> h" nil ; HELLO takes a long time to load on Windows
856 "M-c" capitalize-dwim 875 "C-c c" capitalize-dwim
857 "M-u" upcase-dwim 876 "C-c u" upcase-dwim
858 "M-l" downcase-dwim) 877 "C-c l" downcase-dwim)
859 878
860 (:global "C-c t" acdw/insert-iso-date 879 (:global "C-c t" acdw/insert-iso-date
861 "C-z" nil)) 880 "C-z" nil))
@@ -889,7 +908,8 @@ like a dumbass."
889 (dired-async-mode +1)) 908 (dired-async-mode +1))
890 909
891(setup (:straight ace-link) 910(setup (:straight ace-link)
892 (ace-link-setup-default)) 911 (ace-link-setup-default)
912 (define-key erc-mode-map (kbd "C-o") #'ace-link))
893 913
894(setup (:straight avy) 914(setup (:straight avy)
895 (:global "C-:" avy-goto-char 915 (:global "C-:" avy-goto-char
@@ -1353,6 +1373,7 @@ successive invocations."
1353 (require 'acdw-org) ; so I don't clutter up init.el 1373 (require 'acdw-org) ; so I don't clutter up init.el
1354 (:option 1374 (:option
1355 org-adapt-indentation nil 1375 org-adapt-indentation nil
1376 org-agenda-files nil ; only until I set this up
1356 org-catch-invisible-edits 'smart 1377 org-catch-invisible-edits 'smart
1357 org-clock-clocked-in-display 'mode-line 1378 org-clock-clocked-in-display 'mode-line
1358 org-clock-string-limit 7 ; gives time and not title 1379 org-clock-string-limit 7 ; gives time and not title
@@ -1523,6 +1544,11 @@ successive invocations."
1523 (add-to-list 'auto-mode-alist spec)) 1544 (add-to-list 'auto-mode-alist spec))
1524 (add-hook 'ssh-config-mode-hook #'turn-on-font-lock)) 1545 (add-hook 'ssh-config-mode-hook #'turn-on-font-lock))
1525 1546
1547(setup (:straight (topsy
1548 :host github
1549 :repo "alphapapa/topsy.el"))
1550 (:hook-into prog-mode))
1551
1526(setup (:straight typo) 1552(setup (:straight typo)
1527 (add-hook 'text-mode-hook 1553 (add-hook 'text-mode-hook
1528 (defun text-mode@typo-unless () 1554 (defun text-mode@typo-unless ()
@@ -1682,6 +1708,5 @@ call `zzz-to-char'."
1682;;;; Work 1708;;;; Work
1683(when (acdw/system :work) 1709(when (acdw/system :work)
1684 (setup (:straight ahk-mode))) 1710 (setup (:straight ahk-mode)))
1685
1686 1711
1687;;; init.el ends here 1712;;; init.el ends here
diff --git a/lisp/acdw-erc.el b/lisp/acdw-erc.el index 3e120ad..22e6831 100644 --- a/lisp/acdw-erc.el +++ b/lisp/acdw-erc.el
@@ -102,14 +102,18 @@ If USE-TLS is non-nil, use TLS."
102 (format "%s%s>" 102 (format "%s%s>"
103 (substring name 0 (- len 2 (length ellipsis))) 103 (substring name 0 (- len 2 (length ellipsis)))
104 ellipsis) 104 ellipsis)
105 (format "%s%s>" 105 (propertize
106 name 106 (format "%s%s>"
107 (let ((ss) ; Rewrite s-repeat to avoid dependency. 107 name
108 (num (- len 2 (length name)))) 108 (let ((ss) ; Rewrite s-repeat to avoid dependency.
109 (while (> num 0) 109 (num (- len 2 (length name))))
110 (setq ss (cons " " ss)) 110 (while (> num 0)
111 (setq num (1- num))) 111 (setq ss (cons " " ss))
112 (apply #'concat ss)))))) 112 (setq num (1- num)))
113 (apply #'concat ss)))
114 'read-only t
115 'intangible t
116 'cursor-intangible t))))
113 117
114(defcustom erc-nick-truncate nil 118(defcustom erc-nick-truncate nil
115 "The width at which to truncate a nick with `erc-format-truncate-@nick'." 119 "The width at which to truncate a nick with `erc-format-truncate-@nick'."