From f2480834e287aa50176ab9a648fa7dabc5aec5db Mon Sep 17 00:00:00 2001
From: Yuchen Pei <id@ypei.org>
Date: Sat, 19 Aug 2023 18:42:50 +1000
Subject: Adding common packages for use of any profile

---
 emacs/.emacs.d/init/ycp-package.el   | 8 +++++---
 emacs/.emacs.d/init/ycp-web.el       | 4 ++--
 emacs/.emacs.d/lisp/my/my-package.el | 5 +++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/emacs/.emacs.d/init/ycp-package.el b/emacs/.emacs.d/init/ycp-package.el
index bdf24f7..ff0d498 100644
--- a/emacs/.emacs.d/init/ycp-package.el
+++ b/emacs/.emacs.d/init/ycp-package.el
@@ -33,13 +33,15 @@
 ;; hide configs under an (my-package dummy)
 (cond
  ((equal my-profile "emms")
-  (setq my-allowed-packages '(package windmove emms my-emms)))
+  (setq my-allowed-packages
+        (append my-common-packages '(emms my-emms))))
  ((equal my-profile "erc")
-  (setq my-allowed-packages '(package windmove icomplete modus-themes erc)))
+  (setq my-allowed-packages
+        (append my-common-packages '(modus-themes erc mastodon))))
  (t
   (setq my-omit-packages
         '(typescript-mode tide web-mode flycheck ggtags crystal-mode
-                          proof-general sml-mode emms my-emms erc))))
+                          proof-general sml-mode emms my-emms erc mastodon))))
 
 (my-read-local-config)
 ;; only start server on default profile
diff --git a/emacs/.emacs.d/init/ycp-web.el b/emacs/.emacs.d/init/ycp-web.el
index 78c1ac2..5834971 100644
--- a/emacs/.emacs.d/init/ycp-web.el
+++ b/emacs/.emacs.d/init/ycp-web.el
@@ -158,8 +158,8 @@
 ;; mastodon
 (add-to-list 'load-path (locate-user-emacs-file "lisp/mastodon.el/lisp"))
 (my-package mastodon
-  (:delay 60)
-  (my-setq-from-local mastodon-active-user mastodon-instance-url))
+  (my-setq-from-local mastodon-active-user mastodon-instance-url)
+  (mastodon))
 
 (add-to-list 'load-path (locate-user-emacs-file "lisp/servall/lisp"))
 (my-package servall-wikipedia
diff --git a/emacs/.emacs.d/lisp/my/my-package.el b/emacs/.emacs.d/lisp/my/my-package.el
index ab8aaca..b591d0f 100644
--- a/emacs/.emacs.d/lisp/my/my-package.el
+++ b/emacs/.emacs.d/lisp/my/my-package.el
@@ -262,5 +262,10 @@ same name, cancel that one first."
   (dolist (hook hooks)
     (add-hook hook function)))
 
+(defvar my-common-packages
+  '(package windmove consult icomplete
+            my-utils my-buffer my-editing my-complete)
+  "Common packages to include with any profile")
+
 (provide 'my-package)
 ;;; my-package.el ends here
-- 
cgit v1.2.3