diff options
| author | Vincent Ambo <vincent@spotify.com> | 2014-02-04T22·48+0100 |
|---|---|---|
| committer | Vincent Ambo <vincent@spotify.com> | 2014-02-04T22·48+0100 |
| commit | bdbc18d285dee458f73c92efeac9a5eb417892e0 (patch) | |
| tree | 3c2394c6d60743419c40c82082aa56b0384f0828 /init.el | |
| parent | 05d10fae2ad2142555b5dbacf5fc7786ea485dec (diff) | |
Various things
- Disable local file loading for now until I have a solution for the DBus problem - Emacs daemon implicitly starts server
Diffstat (limited to 'init.el')
| -rw-r--r-- | init.el | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/init.el b/init.el index ddf5c50bf167..fa7f7a5a239e 100644 --- a/init.el +++ b/init.el @@ -72,6 +72,10 @@ ;; Is this being used by a vim user? (setq is-vim-mode nil) +;; What's the home folder? +(defvar home-dir) +(setq home-dir (expand-file-name "~")) + (when is-vim-mode (dolist (p evil-pkgs) (when (not (package-installed-p p)) @@ -94,11 +98,11 @@ (load custom-file) ;; A file with machine specific settings. -(load-file-if-exists "~/.emacs.d/init-local.el") +;(load-file-if-exists (concat home-dir "/.emacs.d/init-local.el")) ;; IRC configuration ;; Actual servers and such are loaded from irc.el -(load-file-if-exists "~/.emacs.d/init-irc.el") +; (load-file-if-exists (concat home-dir "/.emacs.d/init-irc.el")) ;; Load magnars' string manipulation library (require 's) @@ -107,4 +111,5 @@ (random t) ;; Start server for emacsclient -(server-start) +;; (server-start) + |