From ec2911a8809719d471e5b2cd3708000fb9c96a3a Mon Sep 17 00:00:00 2001
From: Yuchen Pei <id@ypei.org>
Date: Thu, 2 Nov 2023 23:13:47 +1100
Subject: [emacs] Install mastodon.el from nongnu elpa

---
 .gitmodules                     | 3 ---
 emacs/.emacs.d/init/ycp-web.el  | 2 +-
 emacs/.emacs.d/lisp/mastodon.el | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 160000 emacs/.emacs.d/lisp/mastodon.el

diff --git a/.gitmodules b/.gitmodules
index 26a3a93..6917752 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,9 +73,6 @@
 [submodule ".emacs.d/lisp/bbdb-vcard"]
 	path = emacs/.emacs.d/lisp/bbdb-vcard
 	url = https://github.com/tohojo/bbdb-vcard
-[submodule ".emacs.d/lisp/mastodon.el"]
-	path = emacs/.emacs.d/lisp/mastodon.el
-	url = https://codeberg.org/martianh/mastodon.el
 [submodule "emacs/.emacs.d/lisp/org-jira"]
 	path = emacs/.emacs.d/lisp/org-jira
 	url = https://github.com/ahungry/org-jira
diff --git a/emacs/.emacs.d/init/ycp-web.el b/emacs/.emacs.d/init/ycp-web.el
index 31d0528..473865c 100644
--- a/emacs/.emacs.d/init/ycp-web.el
+++ b/emacs/.emacs.d/init/ycp-web.el
@@ -267,8 +267,8 @@
   (require 'sx-load))
 
 ;; mastodon
-(add-to-list 'load-path (locate-user-emacs-file "lisp/mastodon.el/lisp"))
 (my-package mastodon
+  (:install t)
   (my-setq-from-local mastodon-active-user mastodon-instance-url)
   ;; auto fill is a bit glitchy when composing a toot
   (add-hook 'mastodon-toot-mode-hook (lambda () (turn-off-auto-fill)))
diff --git a/emacs/.emacs.d/lisp/mastodon.el b/emacs/.emacs.d/lisp/mastodon.el
deleted file mode 160000
index b3649a1..0000000
--- a/emacs/.emacs.d/lisp/mastodon.el
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b3649a12a398537ade7136d704f2f05ccc856e23
-- 
cgit v1.2.3