diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | spacemacs/.emacs.d/private/ZNC.el | 0 | ||||
| -rw-r--r-- | spacemacs/.emacs.d/private/irc/extensions.el | 82 | ||||
| -rw-r--r-- | spacemacs/.emacs.d/private/irc/packages.el | 31 | ||||
| -rw-r--r-- | spacemacs/.spacemacs | 1 |
5 files changed, 117 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 6baf177..17bfaab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "pentadactyl/.pentadactyl/colors/pentadactyl-solarized"] path = pentadactyl/.pentadactyl/colors/pentadactyl-solarized url = https://github.com/claytron/pentadactyl-solarized +[submodule "spacemacs/.emacs.d/private/ZNC.el"] + path = spacemacs/.emacs.d/private/ZNC.el + url = https://github.com/sshirokov/ZNC.el diff --git a/spacemacs/.emacs.d/private/ZNC.el b/spacemacs/.emacs.d/private/ZNC.el new file mode 160000 +Subproject 94c8e4cdcfb51b75d5f95cb51ce21c6274325e1 diff --git a/spacemacs/.emacs.d/private/irc/extensions.el b/spacemacs/.emacs.d/private/irc/extensions.el new file mode 100644 index 0000000..47b48b1 --- /dev/null +++ b/spacemacs/.emacs.d/private/irc/extensions.el @@ -0,0 +1,82 @@ +;;; extensions.el --- irc Layer extensions File for Spacemacs +;; +;; Copyright (c) 2012-2014 Sylvain Benner +;; Copyright (c) 2014-2015 Sylvain Benner & Contributors +;; +;; Author: Sylvain Benner <sylvain.benner@gmail.com> +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;; vbe* functions for reading passwords from authinfo by Vincent Bernat +;; +;;; License: GPLv3 + +(setq irc-pre-extensions + '( + ;; pre extension names go here + )) + +(setq irc-post-extensions + '( + ;; post extension names go here + znc + )) + +;; For each extension, define a function irc/init-<extension-name> +;; +(defun irc/init-znc () + "Initialize znc" + (use-package znc + :load-path "private/ZNC.el" + :commands (znc-erc znc-all) + :defer t + :init (evil-leader/set-key + "aize" 'znc-erc + "aiza" 'znc-all) + :config + (progn + (defun vbe:znc-add-server (server port user networks) + "Add a server to the list of ZNC servers. +We use SSL inconditionaly. Moreover, we don't store the password +but put nil instead. At least, we tweak the username to contain +the network name later, this will be separated again." + (add-to-list 'znc-servers + (list server + port + t ; SSL enabled + (mapcar (function (lambda (slug) (list slug + (format "%s/%s" user slug) + nil))) + networks)))) + + (defun vbe:znc-erc-ssl-connector (&rest R) + "Connect to ERC using SSL and retrieve password with `auth-source-search'. +Moreover, handle multiple networks by sending the password with +the appropriate network slug that we extract from the nick." + (let* ((user (nth 0 (split-string (plist-get R :nick) "/"))) + (slug (nth 1 (split-string (plist-get R :nick) "/"))) + (found (nth 0 (auth-source-search :host (plist-get R :server) + :user user + :require '(:user :secret) + :max 1)))) + (if found + (let ((password (let ((secret (plist-get found :secret))) + (if (functionp secret) + (funcall secret) + secret)))) + (plist-put R :password (format "%s/%s:%s" user slug password)) + (plist-put R :nick user) + (apply 'erc-tls R))))) + (setq znc-erc-ssl-connector 'vbe:znc-erc-ssl-connector) + + ;; Define networks + (vbe:znc-add-server "aminb.org" 6697 "aminb" + '(freenode mozilla)) + ) + ) + ) +;; +;; Often the body of an initialize function uses `use-package' +;; For more info on `use-package', see readme: +;; https://github.com/jwiegley/use-package diff --git a/spacemacs/.emacs.d/private/irc/packages.el b/spacemacs/.emacs.d/private/irc/packages.el new file mode 100644 index 0000000..d8cba40 --- /dev/null +++ b/spacemacs/.emacs.d/private/irc/packages.el @@ -0,0 +1,31 @@ +;;; packages.el --- irc Layer packages File for Spacemacs +;; +;; Copyright (c) 2012-2014 Sylvain Benner +;; Copyright (c) 2014-2015 Sylvain Benner & Contributors +;; +;; Author: Sylvain Benner <sylvain.benner@gmail.com> +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 + +;; List of all packages to install and/or initialize. Built-in packages +;; which require an initialization must be listed explicitly in the list. +(setq irc-packages + '( + ;; package names go here + )) + +;; List of packages to exclude. +(setq irc-excluded-packages '()) + +;; For each package, define a function irc/init-<package-name> +;; +;; (defun irc/init-my-package () +;; "Initialize my package" +;; ) +;; +;; Often the body of an initialize function uses `use-package' +;; For more info on `use-package', see readme: +;; https://github.com/jwiegley/use-package diff --git a/spacemacs/.spacemacs b/spacemacs/.spacemacs index 81e1837..447a59f 100644 --- a/spacemacs/.spacemacs +++ b/spacemacs/.spacemacs @@ -33,6 +33,7 @@ ;; (haskell :variables '(haskell-enable-hindent-style "chris-done" ;; haskell-enable-shm-support t)) erc + irc version-control ) ;; List of additional packages that will be installed wihout being |