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

modules/tools/dired/config.el

@@ -32,7 +32,7 @@
 ;; Packages
 ;;
 
-(@def-package dired-k
+(def-package! dired-k
   :after dired
   :config
   (setq dired-k-style 'git)
@@ -40,7 +40,7 @@
   (add-hook 'dired-after-readin-hook #'dired-k-no-revert))
 
 ;; Striped dired buffers
-(@def-package stripe-buffer
+(def-package! stripe-buffer
   :commands stripe-buffer-mode
   :init (add-hook 'dired-mode-hook 'stripe-buffer-mode))
 

modules/tools/dired/packages.el

@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; emacs/dired/packages.el
 
-(@package dired-k)
-(@package stripe-buffer)
+(package! dired-k)
+(package! stripe-buffer)
 

modules/tools/electric-indent/config.el

@@ -18,7 +18,7 @@
              (concat "\\<" (regexp-opt doom-electric-indent-words))))))
       electric-indent-functions)
 
-(@def-setting :electric (modes &rest plist)
+(def-setting! :electric (modes &rest plist)
   "Declare :words (list of strings) or :chars (lists of chars) in MODES that
 trigger electric indentation."
   (declare (indent 1))
@@ -32,5 +32,5 @@ trigger electric indentation."
              (electric-indent-local-mode +1)
              ,(if chars `(setq electric-indent-chars ',chars))
              ,(if words `(setq doom-electric-indent-words ',words)))
-           (@add-hook ,modes ',fn-name))))))
+           (add-hook! ,modes ',fn-name))))))
 

modules/tools/eshell/autoload/eshell.el

@@ -25,7 +25,7 @@
   "Open eshell in a separate workspace. Requires the (:feature workspaces)
 module to be loaded."
   (interactive)
-  (unless (@featurep :feature workspaces)
+  (unless (featurep! :feature workspaces)
     (user-error ":feature workspaces is required, but disabled"))
   (unless (+workspace-get "eshell" t)
     (+workspace/new "eshell"))

modules/tools/eshell/config.el

@@ -10,7 +10,7 @@
 (defvar +eshell-buffers '()
   "TODO")
 
-(@def-package eshell ; built-in
+(def-package! eshell ; built-in
   :init
   (setq eshell-directory-name (concat doom-cache-dir "/eshell")
         eshell-scroll-to-bottom-on-input 'all
@@ -25,13 +25,13 @@
         eshell-aliases-file "~/.eshell-aliases")
 
   :config
-  (@set :popup "^\\*eshell:popup\\*$" :regexp t :size 25)
-  (@set :evil-state 'eshell-mode 'insert)
+  (set! :popup "^\\*eshell:popup\\*$" :regexp t :size 25)
+  (set! :evil-state 'eshell-mode 'insert)
 
   (defun +eshell|keymap-setup ()
     "Setup eshell keybindings. This must be done in a hook because eshell
 redefines its keys every time `eshell-mode' is enabled."
-    (@map :map eshell-mode-map
+    (map! :map eshell-mode-map
           :n "i" '+eshell/evil-prepend-maybe
           :n "I" '+eshell/evil-prepend
           :n "a" '+eshell/evil-append-maybe
@@ -55,7 +55,7 @@ redefines its keys every time `eshell-mode' is enabled."
     (setq +eshell-buffers (delete (current-buffer) +eshell-buffers))
     (cond ((doom-popup-p)
            (delete-window))
-          ((and (@featurep :feature workspaces)
+          ((and (featurep! :feature workspaces)
                 (string= "eshell" (+workspace-current-name)))
            (+workspace/close-window-or-workspace))))
   (add-hook 'eshell-exit-hook 'doom|eshell-cleanup)
@@ -67,7 +67,7 @@ redefines its keys every time `eshell-mode' is enabled."
 
   (add-hook 'eshell-mode-hook 'doom-hide-modeline-mode)
 
-  (@add-hook eshell-mode
+  (add-hook! eshell-mode
     (add-hook 'evil-insert-state-exit-hook  'hl-line-mode nil t)
     (add-hook 'evil-insert-state-entry-hook (lambda () (hl-line-mode -1)) nil t))
 

modules/tools/macos/autoload.el

@@ -17,28 +17,28 @@
     (message "Running: %s" command)
     (shell-command command)))
 
-(defmacro +macos@open-with (id &optional app dir)
+(defmacro +macos!open-with (id &optional app dir)
   `(defun ,(intern (format "+macos/%s" id)) ()
      (interactive)
      (+macos-open-with ,app ,dir)))
 
 ;;;###autoload (autoload '+macos/open-in-default-program "os/macos/autoload" nil t)
-(+macos@open-with open-in-default-program)
+(+macos!open-with open-in-default-program)
 
 ;;;###autoload (autoload '+macos/reveal-in-finder "os/macos/autoload" nil t)
-(+macos@open-with reveal-in-finder "Finder" default-directory)
+(+macos!open-with reveal-in-finder "Finder" default-directory)
 
 ;;;###autoload (autoload '+macos/reveal-project-in-finder "os/macos/autoload" nil t)
-(+macos@open-with reveal-project-in-finder "Finder" (doom-project-root))
+(+macos!open-with reveal-project-in-finder "Finder" (doom-project-root))
 
 ;;;###autoload (autoload '+macos/send-to-transmit "os/macos/autoload" nil t)
-(+macos@open-with send-to-transmit "Transmit")
+(+macos!open-with send-to-transmit "Transmit")
 
 ;;;###autoload (autoload '+macos/send-cwd-to-transmit "os/macos/autoload" nil t)
-(+macos@open-with send-cwd-to-transmit "Transmit" default-directory)
+(+macos!open-with send-cwd-to-transmit "Transmit" default-directory)
 
 ;;;###autoload (autoload '+macos/send-to-launchbar "os/macos/autoload" nil t)
-(+macos@open-with send-to-launchbar "LaunchBar")
+(+macos!open-with send-to-launchbar "LaunchBar")
 
 ;;;###autoload (autoload '+macos/send-project-to-launchbar "os/macos/autoload" nil t)
-(+macos@open-with send-project-to-launchbar "LaunchBar" (doom-project-root))
+(+macos!open-with send-project-to-launchbar "LaunchBar" (doom-project-root))

modules/tools/restclient/config.el

@@ -1,9 +1,9 @@
 ;;; lang/rest/config.el
 
-(@def-package restclient
+(def-package! restclient
   :commands restclient-mode
   :mode ("\\.http$" . restclient-mode))
 
-(@def-package company-restclient
+(def-package! company-restclient
   :after restclient
-  :config (@set :company-backend 'restclient-mode '(company-restclient)))
+  :config (set! :company-backend 'restclient-mode '(company-restclient)))

modules/tools/restclient/packages.el

@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/rest/packages.el
 
-(@package restclient)
-(when (@featurep :completion company)
-  (@package company-restclient))
+(package! restclient)
+(when (featurep! :completion company)
+  (package! company-restclient))
 

modules/tools/rotate-text/config.el

@@ -1,12 +1,12 @@
 ;;; tools/rotate-text/config.el
 
-(@def-package rotate-text
+(def-package! rotate-text
   :commands (rotate-text rotate-text-backward)
   :config
   (push '("true" "false") rotate-text-words))
 
 
-(@def-setting :rotate (modes &rest plist)
+(def-setting! :rotate (modes &rest plist)
   "Declare :symbols, :words or :patterns that `rotate-text' will cycle through."
   (declare (indent 1))
   (let ((modes (if (listp modes) modes (list modes)))
@@ -21,5 +21,5 @@
              ,(if symbols `(setq rotate-text-local-symbols ',symbols))
              ,(if words `(setq rotate-text-local-words ',words))
              ,(if patterns `(setq rotate-text-local-patterns ',patterns)))
-           (@add-hook ,modes ',fn-name))))))
+           (add-hook! ,modes ',fn-name))))))
 

modules/tools/rotate-text/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/rotate-text/packages.el
 
-(@package rotate-text :recipe (:fetcher github :repo "debug-ito/rotate-text.el"))
+(package! rotate-text :recipe (:fetcher github :repo "debug-ito/rotate-text.el"))

modules/tools/tmux/autoload/tmux.el

@@ -27,7 +27,7 @@
            (errors (get-buffer-create " *tmux stderr*"))
            code)
       (unwind-protect
-          (if (= 0 (setq code (@quiet (shell-command cmdstr output errors))))
+          (if (= 0 (setq code (quiet! (shell-command cmdstr output errors))))
               (with-current-buffer output
                 (setq +tmux-last-command `(,cmdstr ,@args))
                 (buffer-string))

modules/tools/upload/config.el

@@ -7,7 +7,7 @@
 ;;
 ;; Interactive versions of `ssh-deploy's functions are in autoload.el.
 
-(@def-package ssh-deploy
+(def-package! ssh-deploy
   :commands (ssh-deploy-upload-handler
              ssh-deploy-upload-handler-forced
              ssh-deploy-diff-handler
@@ -15,12 +15,12 @@
              ssh-deploy-remote-changes-handler)
   :init
   ;; Maybe auto-upload on save
-  (@add-hook 'after-save-hook
+  (add-hook! 'after-save-hook
     (when (and (bound-and-true-p ssh-deploy-root-remote) ssh-deploy-on-explicit-save)
       (ssh-deploy-upload-handler)))
 
   ;; Maybe check for changes on open file (if possible)
-  (@add-hook 'find-file-hook
+  (add-hook! 'find-file-hook
     (when (bound-and-true-p ssh-deploy-root-remote)
       (unless ssh-deploy-root-local
         (setq ssh-deploy-root-local (doom-project-root)))

modules/tools/upload/packages.el

@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; extra/upload/packages.el
 
-(@package ssh-deploy)
+(package! ssh-deploy)