diff --git a/arch-packages/illogical-impulse-pymyc-aur/PKGBUILD b/arch-packages/illogical-impulse-pymyc-aur/PKGBUILD deleted file mode 100644 index 4bbe3a684..000000000 --- a/arch-packages/illogical-impulse-pymyc-aur/PKGBUILD +++ /dev/null @@ -1,13 +0,0 @@ -pkgname=illogical-impulse-pymyc-aur -pkgver=1.0 -pkgrel=1 -pkgdesc='Illogical Impulse PyMYC Dependencies' -arch=(any) -license=(None) -depends=( - python-materialyoucolor-git - gradience - python-libsass - python-material-color-utilities -) - diff --git a/arch-packages/illogical-impulse-python/PKGBUILD b/arch-packages/illogical-impulse-python/PKGBUILD deleted file mode 100644 index 801e2829b..000000000 --- a/arch-packages/illogical-impulse-python/PKGBUILD +++ /dev/null @@ -1,14 +0,0 @@ -pkgname=illogical-impulse-python -pkgver=1.0 -pkgrel=1 -pkgdesc='Illogical Impulse Python Dependencies' -arch=(any) -license=(None) -depends=( - python-build - python-pillow - python-pywal - python-setuptools-scm - python-wheel -) - diff --git a/install.sh b/install.sh index 093ce3f95..a19359af3 100755 --- a/install.sh +++ b/install.sh @@ -115,16 +115,8 @@ install-local-pkgbuild() { x popd } -# create a virtual environment and store python packages into it -ags_state_dir=$XDG_STATE_DIR/ags -venv_dir=$ags_state_dir - -x mkdir -p $ags_state-dir -x uv venv --prompt .venv $venv_dir -x source $venv_dir/bin/activate - # Install core dependencies from the meta-packages -metapkgs=(./arch-packages/illogical-impulse-{audio,backlight,basic,fonts-themes,gnome,gtk,portal,python,screencapture,widgets}) +metapkgs=(./arch-packages/illogical-impulse-{audio,backlight,basic,fonts-themes,gnome,gtk,portal,screencapture,widgets}) metapkgs+=(./arch-packages/illogical-impulse-ags) metapkgs+=(./arch-packages/illogical-impulse-microtex-git) metapkgs+=(./arch-packages/illogical-impulse-oneui4-icons-git) @@ -138,18 +130,24 @@ for i in "${metapkgs[@]}"; do v install-local-pkgbuild "$i" "$metainstallflags" done -# https://github.com/end-4/dots-hyprland/issues/428#issuecomment-2081690658 -# https://github.com/end-4/dots-hyprland/issues/428#issuecomment-2081701482 -# https://github.com/end-4/dots-hyprland/issues/428#issuecomment-2081707099 -case $SKIP_PYMYC_AUR in - true) sleep 0;; - *) - pymycinstallflags="" - $ask && showfun install-local-pkgbuild || pymycinstallflags="$pymycinstallflags --noconfirm" - v install-local-pkgbuild "./arch-packages/illogical-impulse-pymyc-aur" "$pymycinstallflags" - ;; -esac +ags_state_dir=~/.local/state/ags +x mkdir -p $ags_state_dir +# we need python 3.12 https://github.com/python-pillow/Pillow/issues/8089 +x uv venv --prompt .venv $PYTHON_VENV_PATH -p 3.12 +x source $PYTHON_VENV_PATH/bin/activate +x uv pip install -r scriptdata/requirements.txt + +# install gradience +gradience_dir=/tmp/gradience +x git clone https://github.com/ZeyadMoustafaKamal/Gradience.git $gradience_dir +x cd $gradience_dir +x git submodule update --init --recursive +x meson setup build --prefix=$VIRTUAL_ENV +x meson compile -C build +x meson install -C build +x cd - +x deactivate # We don't need the virtual environment anymore # Why need cleanbuild? see https://github.com/end-4/dots-hyprland/issues/389#issuecomment-2040671585 # Why install deps by running a seperate command? see pinned comment of https://aur.archlinux.org/packages/hyprland-git diff --git a/scriptdata/requirements.in b/scriptdata/requirements.in index 3328f33d4..0afbef33a 100644 --- a/scriptdata/requirements.in +++ b/scriptdata/requirements.in @@ -8,3 +8,5 @@ psutil git+https://github.com/T-Dynamos/materialyoucolor-python.git libsass material-color-utilities +lxml +pygobject diff --git a/scriptdata/requirements.txt b/scriptdata/requirements.txt index 904933a09..a709c1e0c 100644 --- a/scriptdata/requirements.txt +++ b/scriptdata/requirements.txt @@ -6,6 +6,8 @@ cffi==1.17.1 # via pywayland libsass==0.23.0 # via -r scriptdata/requirements.in +lxml==5.3.0 + # via -r scriptdata/requirements.in material-color-utilities==0.2.1 # via -r scriptdata/requirements.in materialyoucolor @ git+https://github.com/T-Dynamos/materialyoucolor-python.git@73080739dc7c46d378a7624881e9c1e6b20b23f1 @@ -22,8 +24,12 @@ pillow==11.1.0 # material-color-utilities psutil==6.1.1 # via -r scriptdata/requirements.in +pycairo==1.27.0 + # via pygobject pycparser==2.22 # via cffi +pygobject==3.50.0 + # via -r scriptdata/requirements.in pyproject-hooks==1.2.0 # via build pywal==3.3.0