separate pkg for chromium and surface repos; updates

build-pkg/pkglist-de-p1st.txt

@@ -1,5 +1,5 @@
-de-p1st-image-width-limit de-p1st-signal-desktop de-p1st-docker de-p1st-zoom de-p1st-rotate de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda
+de-p1st-pacman-repo-chromium de-p1st-pacman-repo-surface de-p1st-image-width-limit de-p1st-signal-desktop de-p1st-docker de-p1st-zoom de-p1st-rotate de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-sddm-autologin-placeholder de-p1st-sddm-autologin-yoda de-p1st-sddm-theme-default de-p1st-sddm-theme-nordic de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo de-p1st-ssh-key-placeholder de-p1st-ssh-key-yoda
-de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh
+de-p1st-pacman de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh
 de-p1st-base
 de-p1st-xfce4
 de-p1st-xfce4-hidpi

pkg/de-p1st-pacman-mirrorlist/PKGBUILD

@@ -4,7 +4,7 @@ _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.9
 pkgrel=1
-pkgdesc="selected Arch Linux mirrors"
+pkgdesc="Selected Arch Linux mirrors"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')

pkg/de-p1st-pacman-repo-chromium/.install

@@ -0,0 +1,21 @@
+## arg 1:  the new package version
+post_install() {
+  # add signing key of home_ungoogled_chromium_Arch mirror
+  curl -s 'https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/x86_64/home_ungoogled_chromium_Arch.key' | sudo pacman-key --add -
+
+  holo apply
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  # add signing key of home_ungoogled_chromium_Arch mirror
+  curl -s 'https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/x86_64/home_ungoogled_chromium_Arch.key' | sudo pacman-key --add -
+
+  holo apply
+}
+
+## arg 1:  the old package version
+post_remove() {
+  holo apply
+}

pkg/de-p1st-pacman-repo-chromium/PKGBUILD

@@ -0,0 +1,24 @@
+# Maintainer: Daniel Langbein <daniel@systemli.org>
+_pkgname=pacman-pkg-chromium
+_reponame=arch
+pkgname="de-p1st-$_pkgname"
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="Enable ungoogled-chromium repo"
+arch=('any')
+url="https://codeberg.org/privacy1st/${_reponame}"
+license=('MIT')
+depends=('pacman' 'holo' 'git' 'base')
+depends+=('curl')  # add signing key of mirror in .install
+makedepends=('git')
+install='.install'
+source=("git+${url}.git")
+sha256sums=('SKIP')
+
+package() {
+  cd "${_reponame}/pkg/${pkgname}"
+
+  install -Dm0644 pacman.d/ungoogled-chromium "$pkgdir"/etc/pacman.d/ungoogled-chromium
+  # 25 to be applied after de-p1st-pacman which is 20
+  install -Dm0544 pacman.conf.holoscript      "$pkgdir"/usr/share/holo/files/25-"$pkgname"/etc/pacman.conf.holoscript
+}

pkg/de-p1st-pacman-repo-chromium/pacman.conf.holoscript

@@ -0,0 +1,10 @@
+#!/bin/sh
+# stdin: default config
+# stdout: modified config
+set -e
+
+cat
+
+# home_ungoogled_chromium_Arch mirror
+printf '\n'
+printf 'Include = /etc/pacman.d/ungoogled-chromium\n'

pkg/de-p1st-pacman-repo-surface/.install

@@ -0,0 +1,21 @@
+## arg 1:  the new package version
+post_install() {
+  # add signing key of linux-surface mirror
+  curl -s 'https://raw.githubusercontent.com/linux-surface/linux-surface/master/pkg/keys/surface.asc' | sudo pacman-key --add -
+
+  holo apply
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  # add signing key of linux-surface mirror
+  curl -s 'https://raw.githubusercontent.com/linux-surface/linux-surface/master/pkg/keys/surface.asc' | sudo pacman-key --add -
+
+  holo apply
+}
+
+## arg 1:  the old package version
+post_remove() {
+  holo apply
+}

pkg/de-p1st-pacman-repo-surface/PKGBUILD

@@ -0,0 +1,24 @@
+# Maintainer: Daniel Langbein <daniel@systemli.org>
+_pkgname=pacman-pkg-surface
+_reponame=arch
+pkgname="de-p1st-$_pkgname"
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="Enable linux-surface repo"
+arch=('any')
+url="https://codeberg.org/privacy1st/${_reponame}"
+license=('MIT')
+depends=('pacman' 'holo' 'git' 'base')
+depends+=('curl')  # add signing key of mirror in .install
+makedepends=('git')
+install='.install'
+source=("git+${url}.git")
+sha256sums=('SKIP')
+
+package() {
+  cd "${_reponame}/pkg/${pkgname}"
+
+  install -Dm0644 pacman.d/linux-surface "$pkgdir"/etc/pacman.d/linux-surface
+  # 25 to be applied after de-p1st-pacman which is 20
+  install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/25-"$pkgname"/etc/pacman.conf.holoscript
+}

pkg/de-p1st-pacman-repo-surface/pacman.conf.holoscript

@@ -0,0 +1,10 @@
+#!/bin/sh
+# stdin: default config
+# stdout: modified config
+set -e
+
+cat
+
+# linux-surface mirror
+printf '\n'
+printf 'Include = /etc/pacman.d/linux-surface\n'

pkg/de-p1st-pacman-repo-surface/pacman.d/linux-surface

@@ -0,0 +1,6 @@
+# In /etc/pacman.conf -> Include = /path/to/this/cfg/file
+# Signing key: https://raw.githubusercontent.com/linux-surface/linux-surface/master/pkg/keys/surface.asc
+
+[linux-surface]
+SigLevel = Required TrustAll
+Server = https://pkg.surfacelinux.com/arch/

pkg/de-p1st-pacman/.install

@@ -1,17 +1,11 @@
 ## arg 1:  the new package version
 post_install() {
-  # add signing key of home_ungoogled_chromium_Arch mirror
-  curl -s 'https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/x86_64/home_ungoogled_chromium_Arch.key' | sudo pacman-key --add -
-
   holo apply
 }
 
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 post_upgrade() {
-  # add signing key of home_ungoogled_chromium_Arch mirror
-  curl -s 'https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/x86_64/home_ungoogled_chromium_Arch.key' | sudo pacman-key --add -
-
   holo apply
 }
 

pkg/de-p1st-pacman/PKGBUILD

@@ -2,16 +2,15 @@
 _pkgname=pacman
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.2.2
+pkgver=0.2.3
-pkgrel=3
+pkgrel=1
 pkgdesc="pacman with configuration"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 depends=('pacman' 'holo' 'git' 'base')
-depends+=('curl')  # add signing key of mirror in .install
 makedepends=('git')
-optdepends=('de-p1st-pacman-mirrorlist')
+optdepends=('de-p1st-pacman-mirrorlist' 'de-p1st-pacman-repo-chromium' 'de-p1st-repo-surface')
 install='.install'
 source=("git+${url}.git")
 sha256sums=('SKIP')
@@ -20,7 +19,5 @@ package() {
   cd "${_reponame}/pkg/${pkgname}"
 
   install -Dm0644 pacman.d/de-p1st            "$pkgdir"/etc/pacman.d/de-p1st
-  install -Dm0644 pacman.d/ungoogled-chromium "$pkgdir"/etc/pacman.d/ungoogled-chromium
-
   install -Dm0544 pacman.conf.holoscript      "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/pacman.conf.holoscript
 }

pkg/de-p1st-pacman/TESTED

@@ -1,4 +1,2 @@
 de-p1st mirror
 ParallelDownloads = 4
-
-TODO: install ungoogled-chromium

pkg/de-p1st-pacman/pacman.conf.holoscript

@@ -15,7 +15,6 @@ echo "$stdin" | sed 's|^#ParallelDownloads\s*=.*$|ParallelDownloads = 4|'
 # Enable multilib repository
 printf '\n[multilib]\nInclude = /etc/pacman.d/mirrorlist\n'
 
-# de-p1st and home_ungoogled_chromium_Arch mirror
+# de-p1st mirror
 printf '\n'
 printf 'Include = /etc/pacman.d/de-p1st\n'
-printf 'Include = /etc/pacman.d/ungoogled-chromium\n'

pkg/discord_arch_electron

@@ -1 +1 @@
-Subproject commit 13e4d5f012cc6fec858d7386dc788f766fba25d0
+Subproject commit 4ac1f8a44c58d1e732429fa200c3513fae0e5f0a

pkg/timeshift

@@ -1 +1 @@
-Subproject commit b6b352a8c17ac7f4f6eea5d27e70da34a3c1b0dc
+Subproject commit 310932f03dc0e89b161f901619de166d35757989

pkg/zoom

@@ -1 +1 @@
-Subproject commit bf44c7326c9c47f4070ee459630daff7be4a6849
+Subproject commit 49cb1be26b06460f9afd1d63e134676973c75d7b