device/community/device-google-sargo/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
 pkgver=6
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -28,10 +28,7 @@ source="
 	no-hexagonrpcd-on-suspend.sh
 	q6voiced.conf
 "
-subpackages="
-	$pkgname-camera
-	$pkgname-nonfree-firmware:nonfree_firmware
-	"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -46,12 +43,6 @@ package() {
 		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr-msm.conf
 }
 
-camera() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
-	depends="snapshot"
-	mkdir -p "$subpkgdir"
-}
-
 nonfree_firmware() {
 	pkgdesc="Proprietary firmware blobs for the Google Pixel 3a"
 	replaces="hexagonrpcd-openrc"

device/community/device-xiaomi-scorpio/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=12
+pkgrel=13
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,6 +12,7 @@ options="!check !archcheck"
 depends="
 	linux-postmarketos-qcom-msm8996
 	mesa-egl
+	megapixels
 	mkbootimg
 	postmarketos-base
 	soc-qcom-msm8996
@@ -19,7 +20,6 @@ depends="
 	"
 makedepends="devicepkg-dev"
 subpackages="
-	$pkgname-camera
 	$pkgname-phosh
 	$pkgname-nonfree-firmware:nonfree_firmware
 	"
@@ -68,11 +68,6 @@ phosh() {
 		"$subpkgdir"/etc/phosh/phoc.ini
 }
 
-camera() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
-	depends="megapixels"
-	mkdir -p "$subpkgdir"
-}
 
 sha512sums="
 b033e7357c4ef91ba84f6f715e96e67637c2631d4746402f8a92333ba8974bbee7736a7bc081b0f84a84dc5b555a7db4dbb4f14f628bbfc42cbfa501c4f0ed36  30-gpu-firmware.files

device/main/device-pine64-pinephone/APKBUILD

@@ -3,14 +3,13 @@
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
 pkgver=4
-pkgrel=2
+pkgrel=3
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 subpackages="
-	$pkgname-camera
 	$pkgname-gnome
 	$pkgname-kirigami:kirigami
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -30,6 +29,7 @@ depends="
 	eg25-manager-openrc
 	iw
 	linux-postmarketos-allwinner>=5.14
+	megapixels
 	mesa-egl
 	pinephone-callaudiod
 	postmarketos-base
@@ -181,12 +181,6 @@ openrc() {
 		"$subpkgdir"/usr/lib/udev/rules.d/
 }
 
-camera() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
-	depends="megapixels"
-	mkdir -p "$subpkgdir"
-}
-
 kirigami() {
 	install_if="$pkgname=$pkgver-r$pkgrel kirigami2"
 	install -Dm644 "$srcdir"/kirigami-lowpower.sh "$subpkgdir"/etc/profile.d/kirigami-lowpower.sh

device/main/device-purism-librem5/APKBUILD

@@ -4,7 +4,7 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
 pkgver=4
-pkgrel=1
+pkgrel=2
 _confver=64
 _purismrel=1
 # <librem5-base ver>.<purism release>
@@ -24,6 +24,7 @@ depends="
 	iw
 	linux-purism-librem5>=6.3
 	mesa-egl
+	millipixels
 	postmarketos-base
 	u-boot-librem5
 	u-boot-tools
@@ -52,7 +53,6 @@ source="
 	udev/70-wifi-pm.rules
 "
 subpackages="
-	$pkgname-camera
 	$pkgname-gnome
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-pulseaudio
@@ -66,6 +66,7 @@ subpackages="
 # TODO: remove "replaces" when upstream ucm has proper L5 support...
 replaces="alsa-ucm-conf"
 
+
 builddir="$srcdir/librem5-base-pureos-$_purismver"
 
 build() {
@@ -76,18 +77,13 @@ build() {
 gnome() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-base-ui-gnome"
 	depends="
+
 		wys
 	"
 	install -D -m644 "$builddir"/default/org.freedesktop.ModemManager1.pkla \
 		"$subpkgdir"/var/lib/polkit-1/localauthority/10-vendor.d/org.freedesktop.ModemManager1.pkla
 }
 
-camera() {
-	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
-	depends="millipixels"
-	mkdir -p "$subpkgdir"
-}
-
 pulseaudio() {
 	pkgdesc="Pulseaudio support for the Librem 5"
 	install_if="$pkgname pulseaudio"

main/postmarketos-base-ui-gnome-mobile/APKBUILD

 pkgname=postmarketos-base-ui-gnome-mobile
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Meta package for shared configuration for GNOME Mobile and Phosh UIs"
 url="https://postmarketos.org"
 arch="noarch"
@@ -17,7 +17,6 @@ _pmb_recommends="
 	calls
 	chatty
 	mobile-config-firefox
-	postmarketos-default-camera
 	postmarketos-tweaks
 	postmarketos-welcome
 	postprocessd

main/postmarketos-base-ui-gnome/10_postmarketos-green-accent.gschema.override

+[org.gnome.desktop.interface]
+accent-color='green'

main/postmarketos-base-ui-gnome/APKBUILD

 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-base-ui-gnome
-pkgver=3
-pkgrel=13
+pkgver=4
+pkgrel=1
 pkgdesc="Meta package for shared configuration for GNOME-based UIs"
 url="https://postmarketos.org"
 arch="noarch"
@@ -25,6 +25,7 @@ depends="
 	"
 source="
 	00_postmarketos-base-ui-gnome.gschema.override
+	10_postmarketos-green-accent.gschema.override
 	"
 options="!check"
 subpackages="$pkgname-openrc"
@@ -44,8 +45,9 @@ _pmb_recommends="
 	gnome-weather
 	lollypop
 	loupe
-	papers
 	nautilus
+	papers
+	snapshot
 "
 
 package() {
@@ -71,4 +73,5 @@ openrc() {
 
 sha512sums="
 1f68138876f2270943c88fd6f914f156692397a840f4945564cce0ed6e5d56943661fee025e0e4e0881b5df18a4f5f290086eb67be945e59abd5fe4c71cf5e67  00_postmarketos-base-ui-gnome.gschema.override
+ac597d87ab0502a54481d4c0640cba7cd7fbf6380fe429ec85aefa77b796744a64c1b98fb91eb15e4e75b8781fa3c67809803d07bed085b1ff176c5aacbc5090  10_postmarketos-green-accent.gschema.override
 "

main/postmarketos-base-ui-plasma/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-base-ui-plasma
 pkgver=2
-pkgrel=9
+pkgrel=10
 pkgdesc="Meta package for shared configuration for Plasma-based UIs"
 url="https://postmarketos.org"
 arch="noarch !armhf" # armhf is not supported
@@ -35,6 +35,7 @@ _pmb_recommends="
 	kde-gtk-config
 	maliit-keyboard
 	postmarketos-artwork-wallpapers
+	snapshot
 	xdg-user-dirs
 	"
 subpackages="$pkgname-openrc"

main/postmarketos-base-ui/APKBUILD

 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-base-ui
 pkgver=28
-pkgrel=2
+pkgrel=4
 pkgdesc="Meta package for minimal postmarketOS UI base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -42,7 +42,6 @@ subpackages="
 	$pkgname-wifi-wpa_supplicant-openrc:wpa_supplicant_openrc
 	$pkgname-wifi-wpa_supplicant:wpa_supplicant
 	$pkgname-x11
-	postmarketos-default-camera:_default_camera
 	"
 replaces="
 	chrony
@@ -213,12 +212,6 @@ networkmanager() {
 	amove usr/lib/NetworkManager/dispatcher.d/50-dns-filter.sh
 }
 
-_default_camera() {
-	# dummy package for camera app, packages can install_if on this to install
-	# the appropriate camera app for that device/UI
-	mkdir "$subpkgdir"
-}
-
 qt_tweaks() {
 	amove etc/profile.d/qt-mobile-controls.sh
 }
@@ -238,7 +231,7 @@ wpa_supplicant() {
 }
 
 wpa_supplicant_openrc() {
-	install_if="$pkgname-wpa_supplicant=$pkgver-r$pkgrel openrc"
+	install_if="$pkgname-wifi-wpa_supplicant=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 
 	depends="wpa_supplicant-openrc openrc"
@@ -261,7 +254,7 @@ iwd() {
 }
 
 iwd_openrc() {
-	install_if="$pkgname-iwd=$pkgver-r$pkgrel openrc"
+	install_if="$pkgname-wifi-iwd=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 
 	depends="iwd-openrc openrc"

main/postmarketos-dev/APKBUILD

+# Maintainer: Caleb Connolly <caleb@postmarketos.org>
+pkgname=postmarketos-dev
+pkgver=1
+pkgrel=0
+pkgdesc="postmarketOS development tools"
+url="https://postmarketos.org"
+arch="noarch"
+license="MIT"
+options="!check"
+depends="
+	htop
+	coreutils
+	nano
+	psutils
+	iputils
+	alpine-sdk
+	findutils
+	gawk
+	bash
+	bash-completion
+"
+install="$pkgname.post-install $pkgname.post-deinstall"
+
+package() {
+	mkdir -p "$pkgdir/etc/skel"
+	cat > "$pkgdir/etc/skel/.bashrc" <<EOF
+# Just set a nice prompt
+PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
+EOF
+
+	cat > "$pkgdir/etc/skel/.bash_profile" <<EOF
+# Source the users bashrc (global one is sourced by /etc/profile.d/00-bashrc.sh)
+[[ -f ~/.bashrc ]] && . ~/.bashrc
+EOF
+}

main/postmarketos-dev/postmarketos-dev.post-deinstall

+#!/bin/sh
+
+if [ -s /usr/local/bin/vim ]; then
+	rm /usr/local/bin/vim
+fi

main/postmarketos-dev/postmarketos-dev.post-install

+#!/bin/sh
+
+if [ ! -e /usr/local/bin/vim ]; then
+	echo "Installing vim -> neovim symlink..."
+	ln -s /usr/bin/nvim /usr/local/bin/vim
+fi

main/postmarketos-ui-plasma-mobile/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-plasma-mobile
 pkgver=5
-pkgrel=4
+pkgrel=5
 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration)"
 url="https://wiki.postmarketos.org/wiki/Plasma_Mobile"
 arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807
@@ -23,7 +23,6 @@ _pmb_recommends="
 	plasma-dialer
 	plasma-mobile-sounds
 	plasma-phonebook
-	postmarketos-default-camera
 	postprocessd
 	qmlkonsole
 	spacebar

main/postmarketos-ui-sxmo-de-dwm/APKBUILD

@@ -5,7 +5,7 @@
 # Co-Maintainer: Peter John Hartman <peterjohnhartman@gmail.com>
 pkgname=postmarketos-ui-sxmo-de-dwm
 pkgver=1.15.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on dwm"
 url="http://sr.ht/~mil/Sxmo"
 # riscv64: builder currently stuck, libphonenumber needs rebuild
@@ -39,7 +39,6 @@ _pmb_recommends="
 	firefox-esr
 	mobile-config-firefox
 	postmarketos-artwork-wallpapers
-	postmarketos-default-camera
 	ttyescape
 	xcalc
 	"

main/postmarketos-ui-sxmo-de-sway/APKBUILD

@@ -5,7 +5,7 @@
 # Co-Maintainer: Peter John Hartman <peterjohnhartman@gmail.com>
 pkgname=postmarketos-ui-sxmo-de-sway
 pkgver=1.15.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on sway"
 url="http://sr.ht/~mil/Sxmo"
 # riscv64: builder currently stuck, libphonenumber needs rebuild
@@ -44,7 +44,6 @@ _pmb_recommends="
 	imv
 	mobile-config-firefox
 	postmarketos-artwork-wallpapers
-	postmarketos-default-camera
 	postprocessd
 	ttyescape
 	"