Re-arrange scripts; fix comments in dist-nix

scriptdata/lib/package-installers.sh

@@ -106,6 +106,6 @@ install-python-packages(){
   # we need python 3.12 https://github.com/python-pillow/Pillow/issues/8089
   x uv venv --prompt .venv $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV) -p 3.12
   x source $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate
-  x uv pip install -r scriptdata/requirements.txt
+  x uv pip install -r scriptdata/uv/requirements.txt
   x deactivate # We don't need the virtual environment anymore
 }

scriptdata/previous_dependencies.conf

@@ -1,79 +0,0 @@
-### 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

scriptdata/requirements.txt

@@ -1,50 +0,0 @@
-# This file was autogenerated by uv via the following command:
-#    uv pip compile scriptdata/requirements.in -o scriptdata/requirements.txt
-build==1.2.2.post1
-    # via -r scriptdata/requirements.in
-cffi==1.17.1
-    # via pywayland
-click==8.2.1
-    # via -r scriptdata/requirements.in
-libsass==0.23.0
-    # via -r scriptdata/requirements.in
-loguru==0.7.3
-    # via -r scriptdata/requirements.in
-material-color-utilities==0.2.1
-    # via -r scriptdata/requirements.in
-materialyoucolor==2.0.10
-    # via -r scriptdata/requirements.in
-numpy==2.2.2
-    # via material-color-utilities
-packaging==24.2
-    # via
-    #   build
-    #   setuptools-scm
-pillow==11.1.0
-    # via
-    #   -r scriptdata/requirements.in
-    #   material-color-utilities
-psutil==6.1.1
-    # via -r scriptdata/requirements.in
-pycairo==1.28.0
-    # via
-    #   -r scriptdata/requirements.in
-    #   pygobject
-pycparser==2.22
-    # via cffi
-pygobject==3.52.3
-    # via -r scriptdata/requirements.in
-pyproject-hooks==1.2.0
-    # via build
-pywayland==0.4.18
-    # via -r scriptdata/requirements.in
-setproctitle==1.3.4
-    # via -r scriptdata/requirements.in
-setuptools==80.9.0
-    # via setuptools-scm
-setuptools-scm==8.1.0
-    # via -r scriptdata/requirements.in
-tqdm==4.67.1
-    # via -r scriptdata/requirements.in
-wheel==0.45.1
-    # via -r scriptdata/requirements.in

scriptdata/step/1.install-deps-selector.sh

@@ -62,7 +62,7 @@ if [[ "$INSTALL_VIA_NIX" == "true" ]]; then
   TARGET_ID=nix
   printf "${STY_YELLOW}"
   printf "===WARNING===\n"
-  printf "Nix will be used to install dependencies.\n"
+  printf "./dist-${TARGET_ID}/install-deps.sh will be used.\n"
   printf "The process is still WIP.\n"
   printf "Proceed only at your own risk.\n"
   printf "\n"

scriptdata/step/2.install-setups-selector.sh

@@ -16,10 +16,10 @@ export OS_DISTRO_ID_LIKE=$(awk -F'=' '/^ID_LIKE=/ { gsub("\"","",$2); print tolo
 
 if [[ "$INSTALL_VIA_NIX" == "true" ]]; then
 
-  TARGET_ID=nix
+  TARGET_ID=fallback
   printf "${STY_YELLOW}"
   printf "===WARNING===\n"
-  printf "Nix will be used to do setups.\n"
+  printf "./dist-${TARGET_ID}/install-setups.sh will be used.\n"
   printf "The process is still WIP.\n"
   printf "Proceed only at your own risk.\n"
   printf "\n"

scriptdata/uv/requirements.txt

@@ -0,0 +1,50 @@
+# This file was autogenerated by uv via the following command:
+#    uv pip compile scriptdata/uv/requirements.in -o scriptdata/uv/requirements.txt
+build==1.2.2.post1
+    # via -r scriptdata/uv/requirements.in
+cffi==1.17.1
+    # via pywayland
+click==8.2.1
+    # via -r scriptdata/uv/requirements.in
+libsass==0.23.0
+    # via -r scriptdata/uv/requirements.in
+loguru==0.7.3
+    # via -r scriptdata/uv/requirements.in
+material-color-utilities==0.2.1
+    # via -r scriptdata/uv/requirements.in
+materialyoucolor==2.0.10
+    # via -r scriptdata/uv/requirements.in
+numpy==2.2.2
+    # via material-color-utilities
+packaging==24.2
+    # via
+    #   build
+    #   setuptools-scm
+pillow==11.1.0
+    # via
+    #   -r scriptdata/uv/requirements.in
+    #   material-color-utilities
+psutil==6.1.1
+    # via -r scriptdata/uv/requirements.in
+pycairo==1.28.0
+    # via
+    #   -r scriptdata/uv/requirements.in
+    #   pygobject
+pycparser==2.22
+    # via cffi
+pygobject==3.52.3
+    # via -r scriptdata/uv/requirements.in
+pyproject-hooks==1.2.0
+    # via build
+pywayland==0.4.18
+    # via -r scriptdata/uv/requirements.in
+setproctitle==1.3.4
+    # via -r scriptdata/uv/requirements.in
+setuptools==80.9.0
+    # via setuptools-scm
+setuptools-scm==8.1.0
+    # via -r scriptdata/uv/requirements.in
+tqdm==4.67.1
+    # via -r scriptdata/uv/requirements.in
+wheel==0.45.1
+    # via -r scriptdata/uv/requirements.in