diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 8815809..7e3b360 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -65,40 +65,6 @@ jobs: artifactErrorsFailBuild: true body: Release notes not generated yet. - aur-update: - name: Update AUR pkgs - runs-on: ubuntu-24.04 - container: archlinux:latest - permissions: write-all - needs: [ release-checks, release ] - steps: - - run: pacman -Sy --noconfirm git github-cli base-devel pacman-contrib - - uses: actions/checkout@v4 - - - run: | - chage -E -1 nobody - passwd -u nobody - - cd "assets/pkg/aur" - chown nobody:nobody . -R - su - -s /bin/bash nobody -c "$PWD/update-pkgs.sh ${{ needs.release-checks.outputs.VERSION }}" - su - -s /bin/bash nobody -c "$PWD/test-makepkg.sh" # This will also update -git pkgver - chown $UID:$(id -g) . -R - - - run: | - BRANCH=actions/update-aur-${{ needs.release-checks.outputs.VERSION }} - git config --global --add safe.directory $GITHUB_WORKSPACE - git config user.name "GitHub Actions" - git config user.email "actions@github.com" - git checkout -b $BRANCH - git commit -am "Update AUR pkgs to v${{ needs.release-checks.outputs.VERSION }}" - git push -u origin $BRANCH - gh pr create --head $BRANCH \ - --title "[AUR update]: Bump to ${{ needs.release-checks.outputs.VERSION }}" \ - --body "*This PR was created automatically*" - env: - GH_TOKEN: ${{ github.token }} - nix-update: name: Update NixOS module runs-on: ubuntu-24.04 diff --git a/assets/pkg/aur/.gitignore b/assets/pkg/aur/.gitignore deleted file mode 100644 index f6d37f6..0000000 --- a/assets/pkg/aur/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*/* -!*/.gitignore -!*/PKGBUILD -!*/.SRCINFO diff --git a/assets/pkg/aur/README.md b/assets/pkg/aur/README.md deleted file mode 100644 index 637a1fa..0000000 --- a/assets/pkg/aur/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# AUR Packages - -These files are just for reference, I'll manually edit and publish them, at least until I automate it with github actions (like updating version automatically on a release). - -There are three packages that follow standard conventions: - -- [`lidm`](https://aur.archlinux.org/packages/lidm): Builds latest release (manually updated per release basis) -- [`lidm-bin`](https://aur.archlinux.org/packages/lidm-bin): Fetches latest release binary (compiled by GitHub Actions, also updated per release) -- [`lidm-git`](https://aur.archlinux.org/packages/lidm-git): Fetches latest commit and builds it (should be updated automatically) - -> \[!IMPORTANT] -> None of those packages include the service files. [You have to do this yourself](../../services/README.md). diff --git a/assets/pkg/aur/lidm-bin/.SRCINFO b/assets/pkg/aur/lidm-bin/.SRCINFO deleted file mode 100644 index 5900dff..0000000 --- a/assets/pkg/aur/lidm-bin/.SRCINFO +++ /dev/null @@ -1,33 +0,0 @@ -pkgbase = lidm-bin - pkgdesc = A fully colorful customizable TUI display manager made in C. (release binary) - pkgver = 1.2.3 - pkgrel = 4 - url = https://github.com/javalsai/lidm - arch = x86_64 - arch = i686 - arch = aarch64 - arch = armv7h - arch = riscv64 - license = GPL-3.0-only - depends = libpam.so - depends = lidm-service - provides = lidm - conflicts = lidm - source = lidm-default-theme-1.2.3.ini::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/themes/default.ini - source = lidm-1.2.3.1::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/man/lidm.1 - source = lidm-config-1.2.3.5::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/man/lidm-config.5 - sha256sums = ffaa5fe2cf5011bf53c90f81bfec8585158d35f72c0666db0bd4d3866ae041ca - sha256sums = 7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8 - sha256sums = 0aa5755bdcc60ea80cd9ee0f89233ffaf22c6cee9db9da277274a62c6ed477d9 - source_x86_64 = lidm-1.2.3-x86_64::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-amd64 - sha256sums_x86_64 = a533b5aee3ffe04268f8d3ff8d7eb87f09d31fbe25e1b8b1ed29c42ef465bd4b - source_i686 = lidm-1.2.3-i686::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-i386 - sha256sums_i686 = 75018578e68bffda9807de8a65e16eaed8a16c6cf2417a0b58c5d5bcfa603e45 - source_aarch64 = lidm-1.2.3-aarch64::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-aarch64 - sha256sums_aarch64 = 1b81a1537a1e31ca1902cbc3b60add4ac712aa64fd4d266685f53372cc365882 - source_armv7h = lidm-1.2.3-armv7h::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-armv7 - sha256sums_armv7h = e86f59509fe2366d6312b9bc9e8d89c14e9c049fd713a04c41dab49a848b1ada - source_riscv64 = lidm-1.2.3-riscv64::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-riscv64 - sha256sums_riscv64 = 3f0eb0315c523d367bac332641e5cd3c86cfd9aa4e7c14b2efc036937b97a598 - -pkgname = lidm-bin diff --git a/assets/pkg/aur/lidm-bin/.gitignore b/assets/pkg/aur/lidm-bin/.gitignore deleted file mode 100644 index 1d65adf..0000000 --- a/assets/pkg/aur/lidm-bin/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!PKGBUILD -!.SRCINFO diff --git a/assets/pkg/aur/lidm-bin/PKGBUILD b/assets/pkg/aur/lidm-bin/PKGBUILD deleted file mode 100644 index d69fa06..0000000 --- a/assets/pkg/aur/lidm-bin/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# shellcheck disable=SC2034,SC2154,SC2164 -# Maintainer: javalsai -pkgname=lidm-bin -pkgver=1.2.3 -pkgrel=4 -depends=('libpam.so' 'lidm-service') -pkgdesc="A fully colorful customizable TUI display manager made in C. (release binary)" -arch=('x86_64' 'i686' 'aarch64' 'armv7h' 'riscv64') -url="https://github.com/javalsai/lidm" -license=('GPL-3.0-only') -provides=('lidm') -conflicts=('lidm') -source=( - "lidm-default-theme-${pkgver}.ini::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/themes/default.ini" - "lidm-${pkgver}.1::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm.1" - "lidm-config-${pkgver}.5::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm-config.5" -) -source_x86_64=("lidm-${pkgver}-x86_64::$url/releases/download/v$pkgver/lidm-amd64") -source_i686=("lidm-${pkgver}-i686::$url/releases/download/v$pkgver/lidm-i386") -source_aarch64=("lidm-${pkgver}-aarch64::$url/releases/download/v$pkgver/lidm-aarch64") -source_armv7h=("lidm-${pkgver}-armv7h::$url/releases/download/v$pkgver/lidm-armv7") -source_riscv64=("lidm-${pkgver}-riscv64::$url/releases/download/v$pkgver/lidm-riscv64") -sha256sums=('ffaa5fe2cf5011bf53c90f81bfec8585158d35f72c0666db0bd4d3866ae041ca' - '7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8' - '0aa5755bdcc60ea80cd9ee0f89233ffaf22c6cee9db9da277274a62c6ed477d9') -sha256sums_x86_64=('a533b5aee3ffe04268f8d3ff8d7eb87f09d31fbe25e1b8b1ed29c42ef465bd4b') -sha256sums_i686=('75018578e68bffda9807de8a65e16eaed8a16c6cf2417a0b58c5d5bcfa603e45') -sha256sums_aarch64=('1b81a1537a1e31ca1902cbc3b60add4ac712aa64fd4d266685f53372cc365882') -sha256sums_armv7h=('e86f59509fe2366d6312b9bc9e8d89c14e9c049fd713a04c41dab49a848b1ada') -sha256sums_riscv64=('3f0eb0315c523d367bac332641e5cd3c86cfd9aa4e7c14b2efc036937b97a598') - -package() { - cd "$srcdir" - - install -Dm755 "lidm-${pkgver}-$CARCH" "${pkgdir}/usr/bin/lidm" - install -Dm644 "lidm-default-theme-${pkgver}.ini" "${pkgdir}/etc/lidm.ini" - install -Dm644 "lidm-${pkgver}.1" "${pkgdir}/usr/share/man/man1/lidm.1" - install -Dm644 "lidm-config-${pkgver}.5" "${pkgdir}/usr/share/man/man5/lidm-config.5" -} diff --git a/assets/pkg/aur/lidm-dinit/.SRCINFO b/assets/pkg/aur/lidm-dinit/.SRCINFO deleted file mode 100644 index 8831cc8..0000000 --- a/assets/pkg/aur/lidm-dinit/.SRCINFO +++ /dev/null @@ -1,12 +0,0 @@ -pkgbase = lidm-dinit - pkgdesc = A fully colorful customizable TUI display manager made in C. (dinit service files) - pkgver = 1.2.3 - pkgrel = 1 - url = https://github.com/javalsai/lidm - arch = any - license = GPL-3.0-only - provides = lidm-service - source = lidm-dinit-1.2.3-dinit::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/services/dinit - sha256sums = 185cd76c1d29ddc73cf96be999f13278a427bb80aa9169f25f30673ad2de3770 - -pkgname = lidm-dinit diff --git a/assets/pkg/aur/lidm-dinit/.gitignore b/assets/pkg/aur/lidm-dinit/.gitignore deleted file mode 100644 index 1d65adf..0000000 --- a/assets/pkg/aur/lidm-dinit/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!PKGBUILD -!.SRCINFO diff --git a/assets/pkg/aur/lidm-dinit/PKGBUILD b/assets/pkg/aur/lidm-dinit/PKGBUILD deleted file mode 100644 index 06f0771..0000000 --- a/assets/pkg/aur/lidm-dinit/PKGBUILD +++ /dev/null @@ -1,17 +0,0 @@ -# shellcheck disable=SC2034,SC2154,SC2164 -# Maintainer: javalsai -pkgname=lidm-dinit -pkgver=1.2.3 -pkgrel=1 -pkgdesc="A fully colorful customizable TUI display manager made in C. (dinit service files)" -provides=('lidm-service') -arch=('any') -url="https://github.com/javalsai/lidm" -license=('GPL-3.0-only') -source=("${pkgname}-${pkgver}-dinit::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/services/dinit") -sha256sums=('185cd76c1d29ddc73cf96be999f13278a427bb80aa9169f25f30673ad2de3770') - -package() { - cd "$srcdir" - install -Dm0644 "${pkgname}-${pkgver}-dinit" "$pkgdir/etc/dinit.d/lidm" -} diff --git a/assets/pkg/aur/lidm-git/.SRCINFO b/assets/pkg/aur/lidm-git/.SRCINFO deleted file mode 100644 index c52fcd7..0000000 --- a/assets/pkg/aur/lidm-git/.SRCINFO +++ /dev/null @@ -1,16 +0,0 @@ -pkgbase = lidm-git - pkgdesc = A fully colorful customizable TUI display manager made in C. (last git commit) - pkgver = 1.2.3.r12.g7e7a297 - pkgrel = 1 - url = https://github.com/javalsai/lidm - arch = any - license = GPL-3.0-only - makedepends = git - depends = pam - depends = lidm-service - provides = lidm - conflicts = lidm - source = lidm::git+https://github.com/javalsai/lidm - sha256sums = SKIP - -pkgname = lidm-git diff --git a/assets/pkg/aur/lidm-git/.gitignore b/assets/pkg/aur/lidm-git/.gitignore deleted file mode 100644 index 1d65adf..0000000 --- a/assets/pkg/aur/lidm-git/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!PKGBUILD -!.SRCINFO diff --git a/assets/pkg/aur/lidm-git/PKGBUILD b/assets/pkg/aur/lidm-git/PKGBUILD deleted file mode 100644 index bb67661..0000000 --- a/assets/pkg/aur/lidm-git/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# shellcheck disable=SC2034,SC2154,SC2164 -# Maintainer: javalsai -pkgname=lidm-git -pkgver=1.2.3.r13.g9cf5297 -pkgrel=1 -depends=('pam' 'lidm-service') -makedepends=('git') -pkgdesc="A fully colorful customizable TUI display manager made in C. (last git commit)" -arch=('any') -url="https://github.com/javalsai/lidm" -license=('GPL-3.0-only') -provides=('lidm') -conflicts=('lidm') -source=("lidm::git+https://github.com/javalsai/lidm") -sha256sums=('SKIP') - -pkgver() { - cd "$srcdir/lidm" - git describe --long --abbrev=7 --tags | \ - sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' -} - -build() { - cd "$srcdir/lidm" - make -} - -package() { - cd "$srcdir/lidm" - make DESTDIR="${pkgdir}" install -} diff --git a/assets/pkg/aur/lidm-systemd/.SRCINFO b/assets/pkg/aur/lidm-systemd/.SRCINFO deleted file mode 100644 index 3a3a0e0..0000000 --- a/assets/pkg/aur/lidm-systemd/.SRCINFO +++ /dev/null @@ -1,12 +0,0 @@ -pkgbase = lidm-systemd - pkgdesc = A fully colorful customizable TUI display manager made in C. (systemd service files) - pkgver = 1.2.3 - pkgrel = 1 - url = https://github.com/javalsai/lidm - arch = any - license = GPL-3.0-only - provides = lidm-service - source = lidm-systemd-1.2.3-systemd::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/services/systemd.service - sha256sums = e63464441a97102194994adc82159871ccd3f23d5e97224f21a460e4296364cc - -pkgname = lidm-systemd diff --git a/assets/pkg/aur/lidm-systemd/.gitignore b/assets/pkg/aur/lidm-systemd/.gitignore deleted file mode 100644 index 1d65adf..0000000 --- a/assets/pkg/aur/lidm-systemd/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!PKGBUILD -!.SRCINFO diff --git a/assets/pkg/aur/lidm-systemd/PKGBUILD b/assets/pkg/aur/lidm-systemd/PKGBUILD deleted file mode 100644 index 1ba2e1b..0000000 --- a/assets/pkg/aur/lidm-systemd/PKGBUILD +++ /dev/null @@ -1,17 +0,0 @@ -# shellcheck disable=SC2034,SC2154,SC2164 -# Maintainer: javalsai -pkgname=lidm-systemd -pkgver=1.2.3 -pkgrel=1 -pkgdesc="A fully colorful customizable TUI display manager made in C. (systemd service files)" -provides=('lidm-service') -arch=('any') -url="https://github.com/javalsai/lidm" -license=('GPL-3.0-only') -source=("${pkgname}-${pkgver}-systemd::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/services/systemd.service") -sha256sums=('e63464441a97102194994adc82159871ccd3f23d5e97224f21a460e4296364cc') - -package() { - cd "$srcdir" - install -Dm0644 "${pkgname}-${pkgver}-systemd" "$pkgdir/usr/lib/systemd/system/lidm.service" -} diff --git a/assets/pkg/aur/lidm/.SRCINFO b/assets/pkg/aur/lidm/.SRCINFO deleted file mode 100644 index a54ca11..0000000 --- a/assets/pkg/aur/lidm/.SRCINFO +++ /dev/null @@ -1,13 +0,0 @@ -pkgbase = lidm - pkgdesc = A fully colorful customizable TUI display manager made in C. (build latest tag) - pkgver = 1.2.3 - pkgrel = 5 - url = https://github.com/javalsai/lidm - arch = any - license = GPL-3.0-only - depends = pam - depends = lidm-service - source = lidm-1.2.3.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.2.3.tar.gz - sha256sums = 1ce414b510c5bbc3e32ea882f915b4d3958cb82eb1fbb5cf33e62f69c844bf93 - -pkgname = lidm diff --git a/assets/pkg/aur/lidm/.gitignore b/assets/pkg/aur/lidm/.gitignore deleted file mode 100644 index 1d65adf..0000000 --- a/assets/pkg/aur/lidm/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!PKGBUILD -!.SRCINFO diff --git a/assets/pkg/aur/lidm/PKGBUILD b/assets/pkg/aur/lidm/PKGBUILD deleted file mode 100644 index fa9bdb2..0000000 --- a/assets/pkg/aur/lidm/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# shellcheck disable=SC2034,SC2154,SC2164 -# Maintainer: javalsai -pkgname=lidm -pkgver=1.2.3 -pkgrel=5 -depends=('pam' 'lidm-service') -makedepends=() -pkgdesc="A fully colorful customizable TUI display manager made in C. (build latest tag)" -arch=('any') -url="https://github.com/javalsai/lidm" -license=('GPL-3.0-only') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz") -sha256sums=('1ce414b510c5bbc3e32ea882f915b4d3958cb82eb1fbb5cf33e62f69c844bf93') - -build() { - make -C "$srcdir/lidm-$pkgver" -} - -package() { - make -C "$srcdir/lidm-$pkgver" DESTDIR="$pkgdir" install -} diff --git a/assets/pkg/aur/make-srcinfo.sh b/assets/pkg/aur/make-srcinfo.sh deleted file mode 100755 index 6739191..0000000 --- a/assets/pkg/aur/make-srcinfo.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -set -e - -MYSELF=$(realpath "$0") -MYDIR=$(dirname "$MYSELF") - -for pkg in "$MYDIR"/*/; do - cd "$pkg" - printf "\x1b[1mEntering '%s'\x1b[0m\n" "$pkg" - makepkg --printsrcinfo | tee .SRCINFO - echo -done diff --git a/assets/pkg/aur/makepkg-clean.sh b/assets/pkg/aur/makepkg-clean.sh deleted file mode 100755 index 5e93671..0000000 --- a/assets/pkg/aur/makepkg-clean.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -set -e - -MYSELF=$(realpath "$0") -MYDIR=$(dirname "$MYSELF") - -cd "$MYDIR" -typeset -a pkgs=(lidm{,-git,-bin,-systemd,-dinit}) - -for pkg in "${pkgs[@]}"; do - printf "\x1b[mEntering '%s'\x1b[0m\n" "$pkg" - cd "$pkg" - # shellcheck disable=SC1091 - source PKGBUILD - # shellcheck disable=SC2154 - for f in "${source[@]}"; do - echo "$f" - awk -F:: '{print $1}' <<<"$f" | xargs rm -rf - done - cd .. - echo -done diff --git a/assets/pkg/aur/test-makepkg.sh b/assets/pkg/aur/test-makepkg.sh deleted file mode 100755 index f9b99f3..0000000 --- a/assets/pkg/aur/test-makepkg.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -set -e - -MYSELF=$(realpath "$0") -MYDIR=$(dirname "$MYSELF") - -cd "$MYDIR" -typeset -a pkgs=(lidm{,-git,-bin,-systemd,-dinit}) - -for pkg in "${pkgs[@]}"; do - printf "\x1b[mEntering '%s'\x1b[0m\n" "$pkg" - cd "$pkg" - makepkg -Cf - cd .. - echo -done - -if [[ -n "${PRINT_TREE:-}" ]]; then - for pkg in "${pkgs[@]}"; do - eza --tree "$pkg/pkg/"* - done -fi diff --git a/assets/pkg/aur/update-pkgs.sh b/assets/pkg/aur/update-pkgs.sh deleted file mode 100755 index 0b4f48a..0000000 --- a/assets/pkg/aur/update-pkgs.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -set -e - -MYSELF=$(realpath "$0") -MYDIR=$(dirname "$MYSELF") - -if [ -z "$1" ]; then - printf "\x1b[1;31mERR: No version to update provided\x1b[0m\n" >&2 - exit 1; -fi -version="$1" -printf "\x1b[34mINF: Using '%s' version\x1b[0m\n" "$version" - -for pkg in "$MYDIR"/lidm{,-bin,-systemd,-dinit}/; do - cd "$pkg" - printf "\x1b[1mEntering '%s'\x1b[0m\n" "$pkg" - sed -i "s/pkgver=.*/pkgver=$1/" PKGBUILD - sed -i "s/pkgrel=.*/pkgrel=1/" PKGBUILD - - updpkgsums - makepkg --printsrcinfo | tee .SRCINFO - echo -done diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 79e1320..d958464 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -81,9 +81,6 @@ or try it out without installing by: nix run github:javalsai/lidm ``` -> [!CAUTION] -> This doesn't include [service files](../assets/pkg/aur#services) - ## Nix Module
@@ -134,9 +131,6 @@ with config.lidm.keysEnum; { > _it's not necessary to cover all keys and anything can be put there, even if it's not valid config_ -> [!NOTE] -> [service files](../assets/pkg/aur#services) **are** included and enabled - # Installing from Source Firstly, you'll need to build the package, this also includes man pages, default config, themes and other files you might need.