From 4949fb113eb90fb166cd0fcb6d61b2b0d7b413ab Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 27 Oct 2023 06:51:20 +0100
Subject: [PATCH] Update custom configs to check if module is installed before
 config

---
 home/emacs/modules/custom-email-config.el |  7 +++--
 home/emacs/modules/custom-feed-config.el  | 13 +++++----
 home/emacs/modules/custom-ide-config.el   | 34 +++++++++++++++--------
 home/emacs/modules/custom-media-config.el |  5 ++--
 home/emacs/modules/custom-ntfy-config.el  |  7 -----
 5 files changed, 37 insertions(+), 29 deletions(-)
 delete mode 100644 home/emacs/modules/custom-ntfy-config.el

diff --git a/home/emacs/modules/custom-email-config.el b/home/emacs/modules/custom-email-config.el
index f6b18c37..6a7670de 100644
--- a/home/emacs/modules/custom-email-config.el
+++ b/home/emacs/modules/custom-email-config.el
@@ -13,8 +13,9 @@
       notmuch-indicator-force-refresh-commands '(notmuch-refresh-this-buffer
                                                  notmuch-refresh-all-buffers
                                                  notmuch-poll-and-refresh-this-buffer))
-(require 'notmuch)
-(require 'notmuch-indicator)
-(notmuch-indicator-mode +1)
+
+(when (require 'notmuch nil :noerror)
+  (require 'notmuch-indicator)
+  (notmuch-indicator-mode +1))
 
 (provide 'custom-email-config)
diff --git a/home/emacs/modules/custom-feed-config.el b/home/emacs/modules/custom-feed-config.el
index d96ed82c..3ac45678 100644
--- a/home/emacs/modules/custom-feed-config.el
+++ b/home/emacs/modules/custom-feed-config.el
@@ -1,11 +1,12 @@
 (setq elfeed-db-directory "~/.elfeed/db/"
       elfeed-enclosure-default-dir "~/.elfeed/enclosures/"
       rmh-elfeed-org-files (list "elfeed.org"))
-(add-hook 'elfeed-search-mode-hook #'elfeed-update)
-(require 'elfeed)
-(require 'elfeed-org)
-(require 'elfeed-tube)
-(elfeed-org)
-(elfeed-tube-setup)
+
+(when (require 'elfeed nil :noerror)
+  (add-hook 'elfeed-search-mode-hook #'elfeed-update)
+  (when (require 'elfeed-org nil :noerror)
+    (elfeed-org))
+  (when (require 'elfeed-tube nil :noerror)
+    (elfeed-tube-setup)))
 
 (provide 'custom-feed-config)
diff --git a/home/emacs/modules/custom-ide-config.el b/home/emacs/modules/custom-ide-config.el
index 050868b9..ca260694 100644
--- a/home/emacs/modules/custom-ide-config.el
+++ b/home/emacs/modules/custom-ide-config.el
@@ -1,14 +1,26 @@
 (setq direnv-always-show-summary nil)
-(require 'treesit-auto)
-(global-treesit-auto-mode +1)
-(apheleia-global-mode +1)
-(direnv-mode +1)
-(eglot-ensure)
-(require 'yasnippet)
-(require 'yasnippet-snippets)
-(yas-reload-all)
-(add-hook 'prog-mode-hook #'aggressive-indent-mode)
-(add-hook 'prog-mode-hook #'rainbow-delimiters-mode)
-(add-hook 'prog-mode-hook #'yas-minor-mode)
+
+(when (require 'aggressive-indent nil :noerror)
+  (add-hook 'prog-mode-hook #'aggressive-indent-mode))
+
+(when (require 'rainbow-delimiters nil :noerror)
+  (add-hook 'prog-mode-hook #'rainbow-delimiters-mode))
+
+(when (require 'treesit-aut nil :noerror)
+  (global-treesit-auto-mode +1))
+
+(when (require 'apheleia nil :noerror)
+  (apheleia-global-mode +1))
+
+(when (require 'eglot nil :noerror)
+  (eglot-ensure))
+
+(when (require 'direnv nil :noerror)
+  (direnv-mode +1))
+
+(when (require 'yasnippet nil :noerror)
+  (require 'yasnippet-snippets nil :noerror)
+  (yas-reload-all)
+  (add-hook 'prog-mode-hook #'yas-minor-mode))
 
 (provide 'custom-ide-config)
diff --git a/home/emacs/modules/custom-media-config.el b/home/emacs/modules/custom-media-config.el
index aec2d39a..eea8fb1f 100644
--- a/home/emacs/modules/custom-media-config.el
+++ b/home/emacs/modules/custom-media-config.el
@@ -1,8 +1,9 @@
-(require 'emms-setup)
-(emms-all)
 (setq emms-player-list '(emms-player-mpv)
       emms-info-functions '(emms-info-native)
       emms-source-file-default-directory "~/Music"
       emms-lyrics-dir "~/Music/lyrics")
 
+(when (require 'emms-setup nil :noerror)
+  (emms-all))
+
 (provide 'custom-media-config)
diff --git a/home/emacs/modules/custom-ntfy-config.el b/home/emacs/modules/custom-ntfy-config.el
deleted file mode 100644
index 1ebbebc6..00000000
--- a/home/emacs/modules/custom-ntfy-config.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(setq ntfy-server "https://ntfy.xenia.me.uk"
-	ntfy-topic "UhrNGphnSKCpCnk8"
-	ntfy-header "Notification from emacs"
-	ntfy-tags "purple_circle,loudspeaker")
-(require 'ntfy)
-
-(provide 'custom-ntfy-config)