Macros now prefixed with @, instead of suffixed with !

modules/lang/emacs-lisp/config.el

@@ -1,12 +1,13 @@
 ;;; lang/emacs-lisp/config.el
 (provide '+emacs-lisp)
 
-(use-package! elisp-mode
+(@use-package elisp-mode
   :mode ("/Cask$" . emacs-lisp-mode)
   :init
-  (add-hook! emacs-lisp-mode '(highlight-quoted-mode auto-compile-on-save-mode +emacs-lisp|hook))
+  (@add-hook emacs-lisp-mode '(highlight-quoted-mode auto-compile-on-save-mode +emacs-lisp|hook))
+
   :config
-  (map! :map emacs-lisp-mode-map
+  (@map :map emacs-lisp-mode-map
         :m "gd" '+emacs-lisp/find-function
         :leader :m "gd" '+emacs-lisp/find-function-other-window)
 
@@ -37,8 +38,8 @@
       (push i imenu-generic-expression))))
 
 
-(after! debug ;; elisp debugging
-  (map! :map debugger-mode-map
+(@after debug ;; elisp debugging
+  (@map :map debugger-mode-map
         :n "RET" 'debug-help-follow
         :n "n"   'debugger-step-through
         :n "c"   'debugger-continue))
@@ -48,17 +49,17 @@
 ;; Plugins
 ;;
 
-(use-package! auto-compile
+(@use-package auto-compile
   :commands auto-compile-on-save-mode
   :config
   (setq auto-compile-display-buffer nil
         auto-compile-use-mode-line nil))
 
 
-(use-package! highlight-quoted
+(@use-package highlight-quoted
   :commands highlight-quoted-mode)
 
 
-(use-package! slime
+(@use-package slime
   :config (setq inferior-lisp-program "clisp"))
 

modules/lang/emacs-lisp/packages.el

@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/emacs-lisp/packages.el
 
-(package! auto-compile)
-(package! highlight-quoted)
-(package! slime)
+(@package auto-compile)
+(@package highlight-quoted)
+(@package slime)

modules/lang/javascript/+screeps.el

@@ -169,7 +169,7 @@
   :match "/screeps/.+$"
   :modes (nodejs-project-mode))
 
-(add-hook! screeps-project-mode
+(@add-hook screeps-project-mode
   (when (eq major-mode 'js2-mode)
     (add-to-list 'flycheck-disabled-checkers 'javascript-jshint)
     (setq js2-additional-externs (append '("_") screeps-objects screeps-constants))))

modules/lang/javascript/config.el

@@ -1,7 +1,7 @@
 ;; lang/javascript/config.el
 (provide '+javascript)
 
-(use-package! js2-mode
+(@use-package js2-mode
   :mode "\\.js$"
   :interpreter "node"
   :init
@@ -10,17 +10,17 @@
         js2-mode-show-parse-errors nil)
 
   :config
-  (add-hook! '(tern-mode flycheck-mode highlight-indent-guides-mode))
+  (@add-hook '(tern-mode flycheck-mode highlight-indent-guides-mode))
   ;; Only way to conform switch-case indentation to editorconfig's config
-  (add-hook! (setq js-switch-indent-offset js-indent-level))
+  (@add-hook (setq js-switch-indent-offset js-indent-level))
 
-  (map! :map js2-mode-map :localleader :nv ";" 'doom/append-semicolon)
+  (@map :map js2-mode-map :localleader :nv ";" 'doom/append-semicolon)
 
-  (set! :repl nodejs-repl)
-  (set! :company-backends tern)
-  (set! :electric-chars ?\} ?\) ?.)
-  (set! :electric-words "||" "&&")
-  (set! :emr
+  (@set :repl nodejs-repl)
+  (@set :company-backends tern)
+  (@set :electric-chars ?\} ?\) ?.)
+  (@set :electric-words "||" "&&")
+  (@set :emr
     (:v  js2r-extract-function           "extract function")
     (:v  js2r-extract-method             "extract method")
     (:v  js2r-introduce-parameter        "introduce parameter")
@@ -48,13 +48,13 @@
     (:n  js2r-forward-slurp              "forward slurp")
     (:n  js2r-forward-barf               "forward barf")))
 
-(use-package! js2-refactor :after emr)
+(@use-package js2-refactor :after emr)
 
-(use-package! company-tern :commands company-tern :after tern)
+(@use-package company-tern :commands company-tern :after tern)
 
-(use-package! jsx-mode :mode "\\.jsx$")
+(@use-package jsx-mode :mode "\\.jsx$")
 
-(use-package! coffee-mode
+(@use-package coffee-mode
   :mode "\\.coffee$"
   :init (setq coffee-indent-like-python-mode t))
 

modules/lang/javascript/packages.el

@@ -1,10 +1,10 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/javascript/packages.el
 
-(package! coffee-mode)
-(package! company-tern :needs +company)
-(package! js2-mode)
-(package! js2-refactor)
-(package! jsx-mode)
-(package! tern)
+(@package coffee-mode)
+(@package company-tern :needs +company)
+(@package js2-mode)
+(@package js2-refactor)
+(@package jsx-mode)
+(@package tern)