diff options
author | Case Duckworth | 2021-06-07 14:10:24 -0500 |
---|---|---|
committer | Case Duckworth | 2021-06-07 14:10:24 -0500 |
commit | 924d0fc4c78ba59e2360ae0e774c8f70d36cb931 (patch) | |
tree | a0afe39604248de11cab23b74454079035c5803b /init.el | |
parent | Make Emacs work at work (diff) | |
parent | Change ERC config (diff) | |
download | emacs-924d0fc4c78ba59e2360ae0e774c8f70d36cb931.tar.gz emacs-924d0fc4c78ba59e2360ae0e774c8f70d36cb931.zip |
Merge branch 'main' of tildegit.org:acdw/emacs
Diffstat (limited to 'init.el')
-rw-r--r-- | init.el | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/init.el b/init.el index aaddba6..7d32117 100644 --- a/init.el +++ b/init.el | |||
@@ -46,7 +46,7 @@ | |||
46 | (normal-top-level-add-subdirs-to-load-path)) | 46 | (normal-top-level-add-subdirs-to-load-path)) |
47 | 47 | ||
48 | ;;;; Private stuff | 48 | ;;;; Private stuff |
49 | (require 'acdw-private) | 49 | (acdw/require-private) |
50 | 50 | ||
51 | 51 | ||
52 | ;;;; Utility functions and variables | 52 | ;;;; Utility functions and variables |
@@ -259,24 +259,31 @@ | |||
259 | erc-button-url-regexp browse-url-button-regexp | 259 | erc-button-url-regexp browse-url-button-regexp |
260 | erc-common-server-suffixes '(("tilde.chat\\'" . "~") | 260 | erc-common-server-suffixes '(("tilde.chat\\'" . "~") |
261 | ("libera.chat\\'" . "LC")) | 261 | ("libera.chat\\'" . "LC")) |
262 | erc-default-server "irc.tilde.chat" ; fuck freenode. all my friends hate | ||
263 | ; freenode. | ||
264 | erc-fill-function #'erc-fill-static | ||
265 | erc-fill-static-center 14 | ||
262 | erc-header-line-face-method #'erc/update-header-line-show-disconnected | 266 | erc-header-line-face-method #'erc/update-header-line-show-disconnected |
263 | erc-hide-list '("JOIN" "NICK" "PART" "QUIT" "MODE" | 267 | erc-hide-list '("JOIN" "NICK" "PART" "QUIT" "MODE" |
264 | "324" "329" "332" "333" "353" "477") | 268 | "324" "329" "332" "333" "353" "477") |
265 | erc-interpret-controls-p t | 269 | erc-interpret-controls-p t |
266 | erc-interpret-mirc-color t | 270 | erc-interpret-mirc-color t |
267 | erc-join-buffer 'buffer | 271 | erc-join-buffer 'bury |
268 | erc-kill-buffer-on-part t | 272 | erc-kill-buffer-on-part t |
269 | erc-kill-queries-on-quit t | 273 | erc-kill-queries-on-quit t |
270 | erc-kill-server-buffer-on-quit t | 274 | erc-kill-server-buffer-on-quit t |
271 | erc-nick "acdw" | 275 | erc-nick "acdw" |
272 | erc-prompt (lambda () (concat (buffer-name) ">")) | 276 | erc-prompt (lambda () (acdw-erc/prompt)) |
273 | erc-prompt-for-password nil ; use ~/.authinfo | 277 | erc-prompt-for-password nil ; use ~/.authinfo |
274 | erc/servers | 278 | erc/servers |
275 | (when (boundp 'erc-autojoin-channels-alist) | 279 | (when (boundp 'erc-autojoin-channels-alist) |
276 | (mapcar #'car erc-autojoin-channels-alist)) | 280 | (mapcar #'car erc-autojoin-channels-alist)) |
277 | erc-server-coding-system '(utf-8 . utf-8) | 281 | erc-server-coding-system '(utf-8 . utf-8) |
278 | erc-track-exclude-types erc-hide-list | 282 | erc-track-exclude-types erc-hide-list |
279 | erc-track-position-in-mode-line 'before-modes) | 283 | erc-track-exclude-server-buffer t |
284 | erc-track-position-in-mode-line 'before-modes | ||
285 | erc-track-visibility nil ; only the selected frame | ||
286 | ) | ||
280 | 287 | ||
281 | ;; Thanks bpalmer! | 288 | ;; Thanks bpalmer! |
282 | (advice-add 'show-paren-function :around | 289 | (advice-add 'show-paren-function :around |
@@ -289,11 +296,12 @@ | |||
289 | erc-track-mode | 296 | erc-track-mode |
290 | erc-truncate-mode) | 297 | erc-truncate-mode) |
291 | 298 | ||
292 | (setup (:straight erc-hl-nicks) | 299 | ;; (setup (:straight erc-hl-nicks) |
293 | (with-eval-after-load 'erc | 300 | ;; (with-eval-after-load 'erc |
294 | (require 'erc-hl-nicks) | 301 | ;; (require 'erc-hl-nicks) |
295 | (:option erc-hl-nicks-minimum-contrast-ratio 4.5) | 302 | ;; (:option erc-hl-nicks-minimum-contrast-ratio 4.5) |
296 | (:hook-into erc-mode)))) | 303 | ;; (:hook-into erc-mode))) |
304 | ) | ||
297 | 305 | ||
298 | (setup eshell | 306 | (setup eshell |
299 | (:also-load acdw-eshell | 307 | (:also-load acdw-eshell |