From f313ba9c6aa869b2f615a23b97fd2c91024236e3 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 26 Feb 2019 00:51:53 -0800 Subject: [PATCH] Add oni-circe and oni-lui --- oni-circe.el | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++ oni-lui.el | 52 ++++++++++++++++++++++ oni-slack.el | 4 +- 3 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 oni-circe.el create mode 100644 oni-lui.el diff --git a/oni-circe.el b/oni-circe.el new file mode 100644 index 0000000..084f2d4 --- /dev/null +++ b/oni-circe.el @@ -0,0 +1,122 @@ +;;; oni-circe.el --- Circe configuration -*- lexical-binding: t; -*- + +;; Copyright (C) 2019 Tom Willemse + +;; Author: Tom Willemse +;; Keywords: local +;; Version: 20190226004925 +;; Package-Requires: (circe oni-lui) + +;; 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: + +;; Configuration for the Circe IRC client. + +;;; Code: + +(require 'circe) +(require 'circe-color-nicks) +(require 'circe-serenity) + +(defun oni-circe-get-password-for (host) + "Create a function that will get a password for HOST. +The returned function will look for the password in .authinfo, +which may be encrypted." + (lambda (_) + (let ((found (nth 0 (auth-source-search :max 1 + :host host + :require '(:secret))))) + (when found + (let ((secret (plist-get found :secret))) + (if (functionp secret) + (funcall secret) + secret)))))) + +(add-to-list 'circe-network-options + `("Freenode" + :nick "ryuslash" + :channels ("#mowedline" + "#ninthfloor" + "#dispass" + "#linuxvoice" + "#conkeror" + "#emacs-circe" + "#chicken" + :after-auth + "#emacs") + :nickserv-password + ,(oni-circe-get-password-for "irc.freenode.net"))) + +(add-to-list 'circe-network-options + `("Twitch" + :use-tls nil + :nick "ryuslash" + :host "irc.twitch.tv" + :pass ,(oni-circe-get-password-for "irc.twitch.tv") + :port 6667)) + +(enable-circe-color-nicks) +(enable-circe-serenity) + +;; (require 'mowedline) + +;; (defun mowedline-colorize-mode-line-spec (s) +;; (cond +;; ((stringp s) (string-trim s)) +;; ((eq ':propertize (car s)) +;; (let ((s (cadr s)) +;; (face (plist-get (cddr s) 'face))) +;; (if face +;; `(color ,(face-foreground face) +;; ,(substring-no-properties s)) +;; s))) +;; (t ""))) + +;; (setq mowedline-update-function 'mowedline-update/dbus) + +;; (defvar jjf-tracking-buffers '()) +;; (defvar jjf-external-tracking-timer nil) +;; (defun jjf-external-tracking () +;; (setq jjf-external-tracking-timer nil) +;; (mowedline-update +;; 'irc +;; (if (stringp jjf-tracking-buffers) +;; (mowedline-colorize jjf-tracking-buffers t) +;; (format "%S" (mapcar #'mowedline-colorize-mode-line-spec +;; jjf-tracking-buffers))))) + +;; (defun oni:clear-irc-mowedline-widget () +;; (mowedline-clear 'irc)) + +;; (defun jjf-external-tracking-advice (orig-fun &rest args) +;; "Update my external status bar when tracking computes a new +;; status line, and suppress tracking in the mode-line. Since +;; tracking-status may be called many times in quick succession, for +;; example on a make-frame-visible event, we use a short timer to +;; only call the updater once within a minimum duration." +;; (setq jjf-tracking-buffers (apply orig-fun args)) +;; (when jjf-external-tracking-timer +;; (cancel-timer jjf-external-tracking-timer)) +;; (setq jjf-external-tracking-timer +;; (run-at-time 0.2 nil 'jjf-external-tracking)) +;; nil) + +;;(advice-add 'tracking-status :around #'jjf-external-tracking-advice) +;;(add-hook 'kill-emacs-hook 'oni:clear-irc-mowedline-widget) + +;;;###autoload(with-eval-after-load 'circe (require 'oni-circe)) + +(provide 'oni-circe) +;;; oni-circe.el ends here diff --git a/oni-lui.el b/oni-lui.el new file mode 100644 index 0000000..2c22eb4 --- /dev/null +++ b/oni-lui.el @@ -0,0 +1,52 @@ +;;; oni-lui.el --- LUI configuration -*- lexical-binding: t; -*- + +;; Copyright (C) 2019 Tom Willemse + +;; Author: Tom Willemse +;; Keywords: local +;; Version: 20190226004504 +;; Package-Requires: (circe) + +;; 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: + +;; Configuration for the Linewise User Interface package. + +;;; Code: + +(require 'lui) + +(defun oni-lui--set-margin-width () + "Set the margin width to 5." + (setq right-margin-width 5)) + +(defun oni-lui--set-prompt-wrap-prefix () + "Set the wrap prefix to two spaces." + (setq wrap-prefix " ")) + +(with-eval-after-load 'lui + (setq lui-time-stamp-position 'right-margin + lui-time-stamp-format "%H:%M")) + +(add-hook 'lui-mode-hook #'oni-lui--set-margin-width) +(add-hook 'lui-mode-hook #'oni-lui--set-prompt-wrap-prefix) +(add-hook 'lui-mode-hook 'visual-line-mode) + +(setq lui-fill-type nil) + +;;;###autoload(with-eval-after-load 'lui (require 'oni-lui)) + +(provide 'oni-lui) +;;; oni-lui.el ends here diff --git a/oni-slack.el b/oni-slack.el index d7649b3..4ee4d94 100644 --- a/oni-slack.el +++ b/oni-slack.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 20190218231425 -;; Package-Requires: (slack) +;; Version: 20190226005042 +;; Package-Requires: (slack oni-lui) ;; 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