From 297b2ae77c7f55313083e8f1e44cb6a457b77f33 Mon Sep 17 00:00:00 2001 From: William Moore Date: Wed, 4 Dec 2024 06:47:35 -0600 Subject: [PATCH] Update to include some formatting changes and add readers --- init.el | 17 ++--------------- whomp/whomp-helpers.el | 8 ++++---- whomp/whomp-interface.el | 5 +++-- whomp/whomp-orgmode.el | 12 ++++++------ whomp/whomp-readers.el | 23 +++++++++++++++++++++++ 5 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 whomp/whomp-readers.el diff --git a/init.el b/init.el index 466d15b..e1437b0 100644 --- a/init.el +++ b/init.el @@ -1,11 +1,3 @@ -;; custom set stuff -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. -) - (global-ede-mode t) (global-font-lock-mode t) @@ -46,6 +38,8 @@ (require 'whomp-games) ;; org configuration (require 'whomp-orgmode) +;; readers configuration +(require 'whomp-readers) ;; dashboard (require 'whomp-dashboard) @@ -54,10 +48,3 @@ (let ((user-config (whomp/list-files-with-extension "~/.emacs.d/whomp.d" "el"))) (dolist (config user-config) (load-file config))) - -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) diff --git a/whomp/whomp-helpers.el b/whomp/whomp-helpers.el index 3635b0a..01e5823 100644 --- a/whomp/whomp-helpers.el +++ b/whomp/whomp-helpers.el @@ -60,10 +60,10 @@ LST is reversed and concatenated into a single string with line breaks." "Update the `org-agenda-files` variable. This function sets `org-agenda-files` and `org-timeblock-files` to the list of all `.org` files in the `~/.org-agenda` directory, and sets -`org-timeblock-inbox-file` to `~/org/agenda/index.org`." - (setq org-agenda-files (whomp/list-files-with-extension "~/org/agenda" "org")) - (setq org-timeblock-files (whomp/list-files-with-extension "~/org/agenda" "org")) - (setq org-timeblock-inbox-file "~/org/agenda/index.org")) +`org-timeblock-inbox-file` to `~/org/agenda.org`." + (setq org-agenda-files (whomp/list-files-with-extension "~/org" "org")) + (setq org-timeblock-files (whomp/list-files-with-extension "~/org" "org")) + (setq org-timeblock-inbox-file "~/org/agenda.org")) ;; Function to provide for creating files (defun whomp/ensure-file-exists (file-path) diff --git a/whomp/whomp-interface.el b/whomp/whomp-interface.el index 6eded57..4949e14 100644 --- a/whomp/whomp-interface.el +++ b/whomp/whomp-interface.el @@ -61,8 +61,9 @@ ;; if things look wonky, you probably either need to install the ;; theme or you need to check your spelling. (if whomp-ui-theme - (load-theme whomp-ui-theme :no-confirm) - (message "Theme loaded: %s" whomp-ui-theme)) + ((load-theme whomp-ui-theme :no-confirm) + (message "Theme loaded: %s" whomp-ui-theme)) + (message "No theme set.")) ;; icon bits diff --git a/whomp/whomp-orgmode.el b/whomp/whomp-orgmode.el index b8ba019..ba0959e 100644 --- a/whomp/whomp-orgmode.el +++ b/whomp/whomp-orgmode.el @@ -49,19 +49,19 @@ '((sequence "TODO(t)" "WAITING(w)" "BLOCKED(b)" "|" "IN-PROGRESS(i)") (sequence "CANCELLED(c)" "|" "DONE(d)"))) (setq org-capture-templates - `(("t" "TODO" entry (file+headline "~/org/agenda/index.org" "Tasks") + `(("t" "TODO" entry (file+headline "~/org/agenda.org" "Tasks") "* TODO %?\n %a") - ("l" "TODO" entry (file+headline "~/org/agenda/index.org" "LIFE Tasks") + ("l" "TODO" entry (file+headline "~/org/agenda.org" "LIFE Tasks") "* TODO %?\n %i\n %a") - ("a" "Appointment" entry (file+headline "~/org/agenda/events.org" "Appointments") + ("a" "Appointment" entry (file+headline "~/org/events.org" "Appointments") "* %?\n %i\n %a" :clock-in t :clock-resume t) - ("e" "Schedule Event" entry (file+headline "~/org/agenda/events.org" "Events") + ("e" "Schedule Event" entry (file+headline "~/org/events.org" "Events") "* %?\n %i\n %a" :clock-in t :clock-resume t) - ("m" "Schedule Meeting" entry (file+headline "~/org/agenda/events.org" "Meetings") + ("m" "Schedule Meeting" entry (file+headline "~/org/events.org" "Meetings") "* %?\n %i\n %a" :clock-in t :clock-resume t) ("n" "Note" entry (file "~/org/index.org") "* %?\n %i\n %a" :clock-in t :clock-resume t) - ("i" "Idea" entry (file "~/org/agenda/ideas.org") + ("i" "Idea" entry (file "~/org/ideas.org") "* %? :IDEA: \n%t" :clock-in t :clock-resume t))) (org-babel-do-load-languages 'org-babel-load-languages diff --git a/whomp/whomp-readers.el b/whomp/whomp-readers.el new file mode 100644 index 0000000..e34b8d4 --- /dev/null +++ b/whomp/whomp-readers.el @@ -0,0 +1,23 @@ +;; +;; Reading Packages +;; These are the packages related to reading from a source +;; + +(defcustom whomp-reader nil + "Whether or not to enable reader packages." + :type '(set (const :tag "Elfeed" elfeed) ;; Elfeed RSS Reader + ) + :group 'whomp-config) + +(when (memq 'elfeed whomp-reader) + (use-package elfeed + :straight t + :defer t) + (use-package elfeed-org + :straight t + :defer t) + (message "Elfeed loaded")) + +(message "W.H.O.M.P. Reader packages loaded") +(provide 'whomp-reader) +;; whomp-social.el ends here