Various things

- Disable local file loading for now until I have a solution for the
  DBus problem

- Emacs daemon implicitly starts server

3 files changed, 8 insertions, 8 deletions

diff --git a/init-eshell.el b/init-eshell.el
index e2191dd4ecf5..73ec85a565dc 100644
--- a/init-eshell.el
+++ b/init-eshell.el
@@ -6,9 +6,6 @@
 ;; Hide banner message ...
 (setq eshell-banner-message "")
 
-(defvar home-dir)
-(setq home-dir (expand-file-name "~"))
-
 (defun eshell-mode-hook-setup ()
   "Sets up EShell when it is loaded"
   (setq eshell-path-env (concat
diff --git a/init-settings.el b/init-settings.el
index 0b0233554728..524275e73fee 100644
--- a/init-settings.el
+++ b/init-settings.el
@@ -116,8 +116,6 @@
 
 (set-default-font "Source Code Pro 12")
 
-(add-to-list 'after-make-frame-functions 'set-font)
-
 ;; Don't make the nyan cat too long ... I have other stuff in the mode
 ;; bar as well!
 (set-variable 'nyan-bar-length 15)
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)
+