merged

init.el

@@ -28,7 +28,7 @@
  '(haskell-process-type (quote cabal-repl))
  '(package-selected-packages
    (quote
-    (swiper colemak-evil evil all-the-icons use-package rich-minority projectile mode-icons magit-find-file haskell-mode gruvbox-theme fill-column-indicator evil-magit counsel)))
+    (counsel-projectile swiper colemak-evil evil all-the-icons use-package rich-minority projectile mode-icons magit-find-file haskell-mode gruvbox-theme fill-column-indicator evil-magit counsel)))
  '(send-mail-function (quote smtpmail-send-it)))
 
 (custom-set-faces

my-modeline.el

@@ -183,4 +183,4 @@ can be used to add a number of spaces to the front and back of the string."
                            ;; (format-time-string "%H:%M ⁃ ")
                            (powerline-time)
                            (line-count-line)))
-                         0 0)))))
+0 0)))))

my-noexternals.el

@@ -28,6 +28,7 @@
 (fringe-mode '(0 . 0))
 (setq inhibit-startup-screen t)
 (setq vc-follow-symlinks t)
+(setq inhibit-compacting-font-caches 1)
 (global-auto-revert-mode 1)
 (electric-pair-mode 1)
 (show-paren-mode t)

my-packages.el

@@ -1,14 +1,13 @@
 (require 'package)
 (add-to-list 'package-archives
              '("melpa" . "http://melpa.milkbox.net/packages/") t)
-(add-to-list 'package-archives
-             '("marmalade" . "http://marmalade-repo.org/packages/") t)
+(add-to-list 'package-archives '("marmalade" . "http://marmalade-repo.org/packages/"))
 (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/") t
 (add-to-list 'load-path "~/.emacs.d/lisp/" t)
 
 (defvar prelude-packages
   '(all-the-icons async base16-theme bind-chord bind-key counsel dash diminish
-		  epl evil evil-magit fill-column-indicator font-lock ghc git-commit
+		  epl evil evil-magit fill-column-indicator ghc git-commit
 		  goto-chg haskell-mode ivy key-chord less-css-mode magit magit-popup
 		  pkg-info projectile swiper undo-tree use-package use-package-chords
 		  web-mode with-editor)
@@ -19,10 +18,11 @@
       nil
     t))
 
-(unless (prelude-packages-installed-p)
+
+
   (message "%s" "Emacs Prelude is now refreshing its package database...")
   (package-refresh-contents)
   (message "%s" " done.")
   (dolist (p prelude-packages)
     (when (not (package-installed-p p))
-      (package-install p))))
+      (package-install p)))