From 4f884f5fdc5f974c7decbbba2b33ed68ebf975bc Mon Sep 17 00:00:00 2001
From: Makrennel <makrommel@protonmail.ch>
Date: Sat, 1 Jun 2024 22:24:42 +0100
Subject: [PATCH] Re-allow declaration of deps in dependencies.conf

This is primarily for the use of the user, it's best to declare
core dependencies in meta-packages.
---
 install.sh                   | 23 ++++++++++++--------
 scriptdata/dependencies.conf | 41 +++++-------------------------------
 2 files changed, 19 insertions(+), 45 deletions(-)

diff --git a/install.sh b/install.sh
index 2f3f0f393..84ce15ef8 100755
--- a/install.sh
+++ b/install.sh
@@ -81,16 +81,20 @@ if ! command -v yay >/dev/null 2>&1;then
 else AUR_HELPER=yay
 fi
 
-#if $ask;then
-#  # execute per element of the array $pkglist
-#  for i in "${pkglist[@]}";do v $AUR_HELPER -S --needed $i;done
-#else
-#  # execute for all elements of the array $pkglist in one line
-#  v $AUR_HELPER -S --needed --noconfirm ${pkglist[*]}
-#fi
+# Install extra packages from dependencies.conf as declared by the user
+if (( ${#pkglist[@]} != 0 )); then
+	if $ask; then
+		# execute per element of the array $pkglist
+		for i in "${pkglist[@]}";do v $AUR_HELPER -S --needed $i;done
+	else
+		# execute for all elements of the array $pkglist in one line
+		v $AUR_HELPER -S --needed --noconfirm ${pkglist[*]}
+	fi
+fi
 
+# Install core dependencies from the meta-packages
 metapkgs=(arch-packages/illogical-impulse-{audio,backlight,basic,fonts-themes,gnome,gtk,microtex,portal,python,screencapture,widgets})
-if $ask;then
+if $ask; then
 	# execute for every meta package
 	for i in "${metapkgs[@]}";do v $AUR_HELPER -Bi --needed --answerclean=n $i;done
 else
@@ -119,7 +123,8 @@ case $SKIP_PYMYC_AUR in
   true) sleep 0;;
   *)
     if $ask;then
-      # Yay is bugged and destroys the PKGBUILD if you specify to cleanBuild with the -Bi flag, so we install the deps manually
+      # Yay is bugged and destroys the PKGBUILD if you specify to cleanBuild with the -Bi flag, so we install the deps manually.
+      # If we install the deps using --asdeps we can remove them recursively by removing the metapackage.
       v \
 	    $AUR_HELPER -S --answerclean=a --asdeps ${pymyc[@]} && \
 	    pushd arch-packages/illogical-impulse-pymyc-aur & makepkg -si & popd
diff --git a/scriptdata/dependencies.conf b/scriptdata/dependencies.conf
index 167dcc2d8..82354ad8f 100644
--- a/scriptdata/dependencies.conf
+++ b/scriptdata/dependencies.conf
@@ -1,40 +1,9 @@
 ### This file supports bash-style comments, and blank lines.
-### PKGs on same line will be send to `yay` together, unless `-f` is specified.
+### PKGs on same line will be sent to `yay` together, unless `-f` is specified.
 
-### Ones which need cleanbuild (see install.sh):
-# hyprland-git
-# python-materialyoucolor-git gradience-git python-libsass python-material-color-utilities
+### Most dependencies have been moved to meta packages as declared in arch-packages.
+### Use this file for declaring extra dependencies which you need but are not declared by default.
 
-### Basic
-axel bc coreutils cliphist cmake curl fuzzel rsync wget ripgrep gojq jq npm meson typescript gjs xdg-user-dirs
+### Uncomment to fix issue #197
+#python-setuptools-scm python-wheel
 
-# Make deps of MicroTeX
-tinyxml2 gtkmm3 gtksourceviewmm cairomm
-
-### Python
-# Add `python-setuptools-scm` and `python-wheel` explicitly to fix #197
-python-build python-pillow python-pywal python-setuptools-scm python-wheel
-
-### Basic graphic env
-xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-hyprland-git
-
-### Player and Audio
-pavucontrol wireplumber libdbusmenu-gtk3 playerctl swww
-
-### GTK
-webp-pixbuf-loader gtk-layer-shell gtk3 gtksourceview3 gobject-introspection upower yad ydotool xdg-user-dirs-gtk
-
-### Gnome
-polkit-gnome gnome-keyring gnome-control-center blueberry networkmanager gammastep gnome-bluetooth-3.0
-
-### Backlight
-brightnessctl ddcutil
-
-### Widgets
-dart-sass python-pywayland python-psutil hypridle-git hyprlock-git wlogout wl-clipboard hyprpicker-git anyrun-git
-
-### Fonts and Themes
-adw-gtk3-git qt5ct qt5-wayland fontconfig ttf-readex-pro ttf-jetbrains-mono-nerd ttf-material-symbols-variable-git ttf-space-mono-nerd fish foot starship
-
-### Screenshot and Recoder
-swappy wf-recorder grim tesseract tesseract-data-eng slurp