From 20c762b1ae4ad779db3f4feba7cd45038350f49e Mon Sep 17 00:00:00 2001 From: David Thurstenson Date: Thu, 10 Sep 2020 20:01:29 -0500 Subject: [PATCH] Changed wallpapers dir to system standard where other packages dump their backgrounds --- PKGBUILD | 9 ++++----- sway-wlgreet.conf | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 5518492..2a462a4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,12 +1,13 @@ # Maintainer: David Thurstenson pkgname=greetd-tlgreet -pkgver=0.2 -pkgrel=2 +pkgver=0.3 +pkgrel=1 pkgdesc="Thurstylark's greetd + wlgreet setup" arch=(any) url="https://git.thurstylark.com/greetd-tlgreet.git/" license=('GPL') depends=(greetd greetd-wlgreet sway waybar) +optdepends=(tl-wallpaper archlinux-wallpaper) source=("greetd.toml" "sway-wlgreet.conf" "wlgreet.toml" @@ -14,7 +15,7 @@ source=("greetd.toml" "waybar.css" "greetd.service.override.conf") md5sums=('db675a996223c3f155885d7494b16282' - '947b0d773955b10946d4da82d74f0fc4' + '00f6fd55e5ddb9dd2f4a24d7a0b64a34' '4c1b6e5dff4071bff81e935322743974' 'bfdda1ad67829fd55d3612c857df18dc' '0b3156d2868912d8b4141428b72b4bbe' @@ -32,6 +33,4 @@ package() { do install -Dm644 ${srcdir}/${i} ${pkgdir}/etc/greetd/tlgreet/${i} done - - install -dm755 ${pkgdir}/etc/greetd/tlgreet/wallpapers/ } diff --git a/sway-wlgreet.conf b/sway-wlgreet.conf index ef3a66e..826d2a3 100644 --- a/sway-wlgreet.conf +++ b/sway-wlgreet.conf @@ -9,7 +9,7 @@ # # Wallpapers dir -set $wallpapers-path /etc/greetd/tlgreet/wallpapers/ +set $wallpapers-path /usr/share/backgrounds/ # Fallback color if no wallpapers exist set $fallback-color "#333333" @@ -37,7 +37,7 @@ set $waybar-css /etc/greetd/tlgreet/waybar.css # # Set the wallpaper to a random file in the wallpapers dir -output * bg `find $wallpapers-path -type f | shuf -n 1` fill $fallback-color +output * bg `find $wallpapers-path -type f -name *.jpg | shuf -n 1` fill $fallback-color # Touchpad options input $touchpad {