Re-arrange scripts; fix comments in dist-nix

dist-arch/install-deps.sh

@@ -16,17 +16,17 @@ handle-deprecated-dependencies(){
   printf "${STY_CYAN}[$0]: Removing deprecated dependencies:${STY_RESET}\n"
   for i in illogical-impulse-{microtex,pymyc-aur,ags,agsv1} {hyprutils,hyprpicker,hyprlang,hypridle,hyprland-qt-support,hyprland-qtutils,hyprlock,xdg-desktop-portal-hyprland,hyprcursor,hyprwayland-scanner,hyprland}-git;do try sudo pacman --noconfirm -Rdd $i;done
 # Convert old dependencies to non explicit dependencies so that they can be orphaned if not in meta packages
-	remove_bashcomments_emptylines ./scriptdata/previous_dependencies.conf ./cache/old_deps_stripped.conf
-	readarray -t old_deps_list < ./cache/old_deps_stripped.conf
-	pacman -Qeq > ./cache/pacman_explicit_packages
-	readarray -t explicitly_installed < ./cache/pacman_explicit_packages
+  remove_bashcomments_emptylines ./dist-arch/previous_dependencies.conf ./cache/old_deps_stripped.conf
+  readarray -t old_deps_list < ./cache/old_deps_stripped.conf
+  pacman -Qeq > ./cache/pacman_explicit_packages
+  readarray -t explicitly_installed < ./cache/pacman_explicit_packages
 
-	echo "Attempting to set previously explicitly installed deps as implicit..."
-	for i in "${explicitly_installed[@]}"; do for j in "${old_deps_list[@]}"; do
-		[ "$i" = "$j" ] && yay -D --asdeps "$i"
-	done; done
+  echo "Attempting to set previously explicitly installed deps as implicit..."
+  for i in "${explicitly_installed[@]}"; do for j in "${old_deps_list[@]}"; do
+    [ "$i" = "$j" ] && yay -D --asdeps "$i"
+  done; done
 
-	return 0
+  return 0
 }
 
 #####################################################################################
@@ -55,16 +55,16 @@ v handle-deprecated-dependencies
 # https://github.com/end-4/dots-hyprland/issues/581
 # yay -Bi is kinda hit or miss, instead cd into the relevant directory and manually source and install deps
 install-local-pkgbuild() {
-	local location=$1
-	local installflags=$2
+  local location=$1
+  local installflags=$2
 
-	x pushd $location
+  x pushd $location
 
-	source ./PKGBUILD
-	x yay -S $installflags --asdeps "${depends[@]}"
-	x makepkg -Asi --noconfirm
+  source ./PKGBUILD
+  x yay -S $installflags --asdeps "${depends[@]}"
+  x makepkg -Asi --noconfirm
 
-	x popd
+  x popd
 }
 
 # Install core dependencies from the meta-packages
@@ -76,9 +76,9 @@ metapkgs+=(./dist-arch/illogical-impulse-microtex-git)
   metapkgs+=(./dist-arch/illogical-impulse-bibata-modern-classic-bin)
 
 for i in "${metapkgs[@]}"; do
-	metainstallflags="--needed"
-	$ask && showfun install-local-pkgbuild || metainstallflags="$metainstallflags --noconfirm"
-	v install-local-pkgbuild "$i" "$metainstallflags"
+  metainstallflags="--needed"
+  $ask && showfun install-local-pkgbuild || metainstallflags="$metainstallflags --noconfirm"
+  v install-local-pkgbuild "$i" "$metainstallflags"
 done
 
 ## Optional dependencies

dist-arch/previous_dependencies.conf

@@ -0,0 +1,79 @@
+### This file contains a list of dependencies which were previously explicitly installed that are now installed using meta packages
+### Must be one package per line as it needs to be compared against the explicitly installed list from pacman
+illogical-impulse-ags
+archlinux-xdg-menu
+axel
+bc
+coreutils
+cliphist
+cmake
+curl
+fuzzel
+rsync
+wget
+ripgrep
+gojq
+npm
+meson
+typescript
+gjs
+xdg-user-dirs
+tinyxml2
+gtkmm3
+gtksourceviewmm
+cairomm
+python-build
+python-pillow
+python-pywal
+python-setuptools-scm
+python-wheel
+xdg-desktop-portal
+xdg-desktop-portal-gtk
+xdg-desktop-portal-hyprland-git
+pavucontrol
+wireplumber
+libdbusmenu-gtk3
+playerctl
+swww
+webp-pixbuf-loader
+gtk-layer-shell
+gtk3
+gtksourceview3
+gobject-introspection
+upower
+yad
+ydotool
+xdg-user-dirs-gtk
+polkit-gnome
+gnome-keyring
+gnome-control-center
+blueberry
+gammastep
+gnome-bluetooth-3.0
+brightnessctl
+ddcutil
+dart-sass
+python-pywayland
+python-psutil
+hypridle-git
+hyprlock-git
+wlogout
+wl-clipboard
+hyprpicker-git
+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
+swappy
+wf-recorder
+grim
+tesseract
+tesseract-data-eng
+slurp