refactor(irc): remove unnecessary variables

These variables don't add any value to the original variables whose
defaults they change, so they've been deprecated. Users should modify
the original variables themselves.
This commit is contained in:
Henrik Lissner 2024-07-23 13:56:26 -04:00
parent 2f2c294529
commit c95ecc6293
No known key found for this signature in database
GPG key ID: B60957CA074D39A3

View file

@ -19,20 +19,9 @@ Useful for scenarios where an instant reconnect will not be successful.")
(defvar +irc-bot-list '("fsbot" "rudybot") (defvar +irc-bot-list '("fsbot" "rudybot")
"Nicks listed have `circe-fool-face' applied and will not be tracked.") "Nicks listed have `circe-fool-face' applied and will not be tracked.")
(defvar +irc-time-stamp-format "%H:%M"
"The format of time stamps.
See `format-time-string' for a full description of available
formatting directives. ")
(defvar +irc-notifications-watch-strings nil
"A list of strings which can trigger a notification. You don't need to put
your nick here.
See `circe-notifications-watch-strings'.")
(defvar +irc-defer-notifications nil (defvar +irc-defer-notifications nil
"How long to defer enabling notifications, in seconds (e.g. 5min = 300). "How long to defer enabling notifications, in seconds (e.g. 5min = 300).
Useful for ZNC users who want to avoid the deluge of notifications during buffer Useful for ZNC users who want to avoid the deluge of notifications during buffer
playback.") playback.")
@ -42,6 +31,9 @@ playback.")
(format (format "%%%ds | %%s" +irc-left-padding) (format (format "%%%ds | %%s" +irc-left-padding)
(concat "*** " left) right)) (concat "*** " left) right))
(define-obsolete-variable-alias '+irc-notifications-watch-strings 'circe-notifications-watch-strings "v3.0.0")
(define-obsolete-variable-alias '+irc-time-stamp-format 'lui-time-stamp-format "v3.0.0")
;; ;;
;; Packages ;; Packages
@ -165,8 +157,7 @@ playback.")
#'enable-circe-notifications)) #'enable-circe-notifications))
(enable-circe-notifications)))) (enable-circe-notifications))))
:config :config
(setq circe-notifications-watch-strings +irc-notifications-watch-strings (setq circe-notifications-emacs-focused nil
circe-notifications-emacs-focused nil
circe-notifications-alert-style circe-notifications-alert-style
(cond ((featurep :system 'macos) 'osx-notifier) (cond ((featurep :system 'macos) 'osx-notifier)
((featurep :system 'linux) 'libnotify) ((featurep :system 'linux) 'libnotify)
@ -181,6 +172,8 @@ playback.")
(when (modulep! :checkers spell) (when (modulep! :checkers spell)
(setq lui-flyspell-p t)) (setq lui-flyspell-p t))
(setq lui-time-stamp-format "%H:%M"
lui-time-stamp-position 'right-margin)
(after! evil (after! evil
(defun +irc-evil-insert-h () (defun +irc-evil-insert-h ()
@ -221,9 +214,9 @@ Courtesy of esh-mode.el"
(add-hook! 'lui-mode-hook (add-hook! 'lui-mode-hook
(defun +irc-init-lui-margins-h () (defun +irc-init-lui-margins-h ()
(setq lui-time-stamp-position 'right-margin (pcase lui-time-stamp-position
lui-time-stamp-format +irc-time-stamp-format (`right-margin (setq right-margin-width (length (format-time-string lui-time-stamp-format))))
right-margin-width (length (format-time-string lui-time-stamp-format)))) (`left-margin (setq left-margin-width (length (format-time-string lui-time-stamp-format))))))
(defun +irc-init-lui-wrapping-a () (defun +irc-init-lui-wrapping-a ()
(setq fringes-outside-margins t (setq fringes-outside-margins t
word-wrap t word-wrap t