From 8edffde81bf151d0ddb0f50d6547564355cc3f29 Mon Sep 17 00:00:00 2001 From: "Sicelo A. Mhlongo" Date: Sat, 1 Feb 2025 01:44:33 +0200 Subject: [PATCH] main/postmarketos-ui-i3wm: include config from /etc/xdg (MR 6123) Device packages should use /etc/xdg/i3/config to provide customized configurations for i3wm --- main/postmarketos-ui-i3wm/APKBUILD | 4 ++-- main/postmarketos-ui-i3wm/i3wm-pmos | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/main/postmarketos-ui-i3wm/APKBUILD b/main/postmarketos-ui-i3wm/APKBUILD index 45c73a59f..124bf68d9 100644 --- a/main/postmarketos-ui-i3wm/APKBUILD +++ b/main/postmarketos-ui-i3wm/APKBUILD @@ -1,7 +1,7 @@ # Reference: https://postmarketos.org/uipkg # Maintainer: fossdd pkgname=postmarketos-ui-i3wm -pkgver=1 +pkgver=2 pkgrel=0 pkgdesc="(X11) Tiling WM (keyboard required)" url="https://i3wm.org" @@ -57,6 +57,6 @@ openrc() { } sha512sums=" -6ced3726dff7138af7739b15433e06b09876e2c8ad7ecb33d4990a0ed15181b79622117c818ce1cce9ae595c1c2766c9623dbd3ec365b081cf348e49f783cc10 i3wm-pmos 5160619693a52a1e5d62008abb0b756efb072368120dc72a0d598083aa291fd50d39abc40465950193782467d6a7f80be9934cd058f81596038336fa07e90206 i3-exec +0a4c8cc279b065e83810107bc09450f6c543937162fe1a9c76fc8a5dd550c2ad599346d3de188b17e8e7e297381d0aff3bf96cbe153a38cfd3fca5af83b13a99 i3wm-pmos " diff --git a/main/postmarketos-ui-i3wm/i3wm-pmos b/main/postmarketos-ui-i3wm/i3wm-pmos index 79e0bf069..3f52a2384 100644 --- a/main/postmarketos-ui-i3wm/i3wm-pmos +++ b/main/postmarketos-ui-i3wm/i3wm-pmos @@ -1,8 +1,10 @@ # This config is primarily to support setting a common wallpaper for pmOS UIs. -# General i3 configuration should still be done in ~/.config/i3/ or /etc/i3/ +# General i3 configuration should still be done in ~/.config/i3/ exec --no-startup-id feh --no-fehbg --bg-fill /usr/share/wallpapers/postmarketos.jpg -# Include the user's customized config , if it exists +# Include configuration from $HOME and /etc/xdg. Device packages that need to +# ship a custom config should use /etc/xdg include $HOME/.config/i3/config -# If user config is not available, run the config wizard. This is effectively -# a noop if the config is available +include /etc/xdg/i3/config +# If a config is not available in $HOME, run the config wizard. This is a noop +# if the config exists exec --no-startup-id i3-config-wizard