From 819f8a7e61c5b3863969dbea6afb6ad201a9c599 Mon Sep 17 00:00:00 2001
From: TheSiahxyz <164138827+TheSiahxyz@users.noreply.github.com>
Date: Sat, 25 Jan 2025 05:13:25 +0900
Subject: modified Makefile, modified share/mutt-wizard.muttrc

---
 Makefile                 | 18 ++++++++++++++++--
 share/mutt-wizard.muttrc |  4 ++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a0c2bf1..2d80f68 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 PREFIX = /usr/local
 MANPREFIX = $(PREFIX)/share/man
-DEPENDENCIES = neomutt curl msmtp pass gettext
+DEPENDENCIES = neomutt curl msmtp pass gettext urlview urlscan
 NON_EXEC_DEPS = isync ca-certificates
 
 check-dependencies:
@@ -53,7 +53,21 @@ install-dependencies:
 		sudo dnf install -y $(DEPENDENCIES); \
 	elif command -v pacman >/dev/null 2>&1; then \
 		echo "Using pacman to install dependencies..."; \
-		sudo pacman -S --needed $(DEPENDENCIES); \
+		if ! sudo pacman -S --needed $(DEPENDENCIES); then \
+			if command -v yay >/dev/null 2>&1; then \
+				echo "Using yay to install dependencies..."; \
+				yay -S $(DEPENDENCIES); \
+			elif command -v paru >/dev/null 2>&1; then \
+				echo "Using paru to install dependencies..."; \
+				paru -S $(DEPENDENCIES); \
+			else \
+				echo "Error: No AUR helper found. Please install dependencies manually."; \
+				exit 1; \
+			fi; \
+		fi; \
+	elif command -v rpm >/dev/null 2>&1; then \
+		echo "Using rpm to install dependencies..."; \
+		sudo rpm -i $(DEPENDENCIES); \
 	elif command -v zypper >/dev/null 2>&1; then \
 		echo "Using zypper to install dependencies..."; \
 		sudo zypper install -y $(DEPENDENCIES); \
diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc
index 3dfe123..647f76f 100644
--- a/share/mutt-wizard.muttrc
+++ b/share/mutt-wizard.muttrc
@@ -104,6 +104,10 @@ macro index O "<shell-escape>mailsync<enter>" "run mailsync to sync all mail"
 macro index \Cf "<enter-command>unset wait_key<enter><shell-escape>printf 'Enter a search term to find with notmuch: '; read x; echo \$x >\"\${XDG_CACHE_HOME:-\$HOME/.cache}/mutt_terms\"<enter><limit>~i \"\`notmuch search --output=messages \$(cat \"\${XDG_CACHE_HOME:-\$HOME/.cache}/mutt_terms\") | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/g for@a; s/\\$/\\\\\\$/g for@a;print@a' \`\"<enter>" "show only messages matching a notmuch pattern"
 macro index A "<limit>all\n" "show all messages (undo limit)"
 
+# urlscan
+macro index,pager \cw "<pipe-message> urlscan<Enter>" "call urlscan to extract URLs out of a message"
+macro attach,compose \cw "<pipe-entry> urlscan<Enter>" "call urlscan to extract URLs out of a message"
+
 # Sidebar mappings
 set sidebar_visible = yes
 set sidebar_width = 20
-- 
cgit v1.2.3