Macros now prefixed with @, instead of suffixed with !

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

@@ -1,43 +1,43 @@
 ;;; feature/version-control/+git.el
 
-(use-package! gitconfig-mode
+(@use-package gitconfig-mode
   :mode "/\\.?git/?config$"
   :mode "/\\.gitmodules$"
   :init (add-hook 'gitconfig-mode-hook 'flyspell-mode))
 
-(use-package! gitignore-mode
+(@use-package gitignore-mode
   :mode "/\\.?git/?config$"
   :mode "/\\.gitmodules$")
 
 
-(use-package! git-gutter-fringe
+(@use-package git-gutter-fringe
   :commands git-gutter-mode
-  :init (add-hook! (text-mode prog-mode conf-mode) 'git-gutter-mode)
+  :init (@add-hook (text-mode prog-mode conf-mode) 'git-gutter-mode)
   :config
-  (set! :popup "^\\*git-gutter.+\\*$" :regexp t :size 15 :noselect t)
+  (@set :popup "^\\*git-gutter.+\\*$" :regexp t :size 15 :noselect t)
 
   ;; Update git-gutter on focus (in case I was using git externally)
   (add-hook 'focus-in-hook 'git-gutter:update-all-windows)
 
-  (after! evil
+  (@after evil
     ;; Refreshing git-gutter on ESC
     (advice-add 'evil-force-normal-state :after 'git-gutter)))
 
 
-(use-package! browse-at-remote
+(@use-package browse-at-remote
   :commands (browse-at-remote/browse browse-at-remote/get-url))
 
 
-(use-package! magit
+(@use-package magit
   :commands magit-status
   :config
-  (set! :popup "^\\*magit.+" :regexp t)
-  (after! evil-snipe
+  (@set :popup "^\\*magit.+" :regexp t)
+  (@after evil-snipe
     ;; evil-snipe conflicts with magit
     (add-hook 'magit-mode-hook 'turn-off-evil-snipe-override-mode)))
 
 
-(use-package! evil-magit
+(@use-package evil-magit
   :when (featurep 'evil)
   :after magit)
 

modules/feature/version-control/config.el

@@ -1,20 +1,20 @@
 ;;; feature/version-control/config.el
 (provide '+version-control)
 
-(load! +git)
-;; (load! +hg)
+(@load +git)
+;; (@load +hg)
 
-(after! vc-annotate
-  (set! :popup
+(@after vc-annotate
+  (@set :popup
     '("*vc-diff*" :size 15 :noselect t)
     '("*vc-change-log*" :size 15 :select t)
     '(vc-annotate-mode :same t))
 
-  (set! :evil-state
+  (@set :evil-state
     '(vc-annotate-mode normal)
     '(vc-git-log-view-mode normal))
 
-  (map! :map vc-annotate-mode-map
+  (@map :map vc-annotate-mode-map
         :n "q" 'kill-this-buffer
         :n "d" 'vc-annotate-show-diff-revision-at-line
         :n "D" 'vc-annotate-show-changeset-diff-revision-at-line

modules/feature/version-control/packages.el

@@ -5,11 +5,11 @@
 ;; n/a
 
 ;;; +git
-(package! browse-at-remote)
-(package! evil-magit :needs evil)
-(package! git-gutter-fringe)
-(package! gitconfig-mode)
-(package! gitignore-mode)
-(package! magit)
+(@package browse-at-remote)
+(@package evil-magit :needs evil)
+(@package git-gutter-fringe)
+(@package gitconfig-mode)
+(@package gitignore-mode)
+(@package magit)
 
 ;;; TODO +hg