more use-package refactorings

Author: larsen

lisp/larsen-ibuffer.el

@@ -27,13 +27,15 @@
                            " "
                            (git-status 8 8 :left)
                            " "
-                           project-relative-file))))
+                           project-relative-file)))
+  :config
+  (add-hook 'ibuffer-mode-hook
+          (lambda ()
+            (ibuffer-switch-to-saved-filter-groups "default"))))
+
+(use-package ibuffer-git :requires ibuffer)
+(use-package ibuffer-projectile :requires ibuffer)
 
-(use-package ibuffer-git)
-(use-package ibuffer-projectile)
 
-(add-hook 'ibuffer-mode-hook
-          (lambda ()
-            (ibuffer-switch-to-saved-filter-groups "default")))
 
 (provide 'larsen-ibuffer)

lisp/larsen-snippets.el

@@ -1,7 +1,8 @@
-(use-package yasnippet)
-
-(setq yas-snippet-dirs '("~/.emacs.d/snippets"))
-(setq yas/indent-line nil)
-(yas-global-mode 1)
+(use-package yasnippet
+  :custom
+  (yas-snippet-dirs '("~/.emacs.d/snippets"))
+  (yas/indent-line nil)
+  :config
+  (yas-global-mode 1))
 
 (provide 'larsen-snippets)

lisp/larsen-tramp.el

@@ -2,11 +2,13 @@
 ;;; larsen-tramp.el
 ;;;
 
-(use-package tramp)
-(setq tramp-default-method "ssh")
-(add-to-list 'tramp-default-user-alist
-             '("ssh" "home" "larsen"))
-; local auto-saves to speed up things
-(setq tramp-auto-save-directory "~/.emacs.d/tramp-autosave")
+(use-package tramp
+  :custom
+  (tramp-default-method "ssh")
+  ; local auto-saves to speed up things
+  (tramp-auto-save-directory "~/.emacs.d/tramp-autosave")
+  :config
+  (add-to-list 'tramp-default-user-alist
+               '("ssh" "home" "larsen")))
 
 (provide 'larsen-tramp)

lisp/larsen-web-mode.el

@@ -1,12 +1,13 @@
-(use-package web-mode)
-
-(setq web-mode-css-indent-offset 2)
-(setq web-mode-code-indent-offset 2)
-(setq web-mode-enable-current-column-highlight t)
-(setq web-mode-enable-current-element-highlight nil)
-(setq web-mode-enable-control-block-indentation nil)
-(setq web-mode-style-padding 1)
-(setq web-mode-script-padding 1)
+(use-package web-mode
+  :mode ("\\.html?\\'" "\\.hbs?\\'")
+  :custom
+  (web-mode-css-indent-offset 2)
+  (web-mode-code-indent-offset 2)
+  (web-mode-enable-current-column-highlight t)
+  (web-mode-enable-current-element-highlight nil)
+  (web-mode-enable-control-block-indentation nil)
+  (web-mode-style-padding 1)
+  (web-mode-script-padding 1))
 
 (add-hook 'web-mode-hook
       (lambda ()
@@ -15,9 +16,6 @@
             (web-mode-set-content-type "jsx")
           (message "now set to: %s" web-mode-content-type))))
 
-(add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
-(add-to-list 'auto-mode-alist '("\\.hbs?\\'" . web-mode))
-
 (add-to-list 'web-mode-indentation-params '("lineup-calls" . nil))
 
 (setq-default js2-basic-offset 2)