From 4fc283861e5baa170b48883c78d2928c5dd02e47 Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Fri, 24 Jan 2025 21:22:57 +0200 Subject: [PATCH 01/12] Add uv installer --- scriptdata/installers | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scriptdata/installers b/scriptdata/installers index da3a75943..ebf8ca54f 100644 --- a/scriptdata/installers +++ b/scriptdata/installers @@ -112,3 +112,12 @@ install-MicroTeX (){ x sudo cp -r ./res /opt/MicroTeX/ x cd $base } + +install-uv (){ + x mkdir -p $base/cache/uv + x cd $base/cache/uv + export UV_INSTALL_DIR=$base/cache + x curl -LsSf https://astral.sh/uv/install.sh | sh + x cd $base +} + From 1e54a5b0f4160a089ebde11821482dce40464672 Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Sat, 25 Jan 2025 21:41:04 +0200 Subject: [PATCH 02/12] fix uv installer --- scriptdata/environment-variables | 1 + scriptdata/installers | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/scriptdata/environment-variables b/scriptdata/environment-variables index 96f37bffd..fd97feef1 100644 --- a/scriptdata/environment-variables +++ b/scriptdata/environment-variables @@ -5,4 +5,5 @@ XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config} XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share} XDG_STATE_HOME=${XDG_STATE_HOME:-$HOME/.local/state} BACKUP_DIR=${BACKUP_DIR:-$HOME/backup} +UV_NO_MODIFY_PATH=1 diff --git a/scriptdata/installers b/scriptdata/installers index ebf8ca54f..0feabb607 100644 --- a/scriptdata/installers +++ b/scriptdata/installers @@ -114,10 +114,6 @@ install-MicroTeX (){ } install-uv (){ - x mkdir -p $base/cache/uv - x cd $base/cache/uv - export UV_INSTALL_DIR=$base/cache x curl -LsSf https://astral.sh/uv/install.sh | sh - x cd $base } From 39577343a71d409cabe28a695eca71d1415b0d66 Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Sat, 25 Jan 2025 22:47:55 +0200 Subject: [PATCH 03/12] create a virtual environment in the installer --- install.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/install.sh b/install.sh index 4ae0a5d62..093ce3f95 100755 --- a/install.sh +++ b/install.sh @@ -115,6 +115,14 @@ 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-ags) From 68b21115f50c6974bedec61b3f7682d2f05b5c0e Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Sat, 1 Feb 2025 19:01:24 +0200 Subject: [PATCH 04/12] add requirements files --- scriptdata/requirements.in | 10 ++++++++++ scriptdata/requirements.txt | 38 +++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 scriptdata/requirements.in create mode 100644 scriptdata/requirements.txt diff --git a/scriptdata/requirements.in b/scriptdata/requirements.in new file mode 100644 index 000000000..3328f33d4 --- /dev/null +++ b/scriptdata/requirements.in @@ -0,0 +1,10 @@ +build +pillow +pywal +setuptools-scm +wheel +pywayland +psutil +git+https://github.com/T-Dynamos/materialyoucolor-python.git +libsass +material-color-utilities diff --git a/scriptdata/requirements.txt b/scriptdata/requirements.txt new file mode 100644 index 000000000..904933a09 --- /dev/null +++ b/scriptdata/requirements.txt @@ -0,0 +1,38 @@ +# 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 +libsass==0.23.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 + # 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 +pycparser==2.22 + # via cffi +pyproject-hooks==1.2.0 + # via build +pywal==3.3.0 + # via -r scriptdata/requirements.in +pywayland==0.4.18 + # via -r scriptdata/requirements.in +setuptools==75.8.0 + # via setuptools-scm +setuptools-scm==8.1.0 + # via -r scriptdata/requirements.in +wheel==0.45.1 + # via -r scriptdata/requirements.in From 79e47e844fe91ab8b141b98e4e95f15fcfcb5f78 Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Sat, 1 Feb 2025 21:47:55 +0200 Subject: [PATCH 05/12] add pacman dependencies and modified env variables --- scriptdata/dependencies.conf | 8 ++++++++ scriptdata/environment-variables | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scriptdata/dependencies.conf b/scriptdata/dependencies.conf index 6abf4ff94..4dd18a5c6 100644 --- a/scriptdata/dependencies.conf +++ b/scriptdata/dependencies.conf @@ -4,3 +4,11 @@ ### 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. +gtk4 +libadwaita +libsoup3 +ibportal-gtk4 +pygobject +blueprint-compiler +gobject-introspection +sassc diff --git a/scriptdata/environment-variables b/scriptdata/environment-variables index fd97feef1..ad1048aa0 100644 --- a/scriptdata/environment-variables +++ b/scriptdata/environment-variables @@ -6,4 +6,5 @@ XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share} XDG_STATE_HOME=${XDG_STATE_HOME:-$HOME/.local/state} BACKUP_DIR=${BACKUP_DIR:-$HOME/backup} UV_NO_MODIFY_PATH=1 - +PYTHON_VENV_PATH=$XDG_STATE_HOME/ags/.venv +PYTHON_BIN_PATH=$PYTHON_VENV_PATH/bin/python From 8a28acb8c3a1641930620c1449f21b1fcde54fb9 Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Sun, 2 Feb 2025 16:30:32 +0200 Subject: [PATCH 06/12] fix dependencies --- scriptdata/dependencies.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scriptdata/dependencies.conf b/scriptdata/dependencies.conf index 4dd18a5c6..10742601b 100644 --- a/scriptdata/dependencies.conf +++ b/scriptdata/dependencies.conf @@ -7,8 +7,7 @@ gtk4 libadwaita libsoup3 -ibportal-gtk4 -pygobject +libportal-gtk4 blueprint-compiler gobject-introspection sassc From 77edac927d65d71215a528fe4f8db616aa8175a8 Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Mon, 3 Feb 2025 19:19:48 +0200 Subject: [PATCH 07/12] update the installation process --- .../illogical-impulse-pymyc-aur/PKGBUILD | 13 ------- .../illogical-impulse-python/PKGBUILD | 14 ------- install.sh | 38 +++++++++---------- scriptdata/requirements.in | 2 + scriptdata/requirements.txt | 6 +++ 5 files changed, 26 insertions(+), 47 deletions(-) delete mode 100644 arch-packages/illogical-impulse-pymyc-aur/PKGBUILD delete mode 100644 arch-packages/illogical-impulse-python/PKGBUILD 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 From 307b2e33abe6f01b90d06e39f87f9718ea5f1069 Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Mon, 3 Feb 2025 19:20:12 +0200 Subject: [PATCH 08/12] update scripts to use the new python interpreter --- .../ags/scripts/color_generation/generate_colors_material.py | 3 ++- .config/ags/scripts/hyprland/get_keybinds.py | 3 ++- .config/ags/scripts/wayland-idle-inhibitor.py | 3 +-- .config/hypr/hyprland/env.conf | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.config/ags/scripts/color_generation/generate_colors_material.py b/.config/ags/scripts/color_generation/generate_colors_material.py index 714e95970..b7e634eb6 100755 --- a/.config/ags/scripts/color_generation/generate_colors_material.py +++ b/.config/ags/scripts/color_generation/generate_colors_material.py @@ -1,4 +1,5 @@ -#!/usr/bin/env python3 +#!/usr/bin/env -S\_/bin/sh\_-xc\_"exec\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV/bin/python\_-E\_"\$0"\_"\$@""$ ./generate_colors_material.py + import argparse import math import json diff --git a/.config/ags/scripts/hyprland/get_keybinds.py b/.config/ags/scripts/hyprland/get_keybinds.py index 9b784df0d..5a2c5469f 100755 --- a/.config/ags/scripts/hyprland/get_keybinds.py +++ b/.config/ags/scripts/hyprland/get_keybinds.py @@ -1,4 +1,5 @@ -#!/usr/bin/env python3 +#!/usr/bin/env -S\_/bin/sh\_-xc\_"exec\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV/bin/python\_-E\_"\$0"\_"\$@""$ ./get_keybinds.py + import argparse import re import os diff --git a/.config/ags/scripts/wayland-idle-inhibitor.py b/.config/ags/scripts/wayland-idle-inhibitor.py index 4a4f8f8ce..a8c7e51e6 100755 --- a/.config/ags/scripts/wayland-idle-inhibitor.py +++ b/.config/ags/scripts/wayland-idle-inhibitor.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python - +#!/usr/bin/env -S\_/bin/sh\_-xc\_"exec\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV/bin/python\_-E\_"\$0"\_"\$@""$ ./wayland-idle-inhibitor.py import sys from dataclasses import dataclass from signal import SIGINT, SIGTERM, signal diff --git a/.config/hypr/hyprland/env.conf b/.config/hypr/hyprland/env.conf index ec654432e..40c5d0337 100644 --- a/.config/hypr/hyprland/env.conf +++ b/.config/hypr/hyprland/env.conf @@ -17,5 +17,8 @@ env = QT_QPA_PLATFORMTHEME, qt5ct # ######## Screen tearing ######### # env = WLR_DRM_NO_ATOMIC, 1 +# ######## Virtual envrionment ######### +env = ILLOGICAL_IMPULSE_VIRTUAL_ENV, ~/.local/state/ags/.venv + # ############ Others ############# From 9a780fc5b57fda0bd28ae21425729c8e266d5592 Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Mon, 3 Feb 2025 19:39:15 +0200 Subject: [PATCH 09/12] update requirements --- install.sh | 1 + scriptdata/requirements.in | 2 -- scriptdata/requirements.txt | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/install.sh b/install.sh index a19359af3..7bb0b9604 100755 --- a/install.sh +++ b/install.sh @@ -143,6 +143,7 @@ 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 uv pip install -r requirements.txt x meson setup build --prefix=$VIRTUAL_ENV x meson compile -C build x meson install -C build diff --git a/scriptdata/requirements.in b/scriptdata/requirements.in index 0afbef33a..3328f33d4 100644 --- a/scriptdata/requirements.in +++ b/scriptdata/requirements.in @@ -8,5 +8,3 @@ 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 a709c1e0c..904933a09 100644 --- a/scriptdata/requirements.txt +++ b/scriptdata/requirements.txt @@ -6,8 +6,6 @@ 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 @@ -24,12 +22,8 @@ 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 From d0026143ed6d1a25280c1b9ce4a2a7345fde848e Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Tue, 4 Feb 2025 12:03:29 +0200 Subject: [PATCH 10/12] update scripts shebang --- .../ags/scripts/color_generation/generate_colors_material.py | 3 +-- .config/ags/scripts/hyprland/get_keybinds.py | 3 +-- .config/ags/scripts/wayland-idle-inhibitor.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.config/ags/scripts/color_generation/generate_colors_material.py b/.config/ags/scripts/color_generation/generate_colors_material.py index b7e634eb6..fac1eaf57 100755 --- a/.config/ags/scripts/color_generation/generate_colors_material.py +++ b/.config/ags/scripts/color_generation/generate_colors_material.py @@ -1,5 +1,4 @@ -#!/usr/bin/env -S\_/bin/sh\_-xc\_"exec\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV/bin/python\_-E\_"\$0"\_"\$@""$ ./generate_colors_material.py - +#!/usr/bin/env -S\_/bin/sh\_-xc\_"source\_\$(eval\_echo\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate&&exec\_python\_-E\_"\$0"\_"\$@"" import argparse import math import json diff --git a/.config/ags/scripts/hyprland/get_keybinds.py b/.config/ags/scripts/hyprland/get_keybinds.py index 5a2c5469f..3e4dcd140 100755 --- a/.config/ags/scripts/hyprland/get_keybinds.py +++ b/.config/ags/scripts/hyprland/get_keybinds.py @@ -1,5 +1,4 @@ -#!/usr/bin/env -S\_/bin/sh\_-xc\_"exec\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV/bin/python\_-E\_"\$0"\_"\$@""$ ./get_keybinds.py - +#!/usr/bin/env -S\_/bin/sh\_-xc\_"source\_\$(eval\_echo\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate&&exec\_python\_-E\_"\$0"\_"\$@"" import argparse import re import os diff --git a/.config/ags/scripts/wayland-idle-inhibitor.py b/.config/ags/scripts/wayland-idle-inhibitor.py index a8c7e51e6..ec74d09b1 100755 --- a/.config/ags/scripts/wayland-idle-inhibitor.py +++ b/.config/ags/scripts/wayland-idle-inhibitor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env -S\_/bin/sh\_-xc\_"exec\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV/bin/python\_-E\_"\$0"\_"\$@""$ ./wayland-idle-inhibitor.py +#!/usr/bin/env -S\_/bin/sh\_-xc\_"source\_\$(eval\_echo\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate&&exec\_python\_-E\_"\$0"\_"\$@"" import sys from dataclasses import dataclass from signal import SIGINT, SIGTERM, signal From 39f0dcf9f79446cdfb4583ed358690b8c7374978 Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Tue, 4 Feb 2025 12:38:55 +0200 Subject: [PATCH 11/12] install `uv` in the install script --- install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/install.sh b/install.sh index 7bb0b9604..8c866ea02 100755 --- a/install.sh +++ b/install.sh @@ -132,6 +132,9 @@ done ags_state_dir=~/.local/state/ags +showfun install-uv +v install-uv + 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 From c095395f8f9d1e890eed24511e82110cb00a09e8 Mon Sep 17 00:00:00 2001 From: Zeyad Moustafa Kamal Date: Tue, 4 Feb 2025 15:45:48 +0200 Subject: [PATCH 12/12] add illogical impulse python --- arch-packages/illogical-impulse-python/PKGBUILD | 15 +++++++++++++++ install.sh | 2 +- scriptdata/dependencies.conf | 8 -------- 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 arch-packages/illogical-impulse-python/PKGBUILD diff --git a/arch-packages/illogical-impulse-python/PKGBUILD b/arch-packages/illogical-impulse-python/PKGBUILD new file mode 100644 index 000000000..588c6ca46 --- /dev/null +++ b/arch-packages/illogical-impulse-python/PKGBUILD @@ -0,0 +1,15 @@ +pkgname=illogical-impulse-python +pkgver=1.1 +pkgrel=1 +pkgdesc='Illogical Impulse Python Dependencies' +arch=(any) +license=(None) +depends=( + gtk4 + libadwaita + libsoup3 + libportal-gtk4 + blueprint-compiler + gobject-introspection + sassc +) diff --git a/install.sh b/install.sh index 8c866ea02..6753b0a80 100755 --- a/install.sh +++ b/install.sh @@ -116,7 +116,7 @@ install-local-pkgbuild() { } # Install core dependencies from the meta-packages -metapkgs=(./arch-packages/illogical-impulse-{audio,backlight,basic,fonts-themes,gnome,gtk,portal,screencapture,widgets}) +metapkgs=(./arch-packages/illogical-impulse-{audio,python,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) diff --git a/scriptdata/dependencies.conf b/scriptdata/dependencies.conf index 10742601b..de16fe7ed 100644 --- a/scriptdata/dependencies.conf +++ b/scriptdata/dependencies.conf @@ -3,11 +3,3 @@ ### 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. - -gtk4 -libadwaita -libsoup3 -libportal-gtk4 -blueprint-compiler -gobject-introspection -sassc