From 106fe5ab4ca5f4ebb13caa905bce130639717f35 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 7 Jun 2018 10:27:30 -0700 Subject: [PATCH] Move jabber config to separate file --- emacs/.emacs.d/init.el | 50 +---------------- emacs/.emacs.d/init/oni-jabber-init.el | 75 ++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 49 deletions(-) create mode 100755 emacs/.emacs.d/init/oni-jabber-init.el diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 69f3773..1a89c6f 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -383,55 +383,7 @@ (with-eval-after-load 'lui (load "oni-lui-init")) -(eval-when-compile (require 'jabber)) - -(setq jabber-account-list - `((,(concat "ryuslash@dukgo.com/" (system-name)) - (:connection-type . starttls)))) - -(setq jabber-avatar-cache-directory (oni:data-location "jabber/avatars/") - jabber-history-dir (oni:data-location "jabber/hist/")) - -(setq jabber-chat-buffer-format "+%n" - jabber-chat-foreign-prompt-format "%t %n " - jabber-chat-local-prompt-format "%t %n " - jabber-chat-delayed-time-format "%H:%M" - jabber-groupchat-buffer-format "++%n" - jabber-groupchat-prompt-format "%t %n ") - -(setq jabber-chat-buffer-show-avatar nil - jabber-vcard-avatars-publish nil - jabber-vcard-avatars-retrieve nil) - -(setq jabber-chat-fill-long-lines nil) - -(add-hook 'jabber-chat-mode-hook 'visual-line-mode) - -(setq jabber-chatstates-confirm nil) - -(setq jabber-muc-colorize-local t - jabber-muc-colorize-foreign t) - -(setq jabber-history-enabled t - jabber-use-global-history nil) - -(setq jabber-roster-show-bindings nil - jabber-show-offline-contacts nil) - -(add-hook 'jabber-roster-mode-hook 'oni-jabber-set-roster-mode-line) - -(add-hook 'jabber-alert-message-hooks 'jabber-message-libnotify) -(add-hook 'jabber-alert-muc-hooks 'jabber-muc-libnotify) - -(with-eval-after-load 'jabber-alert - (remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)) - -(add-hook 'jabber-alert-presence-hooks 'oni-jabber-show-status-in-buffer) - -(defun oni:set-default-directory () - (setq default-directory "~/")) - -(add-hook 'jabber-chat-mode-hook 'oni:set-default-directory) +(with-eval-after-load 'jabber (load "oni-jabber-init")) (with-eval-after-load 'gnus (load "oni-gnus-init")) diff --git a/emacs/.emacs.d/init/oni-jabber-init.el b/emacs/.emacs.d/init/oni-jabber-init.el new file mode 100755 index 0000000..9b27844 --- /dev/null +++ b/emacs/.emacs.d/init/oni-jabber-init.el @@ -0,0 +1,75 @@ +;;; oni-jabber-init.el --- Jabber configuration -*- lexical-binding: t; -*- + +;; Copyright (C) 2018 Tom Willemse + +;; Author: Tom Willemse +;; Keywords: local + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: + +;; My configuration for jabber. + +;;; Code: + +(require 'jabber) + +(defun oni:set-default-directory () + "Set the default directory to my home directory." + (setq default-directory "~/")) + +(setq jabber-account-list + `((,(concat "ryuslash@dukgo.com/" (system-name)) + (:connection-type . starttls)))) + +(setq jabber-avatar-cache-directory (oni:data-location "jabber/avatars/") + jabber-history-dir (oni:data-location "jabber/hist/")) + +(setq jabber-chat-buffer-format "+%n" + jabber-chat-foreign-prompt-format "%t %n " + jabber-chat-local-prompt-format "%t %n " + jabber-chat-delayed-time-format "%H:%M" + jabber-groupchat-buffer-format "++%n" + jabber-groupchat-prompt-format "%t %n ") + +(setq jabber-chat-buffer-show-avatar nil + jabber-vcard-avatars-publish nil + jabber-vcard-avatars-retrieve nil) + +(setq jabber-chat-fill-long-lines nil) + +(setq jabber-chatstates-confirm nil) + +(setq jabber-muc-colorize-local t + jabber-muc-colorize-foreign t) + +(setq jabber-history-enabled t + jabber-use-global-history nil) + +(setq jabber-roster-show-bindings nil + jabber-show-offline-contacts nil) + +(add-hook 'jabber-roster-mode-hook 'oni-jabber-set-roster-mode-line) +(add-hook 'jabber-alert-message-hooks 'jabber-message-libnotify) +(add-hook 'jabber-alert-muc-hooks 'jabber-muc-libnotify) +(add-hook 'jabber-chat-mode-hook 'visual-line-mode) +(add-hook 'jabber-alert-presence-hooks 'oni-jabber-show-status-in-buffer) +(add-hook 'jabber-chat-mode-hook 'oni:set-default-directory) + +(with-eval-after-load 'jabber-alert + (remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)) + +(provide 'oni-jabber-init) +;;; oni-jabber-init.el ends here