@use-package => @def-package

modules/feature/version-control/+git.el

@@ -1,16 +1,16 @@
 ;;; feature/version-control/+git.el
 
-(@use-package gitconfig-mode
+(@def-package gitconfig-mode
   :mode "/\\.?git/?config$"
   :mode "/\\.gitmodules$"
   :init (add-hook 'gitconfig-mode-hook 'flyspell-mode))
 
-(@use-package gitignore-mode
+(@def-package gitignore-mode
   :mode "/\\.?git/?config$"
   :mode "/\\.gitmodules$")
 
 
-(@use-package git-gutter-fringe
+(@def-package git-gutter-fringe
   :commands git-gutter-mode
   :init (@add-hook (text-mode prog-mode conf-mode) 'git-gutter-mode)
   :config
@@ -24,20 +24,17 @@
     (advice-add 'evil-force-normal-state :after 'git-gutter)))
 
 
-(@use-package browse-at-remote
+(@def-package browse-at-remote
   :commands (browse-at-remote/browse browse-at-remote/get-url))
 
 
-(@use-package magit
+(@def-package magit
   :commands magit-status
   :config
   (@set :popup "^\\*magit.+" :regexp t)
-  (@after evil-snipe
+
+  (@after evil
+    (require 'evil-magit)
     ;; evil-snipe conflicts with magit
     (add-hook 'magit-mode-hook 'turn-off-evil-snipe-override-mode)))
 
-
-(@use-package evil-magit
-  :when (featurep 'evil)
-  :after magit)
-

modules/feature/version-control/autoload.el

@@ -1,7 +1,7 @@
 ;;; feature/version-control/autoload.el
 
 ;;;###autoload
-(defun +vcs-git-root ()
+(defun +vcs-root ()
   "Get git url root."
   (-when-let (url (car-safe (browse-at-remote--remote-ref buffer-file-name)))
     (cdr (browse-at-remote--get-url-from-remote url))))
@@ -27,6 +27,6 @@ Fallback to repository root."
 (defun +vcs/git-browse-issues ()
   "Open the github issues page for current repo."
   (interactive)
-  (if-let (root (+vcs-git-root))
+  (if-let (root (+vcs-root))
       (browse-url (concat root "/issues"))
     (user-error "No git root found!")))

modules/feature/version-control/config.el

@@ -1,5 +1,4 @@
 ;;; feature/version-control/config.el
-(provide '+version-control)
 
 (@load +git)
 ;; (@load +hg)

modules/feature/version-control/packages.el

@@ -6,10 +6,12 @@
 
 ;;; +git
 (@package browse-at-remote)
-(@package evil-magit :needs evil)
 (@package git-gutter-fringe)
 (@package gitconfig-mode)
 (@package gitignore-mode)
 (@package magit)
 
+(when (@featurep :feature evil)
+  (@package evil-magit))
+
 ;;; TODO +hg