26 files changed, 45 insertions, 65 deletions
diff --git a/custom.el b/custom.el
index 7660e7a..8fe7887 100644
--- a/custom.el
+++ b/custom.el
@@ -12,7 +12,7 @@
  '(ecb-options-version "2.50")
  '(package-selected-packages
    (quote
-    (crystal-mode nginx-mode all-the-icons neotree emmet-mode ecb undo-tree pip-requirements jedi highlight-indent-guides yaml-mode whitespace-cleanup-mode sublime-themes sml-modeline smarty-mode smart-mode-line-powerline-theme scss-mode sass-mode rainbow-mode prettier-js pkgbuild-mode pcre2el nlinum markdown-mode less-css-mode flycheck editorconfig anzu ac-php))))
+    (rainbow-mode yaml-mode scss-mode sass-mode less-css-mode smarty-mode ac-php php-mode pkgbuild-mode pip-requirements jedi markdown-mode crystal-mode nginx-mode emmet-mode whitespace-cleanup-mode flycheck neotree all-the-icons highlight-indent-guides anzu sml-modeline smart-mode-line-powerline-theme smart-mode-line ecb diminish undo-tree nlinum sublime-themes use-package))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/lisp/init-crystal.el b/lisp/init-crystal.el
index 3427e0e..7e7f2e1 100644
--- a/lisp/init-crystal.el
+++ b/lisp/init-crystal.el
@@ -1,7 +1,7 @@
 ;;----------------------------------------------------------------------------
 ;; Crystal Mode
 ;;----------------------------------------------------------------------------
-(require-package 'crystal-mode)
+(use-package crystal-mode)
 
 (autoload 'crystal-mode "crystal-mode" "Major mode for crystal files" t)
 (add-to-list 'auto-mode-alist '("\\.cr$" . crystal-mode))
diff --git a/lisp/init-diminish.el b/lisp/init-diminish.el
index 6634690..3187103 100644
--- a/lisp/init-diminish.el
+++ b/lisp/init-diminish.el
@@ -1,7 +1,7 @@
 ;;----------------------------------------------------------------------------
 ;; Diminish - is minor modes with no modeline display
 ;;----------------------------------------------------------------------------
-(require-package 'diminish)
+(use-package diminish)
 
 ;; Hide undo-tree-mode
 (diminish 'undo-tree-mode)
diff --git a/lisp/init-ecb.el b/lisp/init-ecb.el
index 6e19113..889cae2 100644
--- a/lisp/init-ecb.el
+++ b/lisp/init-ecb.el
@@ -1,7 +1,7 @@
 ;;----------------------------------------------------------------------------
 ;; ECB
 ;;----------------------------------------------------------------------------
-(require-package 'ecb)
+(use-package ecb)
 
 (custom-set-variables '(ecb-options-version "2.50"))
 (setq-default ecb-tip-of-the-day nil)
diff --git a/lisp/init-editing-utils.el b/lisp/init-editing-utils.el
index b5f6f8e..bac1b97 100644
--- a/lisp/init-editing-utils.el
+++ b/lisp/init-editing-utils.el
@@ -35,7 +35,7 @@
 ;;----------------------------------------------------------------------------
 ;; Undo-tree
 ;;----------------------------------------------------------------------------
-(require-package 'undo-tree)
+(use-package undo-tree)
 (global-undo-tree-mode)
 
 ;;----------------------------------------------------------------------------
diff --git a/lisp/init-editorconfig.el b/lisp/init-editorconfig.el
index b235b30..b2eed4f 100644
--- a/lisp/init-editorconfig.el
+++ b/lisp/init-editorconfig.el
@@ -1,7 +1,7 @@
 ;;----------------------------------------------------------------------------
 ;; EditorConfig
 ;;----------------------------------------------------------------------------
-(require-package 'editorconfig)
+(use-package editorconfig)
 
 (editorconfig-mode 1)
 
diff --git a/lisp/init-elpa.el b/lisp/init-elpa.el
index 5ba04d2..fd99d97 100644
--- a/lisp/init-elpa.el
+++ b/lisp/init-elpa.el
@@ -1,12 +1,7 @@
 ;;; Find and load the correct package.el
-;; When switching between Emacs 23 and 24, we always use the bundled package.el in Emacs 24
-(let ((package-el-site-lisp-dir
-       (expand-file-name "site-lisp/package" user-emacs-directory)))
-  (when (and (file-directory-p package-el-site-lisp-dir)
-             (> emacs-major-version 23))
-    (message "Removing local package.el from load-path to avoid shadowing bundled version")
-    (setq load-path (remove package-el-site-lisp-dir load-path))))
-
+;; =====================================================
+;; use-package → https://github.com/jwiegley/use-package
+;; =====================================================
 (require 'package)
 
 ;; Repositories
@@ -23,31 +18,16 @@
         ("gnu" . 1)
         ("org" . 3)))
 ;; =================
+(package-initialize)
 
-;; Refresh packages in Emacs
-;; ==========================
-(when (not package-archive-contents)
-    (package-refresh-contents))
-
-;;; Find packages if not installed
-;; ================================
-;;; On-demand installation of packages
-(defun require-package (package &optional min-version no-refresh)
-  "Install given PACKAGE, optionally requiring MIN-VERSION.
-If NO-REFRESH is non-nil, the available package lists will not be
-re-downloaded in order to locate PACKAGE."
-  (if (package-installed-p package min-version)
-      t
-    (if (or (assoc package package-archive-contents) no-refresh)
-        (if (boundp 'package-selected-packages)
-            ;; Record this as a package the user installed explicitly
-            (package-install package nil)
-          (package-install package))
-      (progn
-        (package-refresh-contents)
-        (require-package package min-version t)))))
-;; ================================
+(unless (package-installed-p 'use-package)
+  (package-refresh-contents)
+  (package-install 'use-package))
 
-(package-initialize)
+(require 'use-package)
+(setq use-package-always-ensure t)
+;; =====================================================
+;; End use-package
+;; =====================================================
 
 (provide 'init-elpa)
diff --git a/lisp/init-emmet-mode.el b/lisp/init-emmet-mode.el
index 729bbdb..86c333f 100644
--- a/lisp/init-emmet-mode.el
+++ b/lisp/init-emmet-mode.el
@@ -1,5 +1,5 @@
 ;; emmet-mode
-(require-package 'emmet-mode)
+(use-package emmet-mode)
 (add-hook 'sgml-mode-hook 'emmet-mode) ;; Auto-start on any markup modes
 (add-hook 'css-mode-hook  'emmet-mode) ;; enable Emmet's css abbreviation.
 
diff --git a/lisp/init-flycheck.el b/lisp/init-flycheck.el
index d7a7ac5..6619782 100644
--- a/lisp/init-flycheck.el
+++ b/lisp/init-flycheck.el
@@ -1,4 +1,4 @@
-(require-package 'flycheck)
+(use-package flycheck)
 
 ;; Enable for only languages
 ;;(add-hook 'emacs-lisp-mode-hook 'flycheck-mode)
diff --git a/lisp/init-icons.el b/lisp/init-icons.el
index 252c9a4..198d8c0 100644
--- a/lisp/init-icons.el
+++ b/lisp/init-icons.el
@@ -1,7 +1,7 @@
 ;;----------------------------------
 ;; All-the-icons
 ;;----------------------------------
-(require-package 'all-the-icons)
+(use-package all-the-icons)
 
 ;;----------------------------------
 ;; Fonts - connecting with neotree
diff --git a/lisp/init-indent-guides.el b/lisp/init-indent-guides.el
index f2be7ce..508fd65 100644
--- a/lisp/init-indent-guides.el
+++ b/lisp/init-indent-guides.el
@@ -1,5 +1,5 @@
 ;; This minor mode highlights indentation levels via font-lock
-(require-package 'highlight-indent-guides)
+(use-package highlight-indent-guides)
 
 (setq highlight-indent-guides-method 'character)
 
diff --git a/lisp/init-less.el b/lisp/init-less.el
index 5245e5f..116e693 100644
--- a/lisp/init-less.el
+++ b/lisp/init-less.el
@@ -1,7 +1,7 @@
 ;;----------------------------------------------------------------------------
 ;; Less Mode
 ;;----------------------------------------------------------------------------
-(require-package 'less-css-mode)
+(use-package less-css-mode)
 (add-to-list 'auto-mode-alist '("\\.less$" . less-css-mode))
 
 (provide 'init-less)
diff --git a/lisp/init-markdown.el b/lisp/init-markdown.el
index 47ca803..b777470 100644
--- a/lisp/init-markdown.el
+++ b/lisp/init-markdown.el
@@ -1,7 +1,7 @@
 ;;----------------------------------------------------------------------------
 ;; Markdown mode
 ;;----------------------------------------------------------------------------
-(require-package 'markdown-mode)
+(use-package markdown-mode)
 
 (autoload 'markdown-mode "markdown-mode"
    "Major mode for editing Markdown files" t)
diff --git a/lisp/init-modeline.el b/lisp/init-modeline.el
index b0db030..439707e 100644
--- a/lisp/init-modeline.el
+++ b/lisp/init-modeline.el
@@ -2,11 +2,11 @@
 ;; Modeline configuration
 ;;----------------------------------------------------------------------------
 
-(require-package 'smart-mode-line)
-(require-package 'smart-mode-line-powerline-theme)
-(require-package 'sml-modeline)
+(use-package smart-mode-line)
+(use-package smart-mode-line-powerline-theme)
+(use-package sml-modeline)
 ;; Show number of occurrences when searching
-(require-package 'anzu)
+(use-package anzu)
 
 (setq sml/theme 'powerline)
 
diff --git a/lisp/init-neotree.el b/lisp/init-neotree.el
index 57edc3d..ac173a8 100644
--- a/lisp/init-neotree.el
+++ b/lisp/init-neotree.el
@@ -1,7 +1,7 @@
 ;;-----------------------------------
 ;; Neotree - NerdTree for Vim
 ;;-----------------------------------
-(require-package 'neotree)
+(use-package neotree)
 (global-set-key [f8] 'neotree-toggle)
 
 ;;-----------------------
diff --git a/lisp/init-nginx.el b/lisp/init-nginx.el
index cff947f..9e0c180 100644
--- a/lisp/init-nginx.el
+++ b/lisp/init-nginx.el
@@ -1,7 +1,7 @@
 ;;---------------------------
 ;; Nginx Mode
 ;;---------------------------
-(require-package 'nginx-mode)
+(use-package nginx-mode)
 
 (add-to-list 'auto-mode-alist '("/nginx/sites-\\(?:available\\|enabled\\)/" . nginx-mode))
 
diff --git a/lisp/init-nlinum.el b/lisp/init-nlinum.el
index 0e61eab..bd2737f 100644
--- a/lisp/init-nlinum.el
+++ b/lisp/init-nlinum.el
@@ -2,9 +2,9 @@
 ;; Line numbers
 ;;----------------------------------------------------------------------------
 ;; Linum snippets from: https://www.emacswiki.org/emacs/LineNumbers
-(require-package 'nlinum)
-(require 'linum)
-(require 'hl-line)
+(use-package nlinum)
+(use-package linum)
+(use-package hl-line)
 
 (defface my-linum-hl
   `((t :inherit linum :background ,(face-background 'hl-line nil t)))
diff --git a/lisp/init-php.el b/lisp/init-php.el
index 77157ef..833707f 100644
--- a/lisp/init-php.el
+++ b/lisp/init-php.el
@@ -1,5 +1,5 @@
-(require-package 'php-mode)
-(require-package 'ac-php)
+(use-package php-mode)
+(use-package ac-php)
 
 (autoload 'php-mode "php-mode" "Major mode for editing PHP code." t)
 (add-to-list 'auto-mode-alist '("\\.php$" . php-mode))
@@ -17,6 +17,6 @@
              (define-key php-mode-map  (kbd "C-t") 'ac-php-location-stack-back)    ;go back
              ))
 
-(require-package 'smarty-mode)
+(use-package smarty-mode)
 
 (provide 'init-php)
diff --git a/lisp/init-pkgbuild.el b/lisp/init-pkgbuild.el
index 10ce393..e5a17d1 100644
--- a/lisp/init-pkgbuild.el
+++ b/lisp/init-pkgbuild.el
@@ -1,4 +1,4 @@
-(require-package 'pkgbuild-mode)
+(use-package pkgbuild-mode)
 
 (autoload 'pkgbuild-mode "pkgbuild-mode.el" "PKGBUILD mode." t)
 (setq auto-mode-alist (append '(("/PKGBUILD$" . pkgbuild-mode)) auto-mode-alist))
diff --git a/lisp/init-python.el b/lisp/init-python.el
index fcb3c39..852edcb 100644
--- a/lisp/init-python.el
+++ b/lisp/init-python.el
@@ -11,13 +11,13 @@
 ;;----------------------------------------------------------------------------
 ;; Jedi - Python auto-completion for Emacs
 ;;----------------------------------------------------------------------------
-(require-package 'jedi)
+(use-package jedi)
 (setq auto-mode-alist
       (append '(("SConstruct\\'" . python-mode)
                 ("SConscript\\'" . python-mode))
               auto-mode-alist))
 
-(require-package 'pip-requirements)
+(use-package pip-requirements)
 (defun my/python-mode-stuff ()
   ;; Jedi makes everything a lot easier for everybody!
   (jedi:setup)
diff --git a/lisp/init-rainbow.el b/lisp/init-rainbow.el
index 4461279..b95601a 100644
--- a/lisp/init-rainbow.el
+++ b/lisp/init-rainbow.el
@@ -1,5 +1,5 @@
 ;; rainbow-mode
-(require-package 'rainbow-mode)
+(use-package rainbow-mode)
 (add-hook 'css-mode-hook 'rainbow-mode)
 (add-hook 'sass-mode-hook 'rainbow-mode)
 (add-hook 'scss-mode-hook 'rainbow-mode)
diff --git a/lisp/init-sass.el b/lisp/init-sass.el
index 022668c..b19b8e1 100644
--- a/lisp/init-sass.el
+++ b/lisp/init-sass.el
@@ -1,7 +1,7 @@
 ;;----------------------------------------------------------------------------
 ;; Sass Mode
 ;;----------------------------------------------------------------------------
-(require-package 'sass-mode)
+(use-package sass-mode)
 (add-to-list 'auto-mode-alist '("\\.sass\\'" . sass-mode))
 
 (provide 'init-sass)
diff --git a/lisp/init-scss.el b/lisp/init-scss.el
index 2ec96d5..7680a10 100644
--- a/lisp/init-scss.el
+++ b/lisp/init-scss.el
@@ -1,7 +1,7 @@
 ;;----------------------------------------------------------------------------
 ;; Scss Mode
 ;;----------------------------------------------------------------------------
-(require-package 'scss-mode)
+(use-package scss-mode)
 
 (add-to-list 'auto-mode-alist '("\\.scss\\'" . scss-mode))
 
diff --git a/lisp/init-theme.el b/lisp/init-theme.el
index f3407dc..d2c1b23 100644
--- a/lisp/init-theme.el
+++ b/lisp/init-theme.el
@@ -1,4 +1,4 @@
-(require-package 'sublime-themes)
+(use-package sublime-themes)
 (load-theme 'spolsky t)
 
 ;; Fix linum current-line highlight. Doesn't looks good with this theme
diff --git a/lisp/init-whitespace.el b/lisp/init-whitespace.el
index c6912b0..27f61c3 100644
--- a/lisp/init-whitespace.el
+++ b/lisp/init-whitespace.el
@@ -1,6 +1,6 @@
 ;;----------------------------------------------------------------------------
 ;; Whitespace Mode | tool
 ;;----------------------------------------------------------------------------
-(require-package 'whitespace-cleanup-mode)
+(use-package whitespace-cleanup-mode)
 
 (provide 'init-whitespace)
diff --git a/lisp/init-yaml.el b/lisp/init-yaml.el
index 47956c8..c7c615a 100644
--- a/lisp/init-yaml.el
+++ b/lisp/init-yaml.el
@@ -1,4 +1,4 @@
 ;; yaml-mode
-(require-package 'yaml-mode)
+(use-package yaml-mode)
 (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))
 (provide 'init-yaml)