Update edit and publish configs, tweak OBS, add Mumble client

1 files changed, 19 insertions, 2 deletions

diff --git a/roles/edit/templates/emacsconf-edit.el b/roles/edit/templates/emacsconf-edit.el
index e187c69..b659121 100644
--- a/roles/edit/templates/emacsconf-edit.el
+++ b/roles/edit/templates/emacsconf-edit.el
@@ -64,8 +64,25 @@
   ("u" emacsconf-upload-dired "upload"))
 (global-set-key (kbd "C-c e") #'hydra-emacsconf/body)
 
+(setq erc-nick "{{ erc_user }}")
+(setq erc-password "{{ erc_password }}")
+(setq erc-server "{{ erc_server }}")
+(setq erc-port "{{ erc_port }}")
+(setq erc-autojoin-channels-alist '((".*"
+                                     {% for channel in erc_channels %}
+                                     "#{{ channel }}"
+                                     {% endfor %}
+                                     {% for track in emacsconf_tracks %}
+                                     "#{{ track.channel }}"
+                                     {% endfor %})))
+
+(defun emacsconf-erc-connect ()
+  (interactive)
+  (erc-tls :server "{{ erc_server }}" :nick erc-nick :password erc-password :port erc-port))
+
 (require 'ox-md)
-(server-start)
+(unless (and (boundp 'server-clients) server-clients) (server-start))
 
 (find-file "{{ emacsconf_private_dir }}/conf.org")
-
+(emacsconf-add-org-after-todo-state-change-hook)
+(emacsconf-erc-connect)