From aa27a46d6507dd8f02ddbf8384f7e3c04b99c882 Mon Sep 17 00:00:00 2001 From: BirDt_ Date: Sat, 27 Sep 2025 10:34:40 +0800 Subject: [PATCH] scoping --- screens/dashboard.el | 169 ++++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 84 deletions(-) diff --git a/screens/dashboard.el b/screens/dashboard.el index 2b44df3..9ef603c 100644 --- a/screens/dashboard.el +++ b/screens/dashboard.el @@ -86,94 +86,95 @@ (concat (propertize "Weather\n\n" 'face 'font-lock-keyword-face) "No connection to weather service :("))) -(defvar default-dash - `(:content ,(concat - enlight-calendar "\n\n" - (grid-make-row - (list (grid-make-box `(:content ,(concat - (enlight-menu - '(("Exobrain" - ("Agenda" (org-agenda nil "a") "a") - ("Go to Inbox" open-inbox "i") - ("Capture" org-capture "c"))))) - :align left - :width 20)) - (grid-make-box `(:content ,(concat - (enlight-menu - '(("Projects" - ("Switch To" theurgy-open-project "p") - ("Project List" theurgy-edit-projects-list "l"))))) - :align center - :width 20)) - (grid-make-box `(:content ,(concat - (enlight-menu - '(("Userland" - ("Dired" (dired "~") "d") - ("RSS" elfeed "r") - ("Terminal" theurgy-bottom-shell "t") - ("Gomuks" theurgy-gomuks-workspace "G") - ("Weather" theurgy-show-weather "w"))))) - :align center - :width 20)) - (grid-make-box `(:content ,(concat - (enlight-menu - '(("Meta" - ("Elisp Scratch" open-elisp-scratch "s") - ("Org Scratch" open-org-scratch "o") - ("Init Dir" (dired user-emacs-directory) "e") - ("Info" info "h"))))) - :align right - :width 20))))) - )) - -(defvar android-dash - `(:content ,(concat - (grid-make-row - (list (grid-make-column (grid-make-box `(:content ,(concat - (enlight-menu - '(("Exobrain" - ("Agenda" (org-agenda nil "a") "a") - ("Go to Inbox" open-inbox "i") - ("Capture" org-capture "c"))))) - :align center - :width 20)) - (grid-make-box `(:content ,(concat - (enlight-menu - '(("Projects" - ("Switch To" theurgy-open-project "p") - ("Project List" theurgy-edit-projects-list "l"))))) - :align center - :width 20))) - (grid-make-column (grid-make-box `(:content ,(concat - (enlight-menu - '(("Userland" - ("Dired" (dired "~") "d") - ("RSS" elfeed "r") - ("Terminal" theurgy-bottom-shell "t") - ("Gomuks" theurgy-gomuks-workspace "G") - ("Weather" theurgy-show-weather "w"))))) - :align center - :width 20)) - (grid-make-box `(:content ,(concat - (enlight-menu - '(("Meta" - ("Elisp Scratch" open-elisp-scratch "s") - ("Org Scratch" open-org-scratch "o") - ("Init Dir" (dired user-emacs-directory) "e") - ("Info" info "h"))))) - :align center - :width 20)))))) - )) - -(defvar dashboard-content - (cond - ((equal system-type 'android) android-dash) - (else default-dash))) - ;; Dashboard screen using enlight (use-package enlight :custom (setopt grid-revert-on-width-change t) + + (defvar default-dash + `(:content ,(concat + enlight-calendar "\n\n" + (grid-make-row + (list (grid-make-box `(:content ,(concat + (enlight-menu + '(("Exobrain" + ("Agenda" (org-agenda nil "a") "a") + ("Go to Inbox" open-inbox "i") + ("Capture" org-capture "c"))))) + :align left + :width 20)) + (grid-make-box `(:content ,(concat + (enlight-menu + '(("Projects" + ("Switch To" theurgy-open-project "p") + ("Project List" theurgy-edit-projects-list "l"))))) + :align center + :width 20)) + (grid-make-box `(:content ,(concat + (enlight-menu + '(("Userland" + ("Dired" (dired "~") "d") + ("RSS" elfeed "r") + ("Terminal" theurgy-bottom-shell "t") + ("Gomuks" theurgy-gomuks-workspace "G") + ("Weather" theurgy-show-weather "w"))))) + :align center + :width 20)) + (grid-make-box `(:content ,(concat + (enlight-menu + '(("Meta" + ("Elisp Scratch" open-elisp-scratch "s") + ("Org Scratch" open-org-scratch "o") + ("Init Dir" (dired user-emacs-directory) "e") + ("Info" info "h"))))) + :align right + :width 20))))) + )) + + (defvar android-dash + `(:content ,(concat + (grid-make-row + (list (grid-make-column (grid-make-box `(:content ,(concat + (enlight-menu + '(("Exobrain" + ("Agenda" (org-agenda nil "a") "a") + ("Go to Inbox" open-inbox "i") + ("Capture" org-capture "c"))))) + :align center + :width 20)) + (grid-make-box `(:content ,(concat + (enlight-menu + '(("Projects" + ("Switch To" theurgy-open-project "p") + ("Project List" theurgy-edit-projects-list "l"))))) + :align center + :width 20))) + (grid-make-column (grid-make-box `(:content ,(concat + (enlight-menu + '(("Userland" + ("Dired" (dired "~") "d") + ("RSS" elfeed "r") + ("Terminal" theurgy-bottom-shell "t") + ("Gomuks" theurgy-gomuks-workspace "G") + ("Weather" theurgy-show-weather "w"))))) + :align center + :width 20)) + (grid-make-box `(:content ,(concat + (enlight-menu + '(("Meta" + ("Elisp Scratch" open-elisp-scratch "s") + ("Org Scratch" open-org-scratch "o") + ("Init Dir" (dired user-emacs-directory) "e") + ("Info" info "h"))))) + :align center + :width 20)))))) + )) + + (defvar dashboard-content + (cond + ((equal system-type 'android) android-dash) + (else default-dash))) + (enlight-content (concat (grid-make-box `(:align center :content ,enlight-theurgy-logo :width 80))