diff options
author | Case Duckworth | 2023-05-05 09:58:21 -0500 |
---|---|---|
committer | Case Duckworth | 2023-05-05 09:58:21 -0500 |
commit | 989171268461a0069ecd53a49e6098ce08638102 (patch) | |
tree | b88889d371152458f674c0a608222bf1192f3980 /lisp/acdw-chat.el | |
parent | remove bad fiels (diff) | |
download | emacs-989171268461a0069ecd53a49e6098ce08638102.tar.gz emacs-989171268461a0069ecd53a49e6098ce08638102.zip |
changes use-package
Diffstat (limited to 'lisp/acdw-chat.el')
-rw-r--r-- | lisp/acdw-chat.el | 96 |
1 files changed, 64 insertions, 32 deletions
diff --git a/lisp/acdw-chat.el b/lisp/acdw-chat.el index 62dcf72..9294ffe 100644 --- a/lisp/acdw-chat.el +++ b/lisp/acdw-chat.el | |||
@@ -51,6 +51,16 @@ CHANNEL, SERVER, NICK, and BIBOUMI-SERVER are passed to | |||
51 | nick | 51 | nick |
52 | 'popup)))) | 52 | 'popup)))) |
53 | 53 | ||
54 | (defalias 'jabber-irc-join 'jabber-biboumi-muc-connect) | ||
55 | |||
56 | (defun jabber-connect-all* (&optional arg) | ||
57 | "Run `jabber-connect-all'. | ||
58 | With a prefix ARG, disconnect first." | ||
59 | (interactive "p") | ||
60 | (when arg | ||
61 | (jabber-disconnect)) | ||
62 | (jabber-connect-all)) | ||
63 | |||
54 | (defun jabber-group-yank-join-url () | 64 | (defun jabber-group-yank-join-url () |
55 | "Yank a url for joining the focused group." | 65 | "Yank a url for joining the focused group." |
56 | (interactive) | 66 | (interactive) |
@@ -62,7 +72,7 @@ CHANNEL, SERVER, NICK, and BIBOUMI-SERVER are passed to | |||
62 | ;;; Packages | 72 | ;;; Packages |
63 | 73 | ||
64 | (use-package jabber | 74 | (use-package jabber |
65 | :load-path "~/src/emacs/jabber/" | 75 | :load-path "~/src/jabber.el/" |
66 | :custom-face | 76 | :custom-face |
67 | (jabber-activity-face ((t :inherit jabber-chat-prompt-foreign | 77 | (jabber-activity-face ((t :inherit jabber-chat-prompt-foreign |
68 | :foreground unspecified | 78 | :foreground unspecified |
@@ -85,37 +95,58 @@ CHANNEL, SERVER, NICK, and BIBOUMI-SERVER are passed to | |||
85 | :bind-keymap ("C-c j" . jabber-global-keymap) | 95 | :bind-keymap ("C-c j" . jabber-global-keymap) |
86 | :bind (("C-c C-SPC" . jabber-activity-switch-to)) | 96 | :bind (("C-c C-SPC" . jabber-activity-switch-to)) |
87 | :config | 97 | :config |
88 | (setopt jabber-account-list '(("acdw@hmm.st")) | 98 | (setq jabber-account-list '(("acdw@hmm.st")) |
89 | jabber-auto-reconnect t | 99 | jabber-auto-reconnect t |
90 | jabber-biboumi-server "irc.hmm.st" | 100 | jabber-biboumi-server "irc.hmm.st" |
91 | jabber-biboumi-irc-servers '("irc.libera.chat" | 101 | jabber-biboumi-irc-servers '("irc.libera.chat" |
92 | "irc.tilde.chat" | 102 | "irc.oftc.net" |
93 | "tilde.town" | 103 | "irc.tilde.chat" |
94 | "m455.casa" | 104 | "tilde.town" |
95 | "irc.twitch.tv") | 105 | "m455.casa" |
96 | jabber-biboumi-default-nick "acdw" | 106 | "irc.twitch.tv") |
97 | jabber-last-read-marker (make-string fill-column ?.) | 107 | jabber-biboumi-default-nick "acdw" |
98 | jabber-muc-decorate-presence-patterns | 108 | jabber-last-read-marker (make-string fill-column ?.) |
99 | '(("\\( enters the room ([^)]+)\\| has left the chatroom\\)$" . nil) | 109 | jabber-muc-decorate-presence-patterns |
100 | ("Mode #.*" . jabber-muc-presence-dim) | 110 | '(("\\( enters the room ([^)]+)\\| has left the chatroom\\)$" . nil) |
101 | ("." . jabber-muc-presence-dim)) | 111 | ("Mode #.*" . jabber-muc-presence-dim) |
102 | jabber-activity-make-strings #'jabber-activity-make-strings-shorten | 112 | ("." . jabber-muc-presence-dim)) |
103 | jabber-rare-time-format " - - - - - - %H:%M %F" | 113 | jabber-activity-make-strings #'jabber-activity-make-strings-shorten |
104 | jabber-muc-header-line-format | 114 | jabber-rare-time-format " - - - - - - %H:%M %F" |
105 | '(" " (:eval (replace-regexp-in-string "%" "%%" | 115 | jabber-chat-header-line-format |
106 | (jabber-jid-displayname | 116 | '("" (jabber-chat-buffer-show-avatar |
107 | jabber-group))) | 117 | (:eval |
108 | " / " jabber-muc-topic) | 118 | (let ((buddy (jabber-jid-symbol jabber-chatting-with))) |
109 | ;; buffer name formats | 119 | (jabber-propertize " " |
110 | jabber-chat-buffer-format "*xmpp* %n" | 120 | 'display (get buddy 'avatar))))) |
111 | jabber-browse-buffer-format "*xmpp-browse* %n" | 121 | (:eval (replace-regexp-in-string "%" "%%" |
112 | jabber-groupchat-buffer-format "*xmpp-muc* %n" | 122 | (jabber-jid-displayname |
113 | jabber-muc-private-buffer-format "*xmpp-muc-private* %n" | 123 | jabber-chatting-with))) |
114 | ;; "prompt" (speaker) formats | 124 | "\t" (:eval (let ((buddy (jabber-jid-symbol jabber-chatting-with))) |
115 | jabber-groupchat-prompt-format (format "%%>%dn . " jabber-prefix-width) | 125 | (propertize |
116 | jabber-chat-local-prompt-format (format "%%>%dn . " jabber-prefix-width) | 126 | (or |
117 | jabber-chat-foreign-prompt-format (format "%%>%dn . " jabber-prefix-width) | 127 | (cdr (assoc (get buddy 'show) jabber-presence-strings)) |
118 | jabber-muc-private-foreign-prompt-format "\n%g/%n . ") | 128 | (get buddy 'show)) |
129 | 'face | ||
130 | (or (cdr (assoc (get buddy 'show) jabber-presence-faces)) | ||
131 | 'jabber-roster-user-online)))) | ||
132 | "\t" (:eval (jabber-fix-status (get (jabber-jid-symbol jabber-chatting-with) 'status))) | ||
133 | "\t" jabber-events-message | ||
134 | "\t" jabber-chatstates-message) | ||
135 | jabber-muc-header-line-format | ||
136 | '(" " (:eval (replace-regexp-in-string "%" "%%" | ||
137 | (jabber-jid-displayname | ||
138 | jabber-group))) | ||
139 | " / " jabber-muc-topic) | ||
140 | ;; buffer name formats | ||
141 | jabber-chat-buffer-format "*xmpp* %n" | ||
142 | jabber-browse-buffer-format "*xmpp-browse* %n" | ||
143 | jabber-groupchat-buffer-format "*xmpp-muc* %n" | ||
144 | jabber-muc-private-buffer-format "*xmpp-muc-private* %n" | ||
145 | ;; "prompt" (speaker) formats | ||
146 | jabber-groupchat-prompt-format (format "%%>%dn . " jabber-prefix-width) | ||
147 | jabber-chat-local-prompt-format (format "%%>%dn . " jabber-prefix-width) | ||
148 | jabber-chat-foreign-prompt-format (format "%%>%dn . " jabber-prefix-width) | ||
149 | jabber-muc-private-foreign-prompt-format "\n%g/%n . ") | ||
119 | ;; jabber muc nick coloring | 150 | ;; jabber muc nick coloring |
120 | ;; wgreenhous | I found 1.5 ok for saturation and 2.0 for value (modus) | 151 | ;; wgreenhous | I found 1.5 ok for saturation and 2.0 for value (modus) |
121 | ;; (setopt jabber-muc-nick-value 1.0 | 152 | ;; (setopt jabber-muc-nick-value 1.0 |
@@ -131,6 +162,7 @@ CHANNEL, SERVER, NICK, and BIBOUMI-SERVER are passed to | |||
131 | (map-keymap (lambda (key command) | 162 | (map-keymap (lambda (key command) |
132 | (define-key jabber-global-keymap (vector (+ key #x60)) command)) | 163 | (define-key jabber-global-keymap (vector (+ key #x60)) command)) |
133 | jabber-global-keymap) | 164 | jabber-global-keymap) |
165 | (define-key jabber-global-keymap "c" #'jabber-connect-all*) | ||
134 | (require 'jabber-httpupload nil t) | 166 | (require 'jabber-httpupload nil t) |
135 | (add-hook 'jabber-post-connect-hooks #'jabber-enable-carbons) | 167 | (add-hook 'jabber-post-connect-hooks #'jabber-enable-carbons) |
136 | (remove-hook 'jabber-alert-muc-hooks 'jabber-muc-echo) | 168 | (remove-hook 'jabber-alert-muc-hooks 'jabber-muc-echo) |