about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--emacs.d/init-custom.el12
-rw-r--r--emacs.d/init.el1
2 files changed, 10 insertions, 3 deletions
diff --git a/emacs.d/init-custom.el b/emacs.d/init-custom.el
index f345915c223a..dad8de7454d4 100644
--- a/emacs.d/init-custom.el
+++ b/emacs.d/init-custom.el
@@ -5,13 +5,19 @@
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
    (quote
-    ("8eaa3bce3c618cd81a318fcf2d28c1cd21278531f028feb53186f6387547dfb4" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "a234f91f9be6ed40f6ce0e94dce5cea1b9f1ccec2b9ccd42bb71c499867a3fcc" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "d6a00ef5e53adf9b6fe417d2b4404895f26210c52bb8716971be106550cea257" default)))
+    ("854dc57026d3226addcc46b2b460034a74609edbd9c14e626769ac724b10fcf5" "8eaa3bce3c618cd81a318fcf2d28c1cd21278531f028feb53186f6387547dfb4" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "a234f91f9be6ed40f6ce0e94dce5cea1b9f1ccec2b9ccd42bb71c499867a3fcc" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "d6a00ef5e53adf9b6fe417d2b4404895f26210c52bb8716971be106550cea257" default)))
  '(erc-modules
    (quote
     (autojoin button completion dcc irccontrols list log match menu move-to-prompt netsplit networks noncommands notifications readonly ring scrolltobottom stamp track)))
- '(haskell-mode-hook (quote (font-lock-mode)) t)
+ '(haskell-mode-hook (quote (font-lock-mode)))
+ '(jabber-account-list (quote (("im@tazj.in"))))
+ '(jabber-history-enabled t)
+ '(jabber-mode-line-compact t)
+ '(jabber-mode-line-mode t)
  '(ns-alternate-modifier (quote none))
- '(ns-command-modifier (quote meta)))
+ '(ns-command-modifier (quote meta))
+ '(yapm-file-path "~/.pass.gpg")
+ '(yapm-user (quote hej@tazj\.in)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 489479773bb6..919a7bb63cea 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -31,6 +31,7 @@
                   geiser
                   quack
 		  rainbow-mode
+		  jabber
 		  )
 
   "A list of packages to install at launch.")