Revert macros to ...! name convention (elisp doesn't like @...)

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

@@ -1,44 +1,44 @@
 ;;; feature/version-control/+git.el
 
-(@def-package gitconfig-mode
+(def-package! gitconfig-mode
   :mode "/\\.?git/?config$"
   :mode "/\\.gitmodules$"
   :init (add-hook 'gitconfig-mode-hook 'flyspell-mode))
 
-(@def-package gitignore-mode
+(def-package! gitignore-mode
   :mode "/\\.gitignore$")
 
 
-(@def-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)
+  (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)))
 
 
-(@def-package browse-at-remote
+(def-package! browse-at-remote
   :commands (browse-at-remote/browse browse-at-remote/get-url))
 
 
-(@def-package magit
+(def-package! magit
   :commands magit-status
   :config
-  (@set :popup "^\\*magit" :regexp t)
-  (@map :map magit-mode-map
+  (set! :popup "^\\*magit" :regexp t)
+  (map! :map magit-mode-map
         ;; Don't interfere with window movement keys
         :nv "C-j" nil
         :nv "C-k" nil))
 
 
-(@def-package evil-magit
+(def-package! evil-magit
   :after magit
   :config
   ;; evil-snipe conflicts with magit

modules/feature/version-control/config.el

@@ -1,19 +1,19 @@
 ;;; feature/version-control/config.el
 
-(@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)
     '(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,12 +5,12 @@
 ;; n/a
 
 ;;; +git
-(@package browse-at-remote)
-(@package git-gutter-fringe)
-(@package gitconfig-mode)
-(@package gitignore-mode)
-(@package magit)
-(when (@featurep :feature evil)
-  (@package evil-magit))
+(package! browse-at-remote)
+(package! git-gutter-fringe)
+(package! gitconfig-mode)
+(package! gitignore-mode)
+(package! magit)
+(when (featurep! :feature evil)
+  (package! evil-magit))
 
 ;;; TODO +hg