about summary refs log tree commit diff
path: root/emacs.d
diff options
context:
space:
mode:
authorVincent Ambo <vincent@spotify.com>2013-07-25T18·22+0200
committerVincent Ambo <vincent@spotify.com>2013-07-25T18·22+0200
commit2f8813385805b7091b3a5c95a30a2985046424d1 (patch)
tree8b69fe25e6f6ad3882c5600dcf8b93139b33ad7f /emacs.d
parent2e9b4cf111b3ba46994b6bb608aca5e07ac00b75 (diff)
emacs: Added init-local.el loading for machine-local configuration, removed jabber (using bitlbee instead)
Diffstat (limited to 'emacs.d')
-rw-r--r--emacs.d/init.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 919a7bb63cea..3710b6380b69 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -31,7 +31,6 @@
                   geiser
                   quack
 		  rainbow-mode
-		  jabber
 		  )
 
   "A list of packages to install at launch.")
@@ -64,6 +63,9 @@
 (load "~/.emacs.d/init-bindings.el")
 (load "~/.emacs.d/init-eshell.el")
 
+;; A file with machine specific settings
+(load "~/.emacs.d/init-local.el")
+
 ;; IRC configuration (erc)
 ;; Actual servers and such are loaded from irc.el
 (load "~/.emacs.d/irc")