From fd48372cacc4247af3bced7dae15ace0a58bc1aa Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Thu, 23 Sep 2021 18:30:42 +0200
Subject: [PATCH] separate pkg for chromium and surface repos; updates

---
 build-pkg/pkglist-de-p1st.txt                 |  4 ++--
 pkg/de-p1st-pacman-mirrorlist/PKGBUILD        |  2 +-
 pkg/de-p1st-pacman-repo-chromium/.install     | 21 ++++++++++++++++
 pkg/de-p1st-pacman-repo-chromium/PKGBUILD     | 24 +++++++++++++++++++
 .../pacman.conf.holoscript                    | 10 ++++++++
 .../pacman.d/ungoogled-chromium               |  0
 pkg/de-p1st-pacman-repo-surface/.install      | 21 ++++++++++++++++
 pkg/de-p1st-pacman-repo-surface/PKGBUILD      | 24 +++++++++++++++++++
 .../pacman.conf.holoscript                    | 10 ++++++++
 .../pacman.d/linux-surface                    |  6 +++++
 pkg/de-p1st-pacman/.install                   |  6 -----
 pkg/de-p1st-pacman/PKGBUILD                   |  9 +++----
 pkg/de-p1st-pacman/TESTED                     |  2 --
 pkg/de-p1st-pacman/pacman.conf.holoscript     |  3 +--
 pkg/discord_arch_electron                     |  2 +-
 pkg/timeshift                                 |  2 +-
 pkg/zoom                                      |  2 +-
 17 files changed, 126 insertions(+), 22 deletions(-)
 create mode 100644 pkg/de-p1st-pacman-repo-chromium/.install
 create mode 100644 pkg/de-p1st-pacman-repo-chromium/PKGBUILD
 create mode 100644 pkg/de-p1st-pacman-repo-chromium/pacman.conf.holoscript
 rename pkg/{de-p1st-pacman => de-p1st-pacman-repo-chromium}/pacman.d/ungoogled-chromium (100%)
 create mode 100644 pkg/de-p1st-pacman-repo-surface/.install
 create mode 100644 pkg/de-p1st-pacman-repo-surface/PKGBUILD
 create mode 100644 pkg/de-p1st-pacman-repo-surface/pacman.conf.holoscript
 create mode 100644 pkg/de-p1st-pacman-repo-surface/pacman.d/linux-surface

diff --git a/build-pkg/pkglist-de-p1st.txt b/build-pkg/pkglist-de-p1st.txt
index 6c40fbb..02af15f 100644
--- a/build-pkg/pkglist-de-p1st.txt
+++ b/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-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns de-p1st-ssh
+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-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
diff --git a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
index 82874ad..9666557 100644
--- a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
+++ b/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')
diff --git a/pkg/de-p1st-pacman-repo-chromium/.install b/pkg/de-p1st-pacman-repo-chromium/.install
new file mode 100644
index 0000000..8db2702
--- /dev/null
+++ b/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
+}
diff --git a/pkg/de-p1st-pacman-repo-chromium/PKGBUILD b/pkg/de-p1st-pacman-repo-chromium/PKGBUILD
new file mode 100644
index 0000000..dd64f72
--- /dev/null
+++ b/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
+}
diff --git a/pkg/de-p1st-pacman-repo-chromium/pacman.conf.holoscript b/pkg/de-p1st-pacman-repo-chromium/pacman.conf.holoscript
new file mode 100644
index 0000000..037aa46
--- /dev/null
+++ b/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'
diff --git a/pkg/de-p1st-pacman/pacman.d/ungoogled-chromium b/pkg/de-p1st-pacman-repo-chromium/pacman.d/ungoogled-chromium
similarity index 100%
rename from pkg/de-p1st-pacman/pacman.d/ungoogled-chromium
rename to pkg/de-p1st-pacman-repo-chromium/pacman.d/ungoogled-chromium
diff --git a/pkg/de-p1st-pacman-repo-surface/.install b/pkg/de-p1st-pacman-repo-surface/.install
new file mode 100644
index 0000000..743226e
--- /dev/null
+++ b/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
+}
diff --git a/pkg/de-p1st-pacman-repo-surface/PKGBUILD b/pkg/de-p1st-pacman-repo-surface/PKGBUILD
new file mode 100644
index 0000000..3c98fe9
--- /dev/null
+++ b/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
+}
diff --git a/pkg/de-p1st-pacman-repo-surface/pacman.conf.holoscript b/pkg/de-p1st-pacman-repo-surface/pacman.conf.holoscript
new file mode 100644
index 0000000..c8d384a
--- /dev/null
+++ b/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'
diff --git a/pkg/de-p1st-pacman-repo-surface/pacman.d/linux-surface b/pkg/de-p1st-pacman-repo-surface/pacman.d/linux-surface
new file mode 100644
index 0000000..6efbaec
--- /dev/null
+++ b/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/
diff --git a/pkg/de-p1st-pacman/.install b/pkg/de-p1st-pacman/.install
index 8db2702..b754ef5 100644
--- a/pkg/de-p1st-pacman/.install
+++ b/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
 }
 
diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD
index 75fd692..800215d 100644
--- a/pkg/de-p1st-pacman/PKGBUILD
+++ b/pkg/de-p1st-pacman/PKGBUILD
@@ -2,16 +2,15 @@
 _pkgname=pacman
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.2.2
-pkgrel=3
+pkgver=0.2.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
 }
diff --git a/pkg/de-p1st-pacman/TESTED b/pkg/de-p1st-pacman/TESTED
index 24c8821..63c8332 100644
--- a/pkg/de-p1st-pacman/TESTED
+++ b/pkg/de-p1st-pacman/TESTED
@@ -1,4 +1,2 @@
 de-p1st mirror
 ParallelDownloads = 4
-
-TODO: install ungoogled-chromium
diff --git a/pkg/de-p1st-pacman/pacman.conf.holoscript b/pkg/de-p1st-pacman/pacman.conf.holoscript
index 9e249e2..fdeba55 100644
--- a/pkg/de-p1st-pacman/pacman.conf.holoscript
+++ b/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'
diff --git a/pkg/discord_arch_electron b/pkg/discord_arch_electron
index 13e4d5f..4ac1f8a 160000
--- a/pkg/discord_arch_electron
+++ b/pkg/discord_arch_electron
@@ -1 +1 @@
-Subproject commit 13e4d5f012cc6fec858d7386dc788f766fba25d0
+Subproject commit 4ac1f8a44c58d1e732429fa200c3513fae0e5f0a
diff --git a/pkg/timeshift b/pkg/timeshift
index b6b352a..310932f 160000
--- a/pkg/timeshift
+++ b/pkg/timeshift
@@ -1 +1 @@
-Subproject commit b6b352a8c17ac7f4f6eea5d27e70da34a3c1b0dc
+Subproject commit 310932f03dc0e89b161f901619de166d35757989
diff --git a/pkg/zoom b/pkg/zoom
index bf44c73..49cb1be 160000
--- a/pkg/zoom
+++ b/pkg/zoom
@@ -1 +1 @@
-Subproject commit bf44c7326c9c47f4070ee459630daff7be4a6849
+Subproject commit 49cb1be26b06460f9afd1d63e134676973c75d7b