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

modules/ui/doom-dashboard/config.el

@@ -28,7 +28,7 @@
   "Major mode for the DOOM dashboard buffer.")
 
 
-(@def-package all-the-icons :when (display-graphic-p))
+(def-package! all-the-icons :when (display-graphic-p))
 
 (unless (display-graphic-p)
   (defalias 'all-the-icons-octicon 'ignore)
@@ -42,18 +42,18 @@
 (setq doom-fallback-buffer +doom-dashboard-name)
 
 (add-hook 'emacs-startup-hook '+doom-dashboard/open)
-(@add-hook 'kill-buffer-query-functions
+(add-hook! 'kill-buffer-query-functions
    (if (not (+doom-dashboard-p))
        t
      (ignore-errors (+doom-dashboard-force-reload))
      (bury-buffer)
      nil))
-(@add-hook 'window-setup-hook
+(add-hook! 'window-setup-hook
   (add-hook 'window-configuration-change-hook '+doom-dashboard-reload)
   (+doom-dashboard-reload))
 
 ;; Compatibility with `midnight-mode' and `clean-buffer-list'
-(@after midnight-mode
+(after! midnight-mode
   (push +doom-dashboard-name clean-buffer-list-kill-never-buffer-names)
   (push "^\\s-*\\*doom.+" clean-buffer-list-kill-never-regexps))
 
@@ -93,7 +93,7 @@
     (unless +doom-dashboard-modeline
       (setq +doom-dashboard-old-modeline mode-line-format)
       (setq +doom-dashboard-modeline
-            (if (@featurep :ui doom-modeline)
+            (if (featurep! :ui doom-modeline)
                 (doom-modeline 'project)
               mode-line-format)))
     (let ((old-pwd (or dir default-directory)))

modules/ui/doom-dashboard/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/doom-dashboard/packages.el
 
-(@package all-the-icons)
+(package! all-the-icons)

modules/ui/doom-modeline/config.el

@@ -10,10 +10,10 @@
   (defalias 'all-the-icons-wicon 'ignore)
   (defalias 'all-the-icons-alltheicon 'ignore))
 
-(@def-package all-the-icons :demand t
+(def-package! all-the-icons :demand t
   :when (display-graphic-p))
 
-(@def-package eldoc-eval :demand t
+(def-package! eldoc-eval :demand t
   :config
   ;; Show eldoc in the mode-line with `eval-expression'
   (setq eldoc-in-minibuffer-show-fn '+doom-modeline--show-eldoc)
@@ -21,7 +21,7 @@
 
 ;; anzu and evil-anzu make it possible to display current/total in the
 ;; mode-line.
-(@def-package evil-anzu
+(def-package! evil-anzu
   :init
   (defun +evil*lazy-load-evil-anzu (&rest _) (require 'evil-anzu))
   (advice-add 'evil-ex-start-search :before '+evil*lazy-load-evil-anzu)
@@ -163,8 +163,8 @@ active."
                                         s)))))
 
 ;; Only support python and ruby for now
-(@add-hook python-mode (setq +doom-modeline-env-command "python --version 2>&1 | cut -d' ' -f2"))
-(@add-hook ruby-mode   (setq +doom-modeline-env-command "ruby --version 2>&1 | cut -d' ' -f2"))
+(add-hook! python-mode (setq +doom-modeline-env-command "python --version 2>&1 | cut -d' ' -f2"))
+(add-hook! ruby-mode   (setq +doom-modeline-env-command "ruby --version 2>&1 | cut -d' ' -f2"))
 
 
 ;;
@@ -175,7 +175,7 @@ active."
   (eq (selected-window) +doom-modeline-current-window))
 
 ;; From from `powerline's `pl/make-xpm'.
-(@def-memoized +doom-modeline--make-xpm (color height width)
+(def-memoized! +doom-modeline--make-xpm (color height width)
   "Create an XPM bitmap."
   (when (display-graphic-p)
     (propertize
@@ -262,7 +262,7 @@ project root). Excludes the file basename. See `doom-buffer-name' for that."
 ;; Segments
 ;;
 
-(@def-modeline-segment buffer-project
+(def-modeline-segment! buffer-project
   "Displays `doom-project-root'. This is for special buffers like the scratch
 buffer where knowing the current project directory is important."
   (let ((face (if (active) 'doom-modeline-buffer-project)))
@@ -274,7 +274,7 @@ buffer where knowing the current project directory is important."
             (propertize (concat " " (abbreviate-file-name (doom-project-root)))
                         'face face))))
 
-(@def-modeline-segment buffer-info
+(def-modeline-segment! buffer-info
   "Combined information about the current buffer, including the current working
 directory, the file name, and its state (modified, read-only or non-existent)."
   (let ((all-the-icons-scale-factor 1.2)
@@ -303,7 +303,7 @@ directory, the file name, and its state (modified, read-only or non-existent)."
             (propertize (+doom-modeline--buffer-path)
                         'face (if faces `(:inherit ,faces))))))
 
-(@def-modeline-segment buffer-encoding
+(def-modeline-segment! buffer-encoding
   "Displays the encoding and eol style of the buffer the same way Atom does."
   (concat (let ((eol-type (coding-system-eol-type buffer-file-coding-system)))
             (cond ((eq eol-type 0) "LF  ")
@@ -317,7 +317,7 @@ directory, the file name, and its state (modified, read-only or non-existent)."
                   (t (upcase (symbol-name sys-name)))))
           "  "))
 
-(@def-modeline-segment major-mode
+(def-modeline-segment! major-mode
   "The major mode, including process, environment and text-scale info."
   (propertize
    (concat (format-mode-line mode-name)
@@ -328,7 +328,7 @@ directory, the file name, and its state (modified, read-only or non-existent)."
                 (format " (%+d)" text-scale-mode-amount)))
    'face (if (active) 'doom-modeline-buffer-major-mode)))
 
-(@def-modeline-segment vcs
+(def-modeline-segment! vcs
   "Displays the current branch, colored based on its state."
   (when (and vc-mode buffer-file-name)
     (let ((backend (vc-backend buffer-file-name))
@@ -380,7 +380,7 @@ directory, the file name, and its state (modified, read-only or non-existent)."
    (when text
      (propertize text 'face face))))
 
-(@def-modeline-segment flycheck
+(def-modeline-segment! flycheck
   "Displays color-coded flycheck error status in the current buffer with pretty
 icons."
   (when (boundp 'flycheck-last-status-change)
@@ -404,7 +404,7 @@ icons."
     (when pos (goto-char pos))
     (current-column)))
 
-(@def-modeline-segment selection-info
+(def-modeline-segment! selection-info
   "Information about the current selection, such as how many characters and
 lines are selected, or the NxM dimensions of a block selection."
   (when mark-active
@@ -492,7 +492,7 @@ lines are selected, or the NxM dimensions of a block selection."
                length))
      'face (if (active) 'doom-modeline-panel))))
 
-(@def-modeline-segment matches
+(def-modeline-segment! matches
   "TODO"
   (or (concat (+doom-modeline--macro-recording)
               (+doom-modeline--anzu)
@@ -500,18 +500,18 @@ lines are selected, or the NxM dimensions of a block selection."
               (+doom-modeline--iedit))
       " %I "))
 
-(@def-modeline-segment media-info
+(def-modeline-segment! media-info
   "TODO"
   (cond ((eq major-mode 'image-mode)
          (let ((size (image-size (image-get-display-property) :pixels)))
            (format "  %dx%d  " (car size) (cdr size))))))
 
-(@def-modeline-segment eldoc
+(def-modeline-segment! eldoc
   "TODO"
   (and (boundp 'str) str))
 
 ;;
-(@def-modeline-segment bar
+(def-modeline-segment! bar
   (+doom-modeline--make-xpm
    (face-background (if (active)
                         'doom-modeline-bar
@@ -519,7 +519,7 @@ lines are selected, or the NxM dimensions of a block selection."
    +doom-modeline-height
    +doom-modeline-bar-width))
 
-(@def-modeline-segment eldoc-bar
+(def-modeline-segment! eldoc-bar
   (+doom-modeline--make-xpm
    (face-background 'doom-modeline-eldoc-bar)
    +doom-modeline-height
@@ -530,19 +530,19 @@ lines are selected, or the NxM dimensions of a block selection."
 ;; Mode lines
 ;;
 
-(@def-modeline main
+(def-modeline! main
   (bar matches " " buffer-info "  %l:%c %p  " selection-info)
   (buffer-encoding vcs major-mode flycheck))
 
-(@def-modeline eldoc
+(def-modeline! eldoc
   (eldoc-bar " " eldoc)
   (media-info major-mode))
 
-(@def-modeline minimal
+(def-modeline! minimal
   (bar matches " " buffer-info)
   (media-info major-mode))
 
-(@def-modeline project
+(def-modeline! project
   (bar " " buffer-project)
   (major-mode))
 

modules/ui/doom-modeline/packages.el

@@ -16,8 +16,8 @@
 ;;(require 'iedit)
 ;;(require 'evil-multiedit)
 
-(@package all-the-icons)
-(@package eldoc-eval)
-(when (@featurep :feature evil)
-  (@package evil-anzu))
+(package! all-the-icons)
+(package! eldoc-eval)
+(when (featurep! :feature evil)
+  (package! evil-anzu))
 

modules/ui/doom/config.el

@@ -39,7 +39,7 @@
 
 ;; doom-one: gives Emacs a look inspired by Dark One in Atom.
 ;; <https://github.com/hlissner/emacs-doom-theme>
-(@def-package doom-themes :demand t
+(def-package! doom-themes :demand t
   :load-path "~/work/plugins/emacs-doom-theme"
   :config
   (load-theme +doom-theme t)
@@ -69,7 +69,7 @@
     (when doom-buffer-mode (doom-buffer-mode -1)))
   (add-hook 'doom-popup-mode-hook '+doom|buffer-mode-off)
 
-  (when (@featurep :feature workspaces)
+  (when (featurep! :feature workspaces)
     (defun +doom|restore-bright-buffers (&rest _)
       "Restore `doom-buffer-mode' in buffers when `persp-mode' loads a session."
       (dolist (buf (persp-buffer-list))
@@ -90,7 +90,7 @@
 ;; Causes a flash around the cursor when it moves across a "large" distance.
 ;; Usually between windows, or across files. This makes it easier to keep track
 ;; where your cursor is, which I find helpful on my 30" 2560x1600 display.
-(@def-package beacon
+(def-package! beacon
   :after doom-themes
   :config
   (beacon-mode +1)
@@ -102,7 +102,7 @@
         beacon-blink-when-point-moves-vertically 10))
 
 
-(@after hideshow
+(after! hideshow
   ;; Nicer code-folding overlays
   (setq hs-set-up-overlay
         (lambda (ov)
@@ -112,7 +112,7 @@
 
 
 ;; subtle diff indicators in the fringe
-(@after git-gutter-fringe
+(after! git-gutter-fringe
   ;; places the git gutter outside the margins.
   (setq-default fringes-outside-margins t)
   ;; thin fringe bitmaps

modules/ui/doom/packages.el

@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/doom/packages.el
 
-(@package beacon)
-(@package doom-themes)
+(package! beacon)
+(package! doom-themes)
 

modules/ui/hl-todo/config.el

@@ -1,6 +1,6 @@
 ;;; ui/hl-todo/packages.el
 
-(@def-package hl-todo
+(def-package! hl-todo
   :commands hl-todo-mode
   :init
   (add-hook 'prog-mode-hook 'hl-todo-mode)

modules/ui/hl-todo/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/hl-todo/packages.el
 
-(@package hl-todo)
+(package! hl-todo)