From e8aa344976c42389c58f4f7703a4348ff3b10d6b Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Fri, 30 May 2025 17:28:18 +0200 Subject: [PATCH] nuke ags dependencies --- arch-packages/illogical-impulse-ags/.SRCINFO | 36 ---- .../illogical-impulse-ags/.gitignore | 2 - arch-packages/illogical-impulse-ags/PKGBUILD | 49 ----- .../illogical-impulse-agsv1/.gitignore | 2 - .../illogical-impulse-agsv1/PKGBUILD | 184 ------------------ .../illogical-impulse-audio/PKGBUILD | 1 - .../illogical-impulse-backlight/PKGBUILD | 2 + .../illogical-impulse-basic/PKGBUILD | 1 - .../illogical-impulse-widgets/PKGBUILD | 1 + 9 files changed, 3 insertions(+), 275 deletions(-) delete mode 100644 arch-packages/illogical-impulse-ags/.SRCINFO delete mode 100644 arch-packages/illogical-impulse-ags/.gitignore delete mode 100644 arch-packages/illogical-impulse-ags/PKGBUILD delete mode 100644 arch-packages/illogical-impulse-agsv1/.gitignore delete mode 100644 arch-packages/illogical-impulse-agsv1/PKGBUILD diff --git a/arch-packages/illogical-impulse-ags/.SRCINFO b/arch-packages/illogical-impulse-ags/.SRCINFO deleted file mode 100644 index 8a36546b2..000000000 --- a/arch-packages/illogical-impulse-ags/.SRCINFO +++ /dev/null @@ -1,36 +0,0 @@ -pkgbase = ii-aylurs-gtk-shell-git - pkgdesc = Aylurs's Gtk Shell (AGS), version fixed for illogical-impulse dotfiles - pkgver = 1.8.2.r2.g1115022 - pkgrel = 1 - url = https://github.com/Aylur/ags - arch = x86_64 - license = GPL3 - makedepends = git - makedepends = gobject-introspection - makedepends = meson - makedepends = npm - makedepends = typescript - depends = gjs - depends = glib2 - depends = glib2-devel - depends = glibc - depends = gtk3 - depends = gtk-layer-shell - depends = libpulse - depends = pam - optdepends = gnome-bluetooth-3.0: required for bluetooth service - optdepends = greetd: required for greetd service - optdepends = libdbusmenu-gtk3: required for systemtray service - optdepends = libsoup3: required for the Utils.fetch feature - optdepends = libnotify: required for sending notifications - optdepends = networkmanager: required for network service - optdepends = power-profiles-daemon: required for powerprofiles service - optdepends = upower: required for battery service - conflicts = aylurs-gtk-shell - backup = etc/pam.d/ags - source = git+https://github.com/Aylur/ags - source = git+https://gitlab.gnome.org/GNOME/libgnome-volume-control - sha256sums = SKIP - sha256sums = SKIP - -pkgname = aylurs-gtk-shell-git diff --git a/arch-packages/illogical-impulse-ags/.gitignore b/arch-packages/illogical-impulse-ags/.gitignore deleted file mode 100644 index 02b391b25..000000000 --- a/arch-packages/illogical-impulse-ags/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/ags/ -/libgnome-volume-control/ diff --git a/arch-packages/illogical-impulse-ags/PKGBUILD b/arch-packages/illogical-impulse-ags/PKGBUILD deleted file mode 100644 index 689dacc1d..000000000 --- a/arch-packages/illogical-impulse-ags/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Modified from AUR package "aylurs-gtk-shell-git" maintained by kotontrion -pkgname=illogical-impulse-ags -_pkgname=ags -pkgver=r525.05e0f23 -pkgrel=3 -pkgdesc="Aylurs's Gtk Shell (AGS), version fixed for illogical-impulse dotfiles." -arch=('x86_64') -url="https://github.com/Aylur/ags" -license=('GPL3') -makedepends=('git' 'gobject-introspection' 'meson' 'npm' 'typescript') -depends=('gvfs' 'gjs' 'glib2' 'glib2-devel' 'glibc' 'gtk3' 'gtk-layer-shell' 'libpulse' 'pam' 'gnome-bluetooth-3.0' 'gammastep') -optdepends=('greetd: required for greetd service' - 'libdbusmenu-gtk3: required for systemtray service' - 'libsoup3: required for the Utils.fetch feature' - 'libnotify: required for sending notifications' - 'networkmanager: required for network service' - 'power-profiles-daemon: required for powerprofiles service' - 'upower: required for battery service') -conflicts=('aylurs-gtk-shell' 'aylurs-gtk-shell-git') -backup=('etc/pam.d/ags') -source=("git+${url}.git#commit=05e0f23534fa30c1db2a142664ee8f71e38db260" - "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control") -sha256sums=('SKIP' - 'SKIP') - -pkgver(){ - cd $srcdir/$_pkgname - printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -} - -prepare() { - cd $srcdir/$_pkgname - git submodule init - git config submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control" - git -c protocol.file.allow=always submodule update -} - -build() { - cd $srcdir/$_pkgname - npm install - arch-meson build --libdir "lib/$_pkgname" -Dbuild_types=true - meson compile -C build -} - -package() { - cd $srcdir/$_pkgname - meson install -C build --destdir "$pkgdir" - ln -sf /usr/share/com.github.Aylur.ags/com.github.Aylur.ags ${pkgdir}/usr/bin/ags -} diff --git a/arch-packages/illogical-impulse-agsv1/.gitignore b/arch-packages/illogical-impulse-agsv1/.gitignore deleted file mode 100644 index 02b391b25..000000000 --- a/arch-packages/illogical-impulse-agsv1/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/ags/ -/libgnome-volume-control/ diff --git a/arch-packages/illogical-impulse-agsv1/PKGBUILD b/arch-packages/illogical-impulse-agsv1/PKGBUILD deleted file mode 100644 index 8728adaba..000000000 --- a/arch-packages/illogical-impulse-agsv1/PKGBUILD +++ /dev/null @@ -1,184 +0,0 @@ -# Borrowed from https://github.com/kotontrion/PKGBUILDS/blob/main/agsv1/PKGBUILD -# -# Maintainer: kotontrion - -# This package is only intended to be used while migrating from ags v1.8.2 to ags v2.0.0. -# Many ags configs are quite big and it takes a while to migrate, therefore I made this package -# to install ags v1.8.2 as "agsv1", so both versions can be installed at the same time, making it -# possible to migrate bit by bit while still having a working v1 config around. -# -# First update the aylurs-gtk-shell package to v2, then install this one. -# -# This package won't receive any updates anymore, so as soon as you migrated, uninstall this one. - -pkgname=illogical-impulse-agsv1 -_pkgname=ags -pkgver=1.9.0 -pkgrel=1 -pkgdesc="Aylurs's Gtk Shell (AGS), An eww inspired gtk widget system." -arch=('x86_64') -url="https://github.com/Aylur/ags" -license=('GPL-3.0-only') -makedepends=('git' 'gobject-introspection' 'meson' 'glib2-devel' 'npm' 'typescript') -depends=('gvfs' 'gjs' 'glib2' 'glib2-devel' 'glibc' 'gtk3' 'gtk-layer-shell' 'libpulse' 'pam' 'gnome-bluetooth-3.0' 'gammastep') -optdepends=('gnome-bluetooth-3.0: required for bluetooth service' - 'greetd: required for greetd service' - 'libdbusmenu-gtk3: required for systemtray service' - 'libsoup3: required for the Utils.fetch feature' - 'libnotify: required for sending notifications' - 'networkmanager: required for network service' - 'power-profiles-daemon: required for powerprofiles service' - 'upower: required for battery service') -conflicts=('illogical-impulse-ags') -backup=('etc/pam.d/ags') -source=("$pkgname-$pkgver.tar.gz::https://github.com/Aylur/ags/archive/refs/tags/v${pkgver}.tar.gz" - "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control") -sha256sums=('962f99dcf202eef30e978d1daedc7cdf213e07a3b52413c1fb7b54abc7bd08e6' - SKIP) - -prepare() { - cd "$srcdir/$_pkgname-$pkgver" - mv -T "$srcdir"/libgnome-volume-control subprojects/gvc - - # Overwrite greetd.ts with fixed version - cat > src/service/greetd.ts << 'EOF' -import App from '../app.js'; -import Service from '../service.js'; -import GLib from 'gi://GLib'; -import Gio from 'gi://Gio'; - -Gio._promisify(Gio.InputStream.prototype, 'read_bytes_async'); -const SOCK = GLib.getenv('GREETD_SOCK'); - -type Request = { - create_session: { - username: string - } - post_auth_message_response: { - response?: string - } - start_session: { - cmd: string[] - env: string[] - } - cancel_session: Record -} - -type Response = { - type: 'success' -} | { - type: 'error' - error_type: 'auth_error' | 'error' - description: string -} | { - type: 'auth_message' - auth_message_type: 'visible' | 'secret' | 'info' | 'error' - auth_message: string -} - -export class Greetd extends Service { - static { Service.register(this); } - - private _decoder = new TextDecoder; - - readonly login = async ( - username: string, - password: string, - cmd: string[] | string, - env: string[] = [], - ) => { - const session = await this.createSession(username); - if (session.type !== 'auth_message') { - this.cancelSession(); - throw session; - } - - const auth = await this.postAuth(password); - if (auth.type !== 'success') { - this.cancelSession(); - throw auth; - } - - const start = await this.startSession(cmd, env); - if (start.type !== 'success') { - this.cancelSession(); - throw start; - } - - App.quit(); - }; - - readonly createSession = (username: string) => { - return this._send('create_session', { username }); - }; - - readonly postAuth = (response?: string) => { - return this._send('post_auth_message_response', { response }); - }; - - readonly startSession = (cmd: string[] | string, env: string[] = []) => { - const cmdv = Array.isArray(cmd) - ? cmd - : GLib.shell_parse_argv(cmd)[1]; - - return this._send('start_session', { cmd: cmdv, env }); - }; - - readonly cancelSession = () => { - return this._send('cancel_session', {}); - }; - - private async _send(req: R, payload: Request[R]): Promise { - const connection = new Gio.SocketClient() - .connect(new Gio.UnixSocketAddress({ path: SOCK }), null); - - try { - const json = JSON.stringify({ type: req, ...payload }); - const ostream = new Gio.DataOutputStream({ - close_base_stream: true, - base_stream: connection.get_output_stream(), - byte_order: Gio.DataStreamByteOrder.HOST_ENDIAN, - }); - - const istream = connection.get_input_stream(); - - ostream.put_int32(json.length, null); - ostream.put_string(json, null); - - const data = await istream.read_bytes_async(4, GLib.PRIORITY_DEFAULT, null); - const raw = data.get_data(); - if (!raw) throw new Error("Failed to read length from greetd socket"); - const view = new DataView(raw.buffer, raw.byteOffset, raw.byteLength); - const length = view.getUint32(0, true); // true = little endian - - const res = await istream.read_bytes_async(length, GLib.PRIORITY_DEFAULT, null); - const resRaw = res.get_data(); - if (!resRaw) throw new Error("Failed to read response from greetd socket"); - - return JSON.parse(this._decoder.decode(resRaw)) as Response; - } finally { - connection.close(null); - } -} - -} - -export const greetd = new Greetd; -export default greetd; -EOF -} - - -build() { - cd "$srcdir/$_pkgname-$pkgver" - npm install - arch-meson build --libdir "lib/$_pkgname" -Dbuild_types=true - meson compile -C build -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - meson install -C build --destdir "$pkgdir" - rm ${pkgdir}/usr/bin/ags - ln -sf /usr/share/com.github.Aylur.ags/com.github.Aylur.ags ${pkgdir}/usr/bin/agsv1 -} diff --git a/arch-packages/illogical-impulse-audio/PKGBUILD b/arch-packages/illogical-impulse-audio/PKGBUILD index 7f43e5ef4..81054e0b7 100644 --- a/arch-packages/illogical-impulse-audio/PKGBUILD +++ b/arch-packages/illogical-impulse-audio/PKGBUILD @@ -9,6 +9,5 @@ depends=( wireplumber libdbusmenu-gtk3 playerctl - swww ) diff --git a/arch-packages/illogical-impulse-backlight/PKGBUILD b/arch-packages/illogical-impulse-backlight/PKGBUILD index fe216262c..2525be9d4 100644 --- a/arch-packages/illogical-impulse-backlight/PKGBUILD +++ b/arch-packages/illogical-impulse-backlight/PKGBUILD @@ -5,6 +5,8 @@ pkgdesc='Illogical Impulse Backlight Dependencies' arch=(any) license=(None) depends=( + gammastep + geoclue brightnessctl ddcutil ) diff --git a/arch-packages/illogical-impulse-basic/PKGBUILD b/arch-packages/illogical-impulse-basic/PKGBUILD index f548174e5..c338727f9 100644 --- a/arch-packages/illogical-impulse-basic/PKGBUILD +++ b/arch-packages/illogical-impulse-basic/PKGBUILD @@ -15,7 +15,6 @@ depends=( wget ripgrep jq - npm meson xdg-user-dirs ) diff --git a/arch-packages/illogical-impulse-widgets/PKGBUILD b/arch-packages/illogical-impulse-widgets/PKGBUILD index 48be0e88a..435bf3f74 100644 --- a/arch-packages/illogical-impulse-widgets/PKGBUILD +++ b/arch-packages/illogical-impulse-widgets/PKGBUILD @@ -12,5 +12,6 @@ depends=( hyprpicker nm-connection-editor quickshell + swww wlogout )