Use use-package

1 files changed, 16 insertions, 21 deletions

diff --git a/lisp/init-appearance.el b/lisp/init-appearance.el
index 52f29b7..23cb0fb 100644
--- a/lisp/init-appearance.el
+++ b/lisp/init-appearance.el
@@ -20,23 +20,27 @@
 (global-hl-line-mode 1)
 
 ;; set theme
-(if (display-graphic-p)
-    (progn (require-package 'material-theme)
-           (load-theme 'material t))
-  (set-face-background hl-line-face "gray13"))
+(when (display-graphic-p)
+  (use-package material-theme
+    :config (load-theme 'material t)))
 
 ;; highlight matching parentheses
 (show-paren-mode 1)
 
 ;; highlight lines exceeding fill-column
-(require 'whitespace)
-(setq whitespace-style '(face empty lines-tail trailing))
-(setq whitespace-line-column nil)
-;; make whitespace-mode respect a mode-specific fill-column value
-(add-hook 'hack-local-variables-hook
-          (lambda ()
-            (when (derived-mode-p 'prog-mode)
-              (whitespace-mode 1))))
+(use-package whitespace
+  :diminish whitespace-mode
+
+  :init
+  (setq whitespace-style '(face empty lines-tail trailing))
+  (setq whitespace-line-column nil)
+
+  :config
+  ;; make whitespace-mode respect a mode-specific fill-column value
+  (add-hook 'hack-local-variables-hook
+            (lambda ()
+              (when (derived-mode-p 'prog-mode)
+                (whitespace-mode 1)))))
 
 ;; disable word wrapping
 (setq-default truncate-lines t)
@@ -45,13 +49,4 @@
 (setq line-number-mode t
       column-number-mode t)
 
-;; unclutter modeline
-(require-package 'diminish)
-(require 'diminish)
-(eval-after-load "whitespace" '(diminish 'whitespace-mode))
-(eval-after-load "whole-line-or-region" '(diminish 'whole-line-or-region-mode))
-(eval-after-load "projectile" '(diminish 'projectile-mode))
-(eval-after-load "subword" '(diminish 'subword-mode))
-(eval-after-load "autorevert" '(diminish 'auto-revert-mode))
-
 (provide 'init-appearance)