From d8d45287d7ac1b76d365e650eae8aba7badd67a2 Mon Sep 17 00:00:00 2001
From: Maxi Wolff <smile13241324@gmail.com>
Date: Thu, 27 Jun 2024 20:17:40 +0200
Subject: [PATCH] [rcirc] Fix double ownership of erc packages

---
 layers/+chat/erc/packages.el   |  9 +++++++++
 layers/+chat/rcirc/packages.el | 12 ++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/layers/+chat/erc/packages.el b/layers/+chat/erc/packages.el
index f093f53cc47e..f29f9dd250ef 100644
--- a/layers/+chat/erc/packages.el
+++ b/layers/+chat/erc/packages.el
@@ -27,6 +27,7 @@
     company-emoji
     emoji-cheat-sheet-plus
     erc
+    erc-tweet
     (erc-gitter :location (recipe
                            :fetcher github
                            :repo "jleechpe/erc-gitter")
@@ -151,6 +152,14 @@
               (add-to-list 'erc-modules 'youtube)))))
 (defun erc/init-erc-yt ())
 
+(defun erc/pre-init-erc-tweet ()
+  (spacemacs|use-package-add-hook erc
+    :post-config
+    (use-package erc-tweet
+      :init (with-eval-after-load 'erc
+              (add-to-list 'erc-modules 'tweet)))))
+(defun erc/init-erc-tweet ())
+
 (defun erc/pre-init-erc-yank ()
   (spacemacs|use-package-add-hook erc
     :post-config
diff --git a/layers/+chat/rcirc/packages.el b/layers/+chat/rcirc/packages.el
index 2ac333e65847..ac837484a20c 100644
--- a/layers/+chat/rcirc/packages.el
+++ b/layers/+chat/rcirc/packages.el
@@ -27,9 +27,9 @@
     company-emoji
     emoji-cheat-sheet-plus
     emojify
-    (erc-image :toggle rcirc-enable-erc-image)
-    (erc-tweet :toggle rcirc-enable-erc-tweet)
-    (erc-yt :toggle rcirc-enable-erc-yt)
+    erc-image
+    erc-tweet
+    erc-yt
     flyspell
     (helm-rcirc :location local
                 :requires helm)
@@ -59,7 +59,7 @@
       :hook (rcirc-mode . emojify-mode)
       :if rcirc-enable-emojify)))
 
-(defun rcirc/init-erc-image ()
+(defun rcirc/post-init-erc-image ()
   (spacemacs|use-package-add-hook rcirc
     :post-config
     (use-package erc-image
@@ -71,7 +71,7 @@
               (add-hook 'rcirc-markup-text-functions
                         #'spacemacs//rcirc-image-show-url)))))
 
-(defun rcirc/init-erc-tweet ()
+(defun rcirc/post-init-erc-tweet ()
   (spacemacs|use-package-add-hook rcirc
     :post-config
     (use-package erc-tweet
@@ -83,7 +83,7 @@
               (add-hook 'rcirc-markup-text-functions
                         #'spacemacs//rcirc-tweet-show-tweet)))))
 
-(defun rcirc/init-erc-yt ()
+(defun rcirc/post-init-erc-yt ()
   (spacemacs|use-package-add-hook rcirc
     :post-config
     (use-package erc-yt