aboutsummaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorGravatar Tom Willemse2019-02-26 00:53:39 -0800
committerGravatar Tom Willemse2019-02-26 00:53:39 -0800
commit3ba44832c75f7bbee821d02ebc3a3de7b912de15 (patch)
tree12a013a06dfe633476b0c99c3877585c871d936b /emacs
parentd08b398ff1f536141f2c2668c47e2eabb888413b (diff)
downloadnew-dotfiles-3ba44832c75f7bbee821d02ebc3a3de7b912de15.tar.gz
new-dotfiles-3ba44832c75f7bbee821d02ebc3a3de7b912de15.zip
Move LUI and Circe configs to emacs-config
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.el2
-rw-r--r--emacs/.emacs.d/init/oni-circe-init.el105
-rwxr-xr-xemacs/.emacs.d/init/oni-lui-init.el49
-rw-r--r--emacs/.emacs.d/site-lisp/oni-circe.el45
4 files changed, 0 insertions, 201 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 62fb6f4..ca0780a 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -162,7 +162,6 @@
;; (propertize (concat " " (char-to-string #xf233))
;; 'face '(:family "Font Awesome" :height 0.75))))
-(with-eval-after-load 'circe (load "oni-circe-init"))
(with-eval-after-load 'cmake-mode (load "oni-cmake-init"))
(with-eval-after-load 'compile (load "oni-compilation-init"))
(with-eval-after-load 'dired (load "oni-dired-init"))
@@ -170,7 +169,6 @@
(with-eval-after-load 'elec-pair (load "oni-elec-pair-init"))
(with-eval-after-load 'eshell (load "oni-eshell-init"))
(with-eval-after-load 'gnus (load "oni-gnus-init"))
-(with-eval-after-load 'lui (load "oni-lui-init"))
(with-eval-after-load 'ruby-mode (load "oni-ruby-init"))
(with-eval-after-load 'scheme (load "oni-scheme-init"))
(with-eval-after-load 'sh-mode (load "oni-sh-mode-init"))
diff --git a/emacs/.emacs.d/init/oni-circe-init.el b/emacs/.emacs.d/init/oni-circe-init.el
deleted file mode 100644
index 27484cc..0000000
--- a/emacs/.emacs.d/init/oni-circe-init.el
+++ /dev/null
@@ -1,105 +0,0 @@
-;;; oni-circe-init.el --- My Circe configuration -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2018 Tom Willemse
-
-;; Author: Tom Willemse <tom@ryuslash.org>
-;; 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 <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; My Circe configuration
-
-;;; Code:
-
-(require 'circe)
-(require 'circe-color-nicks)
-(require 'circe-serenity)
-(require 'oni-circe)
-;(require 'mowedline)
-
-(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)
-
-(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)
-
-(provide 'oni-circe-init)
-;;; oni-circe-init.el ends here
diff --git a/emacs/.emacs.d/init/oni-lui-init.el b/emacs/.emacs.d/init/oni-lui-init.el
deleted file mode 100755
index 290f824..0000000
--- a/emacs/.emacs.d/init/oni-lui-init.el
+++ /dev/null
@@ -1,49 +0,0 @@
-;;; oni-lui-init.el --- Linewise User Interface configuration -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2018 Tom Willemse
-
-;; Author: Tom Willemse <tom@ryuslash.org>
-;; 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 <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; My customizations to the Linewise User Interface. Used by both
-;; Circe and emacs-slack.
-
-;;; Code:
-
-(require 'lui)
-
-(defun oni-lui-init--set-margin-width ()
- "Set the margin width to 5."
- (setq right-margin-width 5))
-
-(defun oni-lui-init--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-init--set-margin-width)
-(add-hook 'lui-mode-hook #'oni-lui-init--set-prompt-wrap-prefix)
-(add-hook 'lui-mode-hook 'visual-line-mode)
-
-(setq lui-fill-type nil)
-
-(provide 'oni-lui-init)
-;;; oni-lui-init.el ends here
diff --git a/emacs/.emacs.d/site-lisp/oni-circe.el b/emacs/.emacs.d/site-lisp/oni-circe.el
deleted file mode 100644
index 22e5fcd..0000000
--- a/emacs/.emacs.d/site-lisp/oni-circe.el
+++ /dev/null
@@ -1,45 +0,0 @@
-;;; oni-circe.el --- Extra commands and functions for circe -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2016 Tom Willemse
-
-;; Author: Tom Willemse <tom@ryuslash.org>
-;; Keywords:
-
-;; 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 <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Here are some extra commands and functions for circe.
-
-;;; Code:
-
-(require 'auth-source)
-
-;;;###autoload
-(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))))))
-
-(provide 'oni-circe)
-;;; oni-circe.el ends here