Fix various load order issues

core/siren-editor.el

@@ -28,6 +28,7 @@
 (delete-selection-mode t)
 
 ;; Save place in files
+(setq save-place-file (expand-file-name "saveplace" siren-savefile-dir))
 (save-place-mode 1)
 
 ;; Electric behavior
@@ -75,12 +76,6 @@
   ;; (global-set-key [mouse-5] 'scroll-up-line)
   )
 
-;; saveplace remembers your location in a file when saving files
-(require 'saveplace)
-(setq save-place-file (expand-file-name "saveplace" siren-savefile-dir))
-;; activate it for all buffers
-(setq-default save-place t)
-
 ;; savehist keeps track of some history
 (require 'savehist)
 (setq savehist-additional-variables
@@ -94,7 +89,6 @@
 
 ;; Recentf
 (require 'recentf)
-(recentf-mode 1)
 (setq recentf-save-file (expand-file-name "recentf" siren-savefile-dir)
       recentf-max-saved-items 500
       recentf-max-menu-items 100

modules/siren-anzu.el

@@ -8,8 +8,6 @@
 
 (use-package anzu
   :config
-  (global-anzu-mode +1)
-
   (set-face-attribute 'anzu-mode-line nil
                       :foreground "yellow" :weight 'bold)
 
@@ -22,7 +20,9 @@
   (global-set-key [remap query-replace] 'anzu-query-replace)
   (global-set-key (kbd "C-c C-r") 'anzu-query-replace)
   (global-set-key [remap query-replace-regexp] 'anzu-query-replace-regexp)
-  (global-set-key (kbd "C-x C-r") 'anzu-query-replace-regexp))
+  (global-set-key (kbd "C-x C-r") 'anzu-query-replace-regexp)
+
+  (global-anzu-mode +1))
 
 (provide 'siren-anzu)
 ;;; siren-anzu.el ends here

modules/siren-ido.el

@@ -6,10 +6,7 @@
 
 ;;; Code:
 
-(siren-require-packages '(ido-completing-read+ ido-vertical-mode smex))
-
 (require 'ido)
-(ido-mode 1)
 
 (setq ido-auto-merge-work-directories-length -1
       ido-case-fold t
@@ -18,10 +15,13 @@
       ido-enable-flex-matching t
       ido-enable-prefix nil
       ido-max-prospects 10
-      ido-save-directory-list-file (expand-file-name "ido.hist" siren-savefile-dir)
+      ido-save-directory-list-file (expand-file-name "ido.hist"
+                                                     siren-savefile-dir)
       ido-use-faces nil
       ido-use-filename-at-point nil)
 
+(ido-mode 1)
+
 (use-package ido-completing-read+
   :config
   (ido-ubiquitous-mode 1))

modules/siren-project-explorer.el

@@ -10,12 +10,13 @@
   :bind
   ("C-x C-p" . project-explorer-toggle)
 
-  :config
+  :init
   (setq pe/follow-current t
         pe/width 54
         pe/cache-directory (expand-file-name
                             "project-explorer-cache" siren-savefile-dir))
 
+  :config
   ;; Make Project Explorer open selected file in last used buffer
   (setq pe/display-content-buffer-function
         (lambda (buffer)

modules/siren-projectile.el

@@ -15,7 +15,10 @@
   ("C-x t" . projectile-find-test-file)
   ("C-x C-v" . projectile-switch-to-buffer)
 
-  :config
+  :init
+  (setq projectile-cache-file (expand-file-name
+                               "projectile.cache" siren-savefile-dir))
+
   (setq projectile-completion-system 'ido
         projectile-enable-caching nil
         projectile-globally-ignored-directories '(".idea"
@@ -37,12 +40,11 @@
                                                   "Godeps"
                                                   "elpa"
                                                   "savefile")
-        projectile-globally-ignored-files (quote ("TAGS" "*.log"))
+        projectile-globally-ignored-files '("TAGS" "*.log")
         projectile-sort-order 'recently-active
-        projectile-mode-line (quote "")
-        projectile-cache-file (expand-file-name
-                               "projectile.cache" siren-savefile-dir))
+        projectile-mode-line (quote ""))
 
+  :config
   ;; Treat separate directories with Gemfiles within a single git repo as separate
   ;; projects.
   (push "Gemfile" projectile-project-root-files-bottom-up)

modules/siren-smex.el

@@ -14,8 +14,10 @@
   ("C-c C-m" . smex)
   ("C-c C-c M-x" . execute-extended-command)
 
-  :config
+  :init
   (setq smex-save-file (expand-file-name ".smex-items" siren-savefile-dir))
+
+  :config
   (smex-initialize))
 
 (provide 'siren-smex)