1 files changed, 3 insertions, 1 deletions
diff --git a/init.el b/init.el
index c0ec314..4a9d8bf 100644
--- a/init.el
+++ b/init.el
@@ -51,6 +51,8 @@
                     gc-cons-percentage 0.1))))
 
 ;;; Modules directory
+(if noninteractive
+    (setq user-emacs-directory default-directory))
 (push (concat user-emacs-directory "modules") load-path)
 
 ;;;------------------------------
@@ -135,7 +137,7 @@
 ;;; Settings
 (setq settings-file (expand-file-name "settings.el" user-emacs-directory))
 ;;; Loads settings file
-(when (file-exists-p custom-file)
+(when (file-exists-p settings-file)
   (load settings-file))
 
 ;; enable erase-buffer command