From c72468e1ff4573bf96c40cba23cefabd5179e3c2 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Tue, 20 Apr 2021 21:35:19 +0200
Subject: [PATCH 01/25] work-in-progress

---
 pkg/de-p1st-base-efi/PKGBUILD   | 42 +++++++++++++++++++++++++++++++++
 pkg/de-p1st-kernel-lts/PKGBUILD | 20 ++++++++++++++++
 pkg/de-p1st-kernel/PKGBUILD     | 20 ++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 pkg/de-p1st-base-efi/PKGBUILD
 create mode 100644 pkg/de-p1st-kernel-lts/PKGBUILD
 create mode 100644 pkg/de-p1st-kernel/PKGBUILD

diff --git a/pkg/de-p1st-base-efi/PKGBUILD b/pkg/de-p1st-base-efi/PKGBUILD
new file mode 100644
index 0000000..f59a708
--- /dev/null
+++ b/pkg/de-p1st-base-efi/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Daniel Langbein <daniel@systemli.org>
+_pkgname=base-efi
+_reponame=arch-pkg
+pkgname="de-p1st-$_pkgname"
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="Arch Linux base packages"
+arch=('any')
+url="https://git.privacy1st.de/langfingaz/${_reponame}"
+license=('MIT')
+groups=()
+
+depends=('base' 'base-devel' 'linux-firmware' 'man-db' 'man-pages' 'nano' 'usbutils')
+# metapackage for 'linux' and 'linux-headers'
+depends+=('de-p1st-kernel')
+# metapackage for microcode
+depends+=('de-p1st-ucode') !! TODO !!
+
+# fonts
+depends+=('noto-fonts' 'ttf-material-design-icons-git' 'ttf-unifont')
+# bootmanager
+depends+=('de-p1st-grub' 'efibootmgr')
+depends+=('de-p1st-keyboard')
+
+makedepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("git+${url}.git")
+noextract=()
+sha256sums=('SKIP')
+
+package() {
+  cd "${_reponame}/pkg/${pkgname}"
+
+  install -Dm0644 wheel "$pkgdir"/etc/sudoers.d/wheel
+}
diff --git a/pkg/de-p1st-kernel-lts/PKGBUILD b/pkg/de-p1st-kernel-lts/PKGBUILD
new file mode 100644
index 0000000..5f8352e
--- /dev/null
+++ b/pkg/de-p1st-kernel-lts/PKGBUILD
@@ -0,0 +1,20 @@
+# Maintainer: Daniel Langbein <daniel@systemli.org>
+_pkgname=kernel-lts
+_reponame=arch-pkg
+pkgname="de-p1st-$_pkgname"
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="linux-lts and linux-lts-headers"
+arch=('any')
+url="https://git.privacy1st.de/langfingaz/${_reponame}"
+license=('MIT')
+groups=()
+depends=('linux-lts' 'linux-lts-headers')
+provides=('de-p1st-kernel')
+conflicts=()
+replaces=()
+options=()
+install=
+changelog=
+noextract=()
+sha256sums=('SKIP')
diff --git a/pkg/de-p1st-kernel/PKGBUILD b/pkg/de-p1st-kernel/PKGBUILD
new file mode 100644
index 0000000..acf470d
--- /dev/null
+++ b/pkg/de-p1st-kernel/PKGBUILD
@@ -0,0 +1,20 @@
+# Maintainer: Daniel Langbein <daniel@systemli.org>
+_pkgname=kernel
+_reponame=arch-pkg
+pkgname="de-p1st-$_pkgname"
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="linux and linux-headers"
+arch=('any')
+url="https://git.privacy1st.de/langfingaz/${_reponame}"
+license=('MIT')
+groups=()
+depends=('linux' 'linux-headers')
+provides=()  # implicitly provides de-p1st-kernel as this is the pkgname
+conflicts=()
+replaces=()
+options=()
+install=
+changelog=
+noextract=()
+sha256sums=('SKIP')

From 805c0f6e1496b78a2fbf53865a1091acc0b7105c Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Wed, 21 Apr 2021 21:49:21 +0200
Subject: [PATCH 02/25] work-in-progress

---
 README.md                          | 14 +++++++++++++-
 pkg/de-p1st-networkmanager/scratch |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkg/de-p1st-networkmanager/scratch

diff --git a/README.md b/README.md
index ceb668d..4060957 100644
--- a/README.md
+++ b/README.md
@@ -10,10 +10,22 @@ Package names are prefixed with `de-p1st` as this is one of my
 domains ([p1st.de]()) which itself is an abbreviation of
 [cloud.privacy1st.de]()
 
-### config files
+### creating config files
+
+```shell
+install -Dm644 $src $pkgdir/$dst
+```
 
 [Example](https://gitlab.com/archi3linux/meta/-/blob/c08ad57993095a575f2e7453c2fe92de97923276/PKGBUILD#L62)
 
+### changing existing config files
+
+**TODO**: holo AUR package
+
 ### home skeleton
 
 [Example](https://gitlab.com/archi3linux/meta/-/blob/c08ad57993095a575f2e7453c2fe92de97923276/PKGBUILD#L75)
+
+### enabling services
+
+**TODO**: using systemd.preset
diff --git a/pkg/de-p1st-networkmanager/scratch b/pkg/de-p1st-networkmanager/scratch
new file mode 100644
index 0000000..8ca375d
--- /dev/null
+++ b/pkg/de-p1st-networkmanager/scratch
@@ -0,0 +1,3 @@
+depend on networkmanager, openvpn plugin
+
+enalbe the systemctl service
\ No newline at end of file

From a97803454ff30cd1c48bf090eb13e8f1f26f334d Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 11:06:27 +0200
Subject: [PATCH 03/25] add remote repository manager

---
 pkg/de-p1st-repo/PKGBUILD                 | 32 +++++++++++++++++
 pkg/de-p1st-repo/arch-repo-push-new.sh    | 21 ++++++++++++
 pkg/de-p1st-repo/arch-repo-receive-new.sh | 42 +++++++++++++++++++++++
 pkg/de-p1st-repo/arch-repo.cfg            |  4 +++
 4 files changed, 99 insertions(+)
 create mode 100644 pkg/de-p1st-repo/PKGBUILD
 create mode 100644 pkg/de-p1st-repo/arch-repo-push-new.sh
 create mode 100644 pkg/de-p1st-repo/arch-repo-receive-new.sh
 create mode 100644 pkg/de-p1st-repo/arch-repo.cfg

diff --git a/pkg/de-p1st-repo/PKGBUILD b/pkg/de-p1st-repo/PKGBUILD
new file mode 100644
index 0000000..f7bca11
--- /dev/null
+++ b/pkg/de-p1st-repo/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Daniel Langbein <daniel@systemli.org>
+_pkgname=repo
+_reponame=arch-pkg
+pkgname="de-p1st-$_pkgname"
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="Bash script to manage remote Arch Linux repository"
+arch=('any')
+url="https://git.privacy1st.de/langfingaz/${_reponame}"
+license=('MIT')
+groups=()
+depends=('openssh' 'bash')
+makedepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("git+${url}.git")
+noextract=()
+sha256sums=('SKIP')
+
+package() {
+  cd "${_reponame}/pkg/${pkgname}"
+
+  install -Dm0544 arch-repo-push-new.sh    "$pkgdir"/usr/bin/arch-repo-push-new
+  install -Dm0544 arch-repo-receive-new.sh "$pkgdir"/usr/bin/arch-repo-receive-new
+  install -Dm0644 arch-repo.cfg            "$pkgdir"/etc/de-p1st-repo/arch-repo.cfg
+}
diff --git a/pkg/de-p1st-repo/arch-repo-push-new.sh b/pkg/de-p1st-repo/arch-repo-push-new.sh
new file mode 100644
index 0000000..3c5673a
--- /dev/null
+++ b/pkg/de-p1st-repo/arch-repo-push-new.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+souce /etc/de-p1st-repo/arch-repo.cfg || exit
+
+
+cd "${LOCAL_PKG_DIR}" || exit
+
+# get list of new packages, one package per line
+rsync --ignore-existing --out-format="%n" --dry-run \
+  ./*.pkg.tar.{xz,zst} "${REMOTE_SSH_HOST}":"${REMOTE_PKG_DIR}" > new-pkg.txt || exit
+
+# transfer new packages using rsync
+rsync --ignore-existing --progress --human-readable \
+  ./*.pkg.tar.{xz,zst} "${REMOTE_SSH_HOST}":"${REMOTE_PKG_DIR}" || exit
+
+# transfer new-pkg.txt
+rsync --ignore-times --checksum --progress --human-readable \
+  new-pkg.txt "${REMOTE_SSH_HOST}":"${REMOTE_PKG_DIR}" || exit
+
+# add each new package to database
+ssh "${REMOTE_SSH_HOST}" "/home/yoda/arch-repo-receive-new.sh"
diff --git a/pkg/de-p1st-repo/arch-repo-receive-new.sh b/pkg/de-p1st-repo/arch-repo-receive-new.sh
new file mode 100644
index 0000000..0c1dba9
--- /dev/null
+++ b/pkg/de-p1st-repo/arch-repo-receive-new.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+souce /etc/de-p1st-repo/arch-repo.cfg || exit
+
+
+#
+# add new packages to database
+#
+function add_to_db(){
+  mapfile -t PKGS < <(cat new-pkg.txt)
+  for PKG in "${PKGS[@]}"; do
+    repo-add -n "${REMOTE_DB_NAME}.db.tar.gz" "${PKG}" || exit
+  done
+}
+
+
+#
+# generate index.html
+#
+function generate_index(){
+  echo '<!DOCTYPE html>
+<html>
+<head>
+<title>privacy1st.de Arch Packages</title>
+</head>
+<body>
+<h1>privacy1st.de Arch Packages</h1>
+' > index.html
+
+  for PKG in ./*.pkg.tar.{xz,zst}; do
+    echo "<p><a href=\"$PKG\">$PKG</a></p>" >> index.html;
+  done
+
+  echo '
+</body>
+</html>' >> index.html
+}
+
+
+cd "${REMOTE_PKG_DIR}" || exit
+add_to_db
+generate_index
diff --git a/pkg/de-p1st-repo/arch-repo.cfg b/pkg/de-p1st-repo/arch-repo.cfg
new file mode 100644
index 0000000..1518da8
--- /dev/null
+++ b/pkg/de-p1st-repo/arch-repo.cfg
@@ -0,0 +1,4 @@
+REMOTE_SSH_HOST=rootnas
+LOCAL_PKG_DIR=/home/custompkgs
+REMOTE_PKG_DIR=/mnt/data/live/arch-repo
+REMOTE_DB_NAME=de-p1st
\ No newline at end of file

From 33f27823e8ecca337d047c7f4e90b41121a8d629 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 11:11:46 +0200
Subject: [PATCH 04/25] fix

---
 pkg/de-p1st-repo/arch-repo-push-new.sh    | 2 +-
 pkg/de-p1st-repo/arch-repo-receive-new.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/de-p1st-repo/arch-repo-push-new.sh b/pkg/de-p1st-repo/arch-repo-push-new.sh
index 3c5673a..55d7ff5 100644
--- a/pkg/de-p1st-repo/arch-repo-push-new.sh
+++ b/pkg/de-p1st-repo/arch-repo-push-new.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-souce /etc/de-p1st-repo/arch-repo.cfg || exit
+source /etc/de-p1st-repo/arch-repo.cfg || exit
 
 
 cd "${LOCAL_PKG_DIR}" || exit
diff --git a/pkg/de-p1st-repo/arch-repo-receive-new.sh b/pkg/de-p1st-repo/arch-repo-receive-new.sh
index 0c1dba9..4b1b251 100644
--- a/pkg/de-p1st-repo/arch-repo-receive-new.sh
+++ b/pkg/de-p1st-repo/arch-repo-receive-new.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-souce /etc/de-p1st-repo/arch-repo.cfg || exit
+source /etc/de-p1st-repo/arch-repo.cfg || exit
 
 
 #

From 6f20d49c96b333bc86578e2038a6e1b803e23126 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 11:12:02 +0200
Subject: [PATCH 05/25] fix

---
 pkg/de-p1st-repo/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/de-p1st-repo/PKGBUILD b/pkg/de-p1st-repo/PKGBUILD
index f7bca11..deab955 100644
--- a/pkg/de-p1st-repo/PKGBUILD
+++ b/pkg/de-p1st-repo/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=repo
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.1
+pkgver=0.0.2
 pkgrel=1
 pkgdesc="Bash script to manage remote Arch Linux repository"
 arch=('any')

From 89db13eb8f298c2a56cb494a88977586e605a127 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 11:19:15 +0200
Subject: [PATCH 06/25] fix

---
 pkg/de-p1st-repo/PKGBUILD      | 8 +++++---
 pkg/de-p1st-repo/arch-repo.cfg | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkg/de-p1st-repo/PKGBUILD b/pkg/de-p1st-repo/PKGBUILD
index deab955..1e6aef1 100644
--- a/pkg/de-p1st-repo/PKGBUILD
+++ b/pkg/de-p1st-repo/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=repo
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.2
+pkgver=0.0.3
 pkgrel=1
 pkgdesc="Bash script to manage remote Arch Linux repository"
 arch=('any')
@@ -26,7 +26,9 @@ sha256sums=('SKIP')
 package() {
   cd "${_reponame}/pkg/${pkgname}"
 
-  install -Dm0544 arch-repo-push-new.sh    "$pkgdir"/usr/bin/arch-repo-push-new
-  install -Dm0544 arch-repo-receive-new.sh "$pkgdir"/usr/bin/arch-repo-receive-new
+  install -Dm0555 arch-repo-push-new.sh    "$pkgdir"/usr/bin/arch-repo-push-new
+  install -Dm0555 arch-repo-receive-new.sh "$pkgdir"/usr/bin/arch-repo-receive-new
+
   install -Dm0644 arch-repo.cfg            "$pkgdir"/etc/de-p1st-repo/arch-repo.cfg
+  chown 0:0                                "$pkgdir"/etc/de-p1st-repo/arch-repo.cfg
 }
diff --git a/pkg/de-p1st-repo/arch-repo.cfg b/pkg/de-p1st-repo/arch-repo.cfg
index 1518da8..4d5fd3e 100644
--- a/pkg/de-p1st-repo/arch-repo.cfg
+++ b/pkg/de-p1st-repo/arch-repo.cfg
@@ -1,4 +1,8 @@
+# host from ssh configuration which logs in
+# as correct user to have write access to
+# REMOTE_PKG_DIR
 REMOTE_SSH_HOST=rootnas
+
 LOCAL_PKG_DIR=/home/custompkgs
 REMOTE_PKG_DIR=/mnt/data/live/arch-repo
 REMOTE_DB_NAME=de-p1st
\ No newline at end of file

From a6b68fe752f72fc3c5553baa6c73c6be9e9e93ca Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 11:24:04 +0200
Subject: [PATCH 07/25] fix

---
 pkg/de-p1st-repo/PKGBUILD                 | 2 +-
 pkg/de-p1st-repo/arch-repo-push-new.sh    | 5 ++++-
 pkg/de-p1st-repo/arch-repo-receive-new.sh | 7 +++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkg/de-p1st-repo/PKGBUILD b/pkg/de-p1st-repo/PKGBUILD
index 1e6aef1..ad2d116 100644
--- a/pkg/de-p1st-repo/PKGBUILD
+++ b/pkg/de-p1st-repo/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=repo
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.3
+pkgver=0.0.4
 pkgrel=1
 pkgdesc="Bash script to manage remote Arch Linux repository"
 arch=('any')
diff --git a/pkg/de-p1st-repo/arch-repo-push-new.sh b/pkg/de-p1st-repo/arch-repo-push-new.sh
index 55d7ff5..cda7021 100644
--- a/pkg/de-p1st-repo/arch-repo-push-new.sh
+++ b/pkg/de-p1st-repo/arch-repo-push-new.sh
@@ -3,6 +3,7 @@
 source /etc/de-p1st-repo/arch-repo.cfg || exit
 
 
+
 cd "${LOCAL_PKG_DIR}" || exit
 
 # get list of new packages, one package per line
@@ -13,9 +14,11 @@ rsync --ignore-existing --out-format="%n" --dry-run \
 rsync --ignore-existing --progress --human-readable \
   ./*.pkg.tar.{xz,zst} "${REMOTE_SSH_HOST}":"${REMOTE_PKG_DIR}" || exit
 
+
+
 # transfer new-pkg.txt
 rsync --ignore-times --checksum --progress --human-readable \
   new-pkg.txt "${REMOTE_SSH_HOST}":"${REMOTE_PKG_DIR}" || exit
 
 # add each new package to database
-ssh "${REMOTE_SSH_HOST}" "/home/yoda/arch-repo-receive-new.sh"
+ssh "${REMOTE_SSH_HOST}" "/usr/bin/arch-repo-receive-new"
diff --git a/pkg/de-p1st-repo/arch-repo-receive-new.sh b/pkg/de-p1st-repo/arch-repo-receive-new.sh
index 4b1b251..38fd0e9 100644
--- a/pkg/de-p1st-repo/arch-repo-receive-new.sh
+++ b/pkg/de-p1st-repo/arch-repo-receive-new.sh
@@ -3,10 +3,13 @@
 source /etc/de-p1st-repo/arch-repo.cfg || exit
 
 
+
 #
 # add new packages to database
 #
 function add_to_db(){
+  echo "Adding new packages to db ..."
+
   mapfile -t PKGS < <(cat new-pkg.txt)
   for PKG in "${PKGS[@]}"; do
     repo-add -n "${REMOTE_DB_NAME}.db.tar.gz" "${PKG}" || exit
@@ -14,10 +17,13 @@ function add_to_db(){
 }
 
 
+
 #
 # generate index.html
 #
 function generate_index(){
+  echo "Generating index.html with links to all packages ..."
+
   echo '<!DOCTYPE html>
 <html>
 <head>
@@ -37,6 +43,7 @@ function generate_index(){
 }
 
 
+
 cd "${REMOTE_PKG_DIR}" || exit
 add_to_db
 generate_index

From d07bd3a60370ed471f89f01f86886236e93a015a Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 11:26:01 +0200
Subject: [PATCH 08/25] fix

---
 pkg/de-p1st-repo/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/de-p1st-repo/PKGBUILD b/pkg/de-p1st-repo/PKGBUILD
index ad2d116..2e67bfd 100644
--- a/pkg/de-p1st-repo/PKGBUILD
+++ b/pkg/de-p1st-repo/PKGBUILD
@@ -3,7 +3,7 @@ _pkgname=repo
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Bash script to manage remote Arch Linux repository"
 arch=('any')
 url="https://git.privacy1st.de/langfingaz/${_reponame}"

From 2564c833e21ad8fd644f484a93cebcefe80d2134 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 11:38:59 +0200
Subject: [PATCH 09/25] add readme to repo manager

---
 pkg/de-p1st-repo/README.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkg/de-p1st-repo/README.md

diff --git a/pkg/de-p1st-repo/README.md b/pkg/de-p1st-repo/README.md
new file mode 100644
index 0000000..45ac0f1
--- /dev/null
+++ b/pkg/de-p1st-repo/README.md
@@ -0,0 +1,32 @@
+# arch-repo manager
+
+## setup
+
+Install `de-p1st-repo` on your local machine as well as on
+a remote server.
+
+Adjust `/etc/de-p1st-repo/*.conf` according to your needs.
+
+Run a webserver on the server to serve static content:
+
+* https://hub.docker.com/_/nginx/ -> Hosting some simple static content
+* `sudo docker run --name arch-repo -v /mnt/data/live/arch-repo:/usr/share/nginx/html:ro -d nginx`
+
+Add the newly created mirror to your `/etc/pacman.conf`:
+
+```
+[de-p1st]
+SigLevel = Optional TrustAll
+Server = https://arch.p1st.de
+```
+
+## normal usage
+
+1. Build packages on local machine
+
+* `aur sync -c SOME_AUR_PACKAGE`
+* `aur sync -c -u`
+
+2. Push new packages to remote repository
+
+* `arch-repo-push-new`

From c04dec272277295d4e40429714450dfb1185cda1 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 11:46:18 +0200
Subject: [PATCH 10/25] arch-repo: list items

---
 pkg/de-p1st-repo/PKGBUILD                 | 2 +-
 pkg/de-p1st-repo/arch-repo-receive-new.sh | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkg/de-p1st-repo/PKGBUILD b/pkg/de-p1st-repo/PKGBUILD
index 2e67bfd..6bf2522 100644
--- a/pkg/de-p1st-repo/PKGBUILD
+++ b/pkg/de-p1st-repo/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=repo
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.4
+pkgver=0.0.5
 pkgrel=2
 pkgdesc="Bash script to manage remote Arch Linux repository"
 arch=('any')
diff --git a/pkg/de-p1st-repo/arch-repo-receive-new.sh b/pkg/de-p1st-repo/arch-repo-receive-new.sh
index 38fd0e9..7e7295f 100644
--- a/pkg/de-p1st-repo/arch-repo-receive-new.sh
+++ b/pkg/de-p1st-repo/arch-repo-receive-new.sh
@@ -31,13 +31,18 @@ function generate_index(){
 </head>
 <body>
 <h1>privacy1st.de Arch Packages</h1>
+<p>The sources can be found here: <a href="https://git.privacy1st.de/langfingaz/arch-pkg">https://git.privacy1st.de/langfingaz/arch-pkg</a></p>
+
+<ul>
 ' > index.html
 
   for PKG in ./*.pkg.tar.{xz,zst}; do
-    echo "<p><a href=\"$PKG\">$PKG</a></p>" >> index.html;
+    echo "<li><a href=\"$PKG\">$PKG</a></li>" >> index.html;
   done
 
   echo '
+</ul>
+
 </body>
 </html>' >> index.html
 }

From 8f7ecf0e9144c1c1542eef10d891e451be9b0249 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 11:49:06 +0200
Subject: [PATCH 11/25] fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4060957..91a2041 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# My personal Arch Linux packages
+# My personalized Arch Linux packages
 
 ## Some notes
 

From b48f42f55af2d71a056375f6036c6889974c757c Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 13:24:47 +0200
Subject: [PATCH 12/25] add pacman (mirrorlist and custom repo)

---
 pkg/de-p1st-pacman/PKGBUILD               | 34 ++++++++++++++++++++++
 pkg/de-p1st-pacman/de-p1st-pacman.install | 35 +++++++++++++++++++++++
 pkg/de-p1st-pacman/pacman.conf.holoscript |  5 ++++
 pkg/de-p1st-pacman/pacman.d/de-p1st       |  5 ++++
 pkg/de-p1st-pacman/pacman.d/mirrorlist    |  6 ++++
 prototype/proto-holo.install              | 35 +++++++++++++++++++++++
 prototype/proto.install                   | 35 +++++++++++++++++++++++
 7 files changed, 155 insertions(+)
 create mode 100644 pkg/de-p1st-pacman/PKGBUILD
 create mode 100644 pkg/de-p1st-pacman/de-p1st-pacman.install
 create mode 100644 pkg/de-p1st-pacman/pacman.conf.holoscript
 create mode 100644 pkg/de-p1st-pacman/pacman.d/de-p1st
 create mode 100644 pkg/de-p1st-pacman/pacman.d/mirrorlist
 create mode 100644 prototype/proto-holo.install
 create mode 100644 prototype/proto.install

diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD
new file mode 100644
index 0000000..c3053e7
--- /dev/null
+++ b/pkg/de-p1st-pacman/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Daniel Langbein <daniel@systemli.org>
+_pkgname=pacman
+_reponame=arch-pkg
+pkgname="de-p1st-$_pkgname"
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="pacman with configuration"
+arch=('any')
+url="https://git.privacy1st.de/langfingaz/${_reponame}"
+license=('MIT')
+groups=()
+depends=('pacman' 'holo')
+makedepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install="${pkgname}.install"
+changelog=
+source=("git+${url}.git")
+noextract=()
+sha256sums=('SKIP')
+
+package() {
+  cd "${_reponame}/pkg/${pkgname}"
+
+  install -Dm0644 pacman.d/de-p1st       "$pkgdir"/etc/pacman.d/de-p1st
+
+  install -Dm0644 pacman.d/mirrorlist    "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.d/mirrorlist
+
+  install -Dm0644 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.conf.holoscript
+}
diff --git a/pkg/de-p1st-pacman/de-p1st-pacman.install b/pkg/de-p1st-pacman/de-p1st-pacman.install
new file mode 100644
index 0000000..8ef8a94
--- /dev/null
+++ b/pkg/de-p1st-pacman/de-p1st-pacman.install
@@ -0,0 +1,35 @@
+# This is a default template for a post-install scriptlet.
+# Uncomment only required functions and remove any functions
+# you don't need (and this header).
+
+## arg 1:  the new package version
+#pre_install() {
+	# do something here
+#}
+
+## arg 1:  the new package version
+post_install() {
+  holo apply
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+#pre_upgrade() {
+	# do something here
+#}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  holo apply
+}
+
+## arg 1:  the old package version
+#pre_remove() {
+	# do something here
+#}
+
+## arg 1:  the old package version
+post_remove() {
+  holo apply
+}
diff --git a/pkg/de-p1st-pacman/pacman.conf.holoscript b/pkg/de-p1st-pacman/pacman.conf.holoscript
new file mode 100644
index 0000000..219924a
--- /dev/null
+++ b/pkg/de-p1st-pacman/pacman.conf.holoscript
@@ -0,0 +1,5 @@
+#!/bin/sh
+# stdin: default config
+# stdout: modified config
+cat
+Include = /etc/pacman.d/de-p1st
diff --git a/pkg/de-p1st-pacman/pacman.d/de-p1st b/pkg/de-p1st-pacman/pacman.d/de-p1st
new file mode 100644
index 0000000..876ea14
--- /dev/null
+++ b/pkg/de-p1st-pacman/pacman.d/de-p1st
@@ -0,0 +1,5 @@
+# in /etc/pacman.conf -> Include = /path/to/this/cfg/file
+
+[de-p1st]
+SigLevel = Optional TrustAll
+Server = https://arch.p1st.de
diff --git a/pkg/de-p1st-pacman/pacman.d/mirrorlist b/pkg/de-p1st-pacman/pacman.d/mirrorlist
new file mode 100644
index 0000000..64185d8
--- /dev/null
+++ b/pkg/de-p1st-pacman/pacman.d/mirrorlist
@@ -0,0 +1,6 @@
+##
+## Arch Linux repository mirrorlist
+##
+
+Server = https://ftp.fau.de/archlinux/$repo/os/$arch
+Server = https://mirror.chaoticum.net/arch/$repo/os/$arch
diff --git a/prototype/proto-holo.install b/prototype/proto-holo.install
new file mode 100644
index 0000000..8ef8a94
--- /dev/null
+++ b/prototype/proto-holo.install
@@ -0,0 +1,35 @@
+# This is a default template for a post-install scriptlet.
+# Uncomment only required functions and remove any functions
+# you don't need (and this header).
+
+## arg 1:  the new package version
+#pre_install() {
+	# do something here
+#}
+
+## arg 1:  the new package version
+post_install() {
+  holo apply
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+#pre_upgrade() {
+	# do something here
+#}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  holo apply
+}
+
+## arg 1:  the old package version
+#pre_remove() {
+	# do something here
+#}
+
+## arg 1:  the old package version
+post_remove() {
+  holo apply
+}
diff --git a/prototype/proto.install b/prototype/proto.install
new file mode 100644
index 0000000..388765e
--- /dev/null
+++ b/prototype/proto.install
@@ -0,0 +1,35 @@
+# This is a default template for a post-install scriptlet.
+# Uncomment only required functions and remove any functions
+# you don't need (and this header).
+
+## arg 1:  the new package version
+#pre_install() {
+	# do something here
+#}
+
+## arg 1:  the new package version
+#post_install() {
+	# do something here
+#}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+#pre_upgrade() {
+	# do something here
+#}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+#post_upgrade() {
+	# do something here
+#}
+
+## arg 1:  the old package version
+#pre_remove() {
+	# do something here
+#}
+
+## arg 1:  the old package version
+#post_remove() {
+	# do something here
+#}
\ No newline at end of file

From 6441b0199f3366f0c2a008e80103ad2be679a745 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 13:37:47 +0200
Subject: [PATCH 13/25] fix

---
 pkg/de-p1st-base-efi/PKGBUILD | 2 +-
 pkg/de-p1st-grub/PKGBUILD     | 2 +-
 pkg/de-p1st-keyboard/PKGBUILD | 2 +-
 pkg/de-p1st-pacman/PKGBUILD   | 4 ++--
 pkg/de-p1st-repo/PKGBUILD     | 6 +++---
 pkg/de-p1st-sudo/PKGBUILD     | 2 +-
 pkg/de-p1st-systemd/PKGBUILD  | 2 +-
 prototype/PKGBUILD            | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/de-p1st-base-efi/PKGBUILD b/pkg/de-p1st-base-efi/PKGBUILD
index f59a708..a7a8720 100644
--- a/pkg/de-p1st-base-efi/PKGBUILD
+++ b/pkg/de-p1st-base-efi/PKGBUILD
@@ -22,7 +22,7 @@ depends+=('noto-fonts' 'ttf-material-design-icons-git' 'ttf-unifont')
 depends+=('de-p1st-grub' 'efibootmgr')
 depends+=('de-p1st-keyboard')
 
-makedepends=()
+makedepends=('git')
 optdepends=()
 provides=()
 conflicts=()
diff --git a/pkg/de-p1st-grub/PKGBUILD b/pkg/de-p1st-grub/PKGBUILD
index d0aea38..0e50494 100644
--- a/pkg/de-p1st-grub/PKGBUILD
+++ b/pkg/de-p1st-grub/PKGBUILD
@@ -10,7 +10,7 @@ url="https://git.privacy1st.de/langfingaz/${_reponame}"
 license=('MIT')
 groups=()
 depends=('grub')
-makedepends=()
+makedepends=('git')
 optdepends=()
 provides=()
 conflicts=()
diff --git a/pkg/de-p1st-keyboard/PKGBUILD b/pkg/de-p1st-keyboard/PKGBUILD
index 7cf0696..7ac44e7 100644
--- a/pkg/de-p1st-keyboard/PKGBUILD
+++ b/pkg/de-p1st-keyboard/PKGBUILD
@@ -10,7 +10,7 @@ url="https://git.privacy1st.de/langfingaz/${_reponame}"
 license=('MIT')
 groups=()
 depends=()
-makedepends=()
+makedepends=('git')
 optdepends=()
 provides=()
 conflicts=()
diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD
index c3053e7..6285023 100644
--- a/pkg/de-p1st-pacman/PKGBUILD
+++ b/pkg/de-p1st-pacman/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=pacman
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.1
+pkgver=0.0.2
 pkgrel=1
 pkgdesc="pacman with configuration"
 arch=('any')
@@ -10,7 +10,7 @@ url="https://git.privacy1st.de/langfingaz/${_reponame}"
 license=('MIT')
 groups=()
 depends=('pacman' 'holo')
-makedepends=()
+makedepends=('git')
 optdepends=()
 provides=()
 conflicts=()
diff --git a/pkg/de-p1st-repo/PKGBUILD b/pkg/de-p1st-repo/PKGBUILD
index 6bf2522..77eed4d 100644
--- a/pkg/de-p1st-repo/PKGBUILD
+++ b/pkg/de-p1st-repo/PKGBUILD
@@ -2,15 +2,15 @@
 _pkgname=repo
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.5
-pkgrel=2
+pkgver=0.0.6
+pkgrel=1
 pkgdesc="Bash script to manage remote Arch Linux repository"
 arch=('any')
 url="https://git.privacy1st.de/langfingaz/${_reponame}"
 license=('MIT')
 groups=()
 depends=('openssh' 'bash')
-makedepends=()
+makedepends=('git')
 optdepends=()
 provides=()
 conflicts=()
diff --git a/pkg/de-p1st-sudo/PKGBUILD b/pkg/de-p1st-sudo/PKGBUILD
index c6389d8..ea56b57 100644
--- a/pkg/de-p1st-sudo/PKGBUILD
+++ b/pkg/de-p1st-sudo/PKGBUILD
@@ -10,7 +10,7 @@ url="https://git.privacy1st.de/langfingaz/${_reponame}"
 license=('MIT')
 groups=()
 depends=('sudo')
-makedepends=()
+makedepends=('git')
 optdepends=()
 provides=()
 conflicts=()
diff --git a/pkg/de-p1st-systemd/PKGBUILD b/pkg/de-p1st-systemd/PKGBUILD
index d694c8e..5dd00de 100644
--- a/pkg/de-p1st-systemd/PKGBUILD
+++ b/pkg/de-p1st-systemd/PKGBUILD
@@ -10,7 +10,7 @@ url="https://git.privacy1st.de/langfingaz/${_reponame}"
 license=('MIT')
 groups=()
 depends=('systemd')
-makedepends=()
+makedepends=('git')
 optdepends=()
 provides=()
 conflicts=()
diff --git a/prototype/PKGBUILD b/prototype/PKGBUILD
index eb80e3d..3ede1c5 100644
--- a/prototype/PKGBUILD
+++ b/prototype/PKGBUILD
@@ -10,7 +10,7 @@ url="https://git.privacy1st.de/langfingaz/${_reponame}"
 license=('MIT')
 groups=()
 depends=()
-makedepends=()
+makedepends=('git')
 optdepends=()
 provides=()
 conflicts=()

From 60904881a792f983149593892df74b39dd100c50 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 13:38:45 +0200
Subject: [PATCH 14/25] fix

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ade90b7..041c5c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /pkg/*/src/
 /pkg/*/arch-pkg/
 /pkg/*/*-any.pkg.tar.zst
+/pkg/de-p1st-pacman/*-package.log

From c65f5500796d870fc91e4f634daef7b01e4ba089 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 13:40:41 +0200
Subject: [PATCH 15/25] fix

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 041c5c9..18c1c61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 /pkg/*/src/
 /pkg/*/arch-pkg/
 /pkg/*/*-any.pkg.tar.zst
-/pkg/de-p1st-pacman/*-package.log
+/pkg/*/*-package.log

From ce9a1a5c1a1ee30755fe9ecd1307f4c4b7bce68c Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 14:17:50 +0200
Subject: [PATCH 16/25] fix

---
 pkg/de-p1st-pacman/PKGBUILD               | 4 ++--
 pkg/de-p1st-pacman/pacman.conf.holoscript | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD
index 6285023..c76d256 100644
--- a/pkg/de-p1st-pacman/PKGBUILD
+++ b/pkg/de-p1st-pacman/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=pacman
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.2
+pkgver=0.0.4
 pkgrel=1
 pkgdesc="pacman with configuration"
 arch=('any')
@@ -30,5 +30,5 @@ package() {
 
   install -Dm0644 pacman.d/mirrorlist    "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.d/mirrorlist
 
-  install -Dm0644 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.conf.holoscript
+  install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.conf.holoscript
 }
diff --git a/pkg/de-p1st-pacman/pacman.conf.holoscript b/pkg/de-p1st-pacman/pacman.conf.holoscript
index 219924a..a826dcb 100644
--- a/pkg/de-p1st-pacman/pacman.conf.holoscript
+++ b/pkg/de-p1st-pacman/pacman.conf.holoscript
@@ -1,5 +1,5 @@
 #!/bin/sh
 # stdin: default config
 # stdout: modified config
-cat
-Include = /etc/pacman.d/de-p1st
+echo 'Include = /etc/pacman.d/de-p1st
+'
\ No newline at end of file

From 8848b44a63ec0e874cab99aaba14bbc8cb406acc Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 14:21:55 +0200
Subject: [PATCH 17/25] fix

---
 pkg/de-p1st-pacman/PKGBUILD               | 2 +-
 pkg/de-p1st-pacman/pacman.conf.holoscript | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD
index c76d256..c435a04 100644
--- a/pkg/de-p1st-pacman/PKGBUILD
+++ b/pkg/de-p1st-pacman/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=pacman
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.4
+pkgver=0.0.5
 pkgrel=1
 pkgdesc="pacman with configuration"
 arch=('any')
diff --git a/pkg/de-p1st-pacman/pacman.conf.holoscript b/pkg/de-p1st-pacman/pacman.conf.holoscript
index a826dcb..cd246d6 100644
--- a/pkg/de-p1st-pacman/pacman.conf.holoscript
+++ b/pkg/de-p1st-pacman/pacman.conf.holoscript
@@ -1,5 +1,5 @@
 #!/bin/sh
 # stdin: default config
 # stdout: modified config
-echo 'Include = /etc/pacman.d/de-p1st
-'
\ No newline at end of file
+cat
+echo 'Include = /etc/pacman.d/de-p1st'
\ No newline at end of file

From 2e8d6d4deb2f181533fc9f9b517a87fe6cd7916e Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 15:01:50 +0200
Subject: [PATCH 18/25] separate mirrorlist

---
 pkg/de-p1st-pacman-mirrorlist/PKGBUILD        | 30 +++++++++++++++++++
 .../mirrorlist                                |  0
 pkg/de-p1st-pacman/PKGBUILD                   |  4 +--
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkg/de-p1st-pacman-mirrorlist/PKGBUILD
 rename pkg/{de-p1st-pacman/pacman.d => de-p1st-pacman-mirrorlist}/mirrorlist (100%)

diff --git a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
new file mode 100644
index 0000000..7b932a7
--- /dev/null
+++ b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Daniel Langbein <daniel@systemli.org>
+_pkgname=pacman-mirrorlist
+_reponame=arch-pkg
+pkgname="de-p1st-$_pkgname"
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="selected Arch Linux mirrors"
+arch=('any')
+url="https://git.privacy1st.de/langfingaz/${_reponame}"
+license=('MIT')
+groups=()
+depends=('pacman')
+makedepends=('git')
+optdepends=()
+provides=('pacman-mirrorlist')
+conflicts=('pacman-mirrorlist')
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("git+${url}.git")
+noextract=()
+sha256sums=('SKIP')
+
+package() {
+  cd "${_reponame}/pkg/${pkgname}"
+
+  install -Dm0644 mirrorlist "$pkgdir"/etc/pacman.d/mirrorlist
+}
diff --git a/pkg/de-p1st-pacman/pacman.d/mirrorlist b/pkg/de-p1st-pacman-mirrorlist/mirrorlist
similarity index 100%
rename from pkg/de-p1st-pacman/pacman.d/mirrorlist
rename to pkg/de-p1st-pacman-mirrorlist/mirrorlist
diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD
index c435a04..8aa36f4 100644
--- a/pkg/de-p1st-pacman/PKGBUILD
+++ b/pkg/de-p1st-pacman/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=pacman
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.5
+pkgver=0.0.6
 pkgrel=1
 pkgdesc="pacman with configuration"
 arch=('any')
@@ -28,7 +28,7 @@ package() {
 
   install -Dm0644 pacman.d/de-p1st       "$pkgdir"/etc/pacman.d/de-p1st
 
-  install -Dm0644 pacman.d/mirrorlist    "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.d/mirrorlist
+  #install -Dm0644 pacman.d/mirrorlist    "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.d/mirrorlist
 
   install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.conf.holoscript
 }

From 31acd332a3ae1fc0681f353490b558b4b293e45b Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 16:02:02 +0200
Subject: [PATCH 19/25] separate mirrorlist - improvements

---
 pkg/de-p1st-pacman-mirrorlist/PKGBUILD             | 14 ++++++++------
 .../{mirrorlist => de-p1st-mirrorlist}             |  0
 .../pacman.conf.holoscript                         |  7 +++++++
 pkg/de-p1st-pacman/PKGBUILD                        |  8 +++-----
 4 files changed, 18 insertions(+), 11 deletions(-)
 rename pkg/de-p1st-pacman-mirrorlist/{mirrorlist => de-p1st-mirrorlist} (100%)
 create mode 100644 pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript

diff --git a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
index 7b932a7..a65f9f0 100644
--- a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
+++ b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
@@ -2,22 +2,22 @@
 _pkgname=pacman-mirrorlist
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.1
+pkgver=0.0.2
 pkgrel=1
 pkgdesc="selected Arch Linux mirrors"
 arch=('any')
 url="https://git.privacy1st.de/langfingaz/${_reponame}"
 license=('MIT')
 groups=()
-depends=('pacman')
+depends=('pacman' 'holo')
 makedepends=('git')
 optdepends=()
-provides=('pacman-mirrorlist')
-conflicts=('pacman-mirrorlist')
+provides=()
+conflicts=()
 replaces=()
 backup=()
 options=()
-install=
+install="${pkgname}.install"
 changelog=
 source=("git+${url}.git")
 noextract=()
@@ -26,5 +26,7 @@ sha256sums=('SKIP')
 package() {
   cd "${_reponame}/pkg/${pkgname}"
 
-  install -Dm0644 mirrorlist "$pkgdir"/etc/pacman.d/mirrorlist
+  install -Dm0644 de-p1st-mirrorlist "$pkgdir"/etc/pacman.d/de-p1st-mirrorlist
+
+  install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/pacman.conf.holoscript
 }
diff --git a/pkg/de-p1st-pacman-mirrorlist/mirrorlist b/pkg/de-p1st-pacman-mirrorlist/de-p1st-mirrorlist
similarity index 100%
rename from pkg/de-p1st-pacman-mirrorlist/mirrorlist
rename to pkg/de-p1st-pacman-mirrorlist/de-p1st-mirrorlist
diff --git a/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript b/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript
new file mode 100644
index 0000000..80bad69
--- /dev/null
+++ b/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript
@@ -0,0 +1,7 @@
+#!/bin/sh
+# stdin: default config
+# stdout: modified config
+
+# replace all occurrences of "mirrorlist" with "de-p1st-mirrorlist"
+sed 's|^Include\s*=\s*/etc/pacman.d/mirrorlist$|Include = /etc/pacman.d/de-p1st-mirrorlist|'
+sed 's|^#\s*Include\s*=\s*/etc/pacman.d/mirrorlist$|#Include = /etc/pacman.d/de-p1st-mirrorlist|'
diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD
index 8aa36f4..0f728a4 100644
--- a/pkg/de-p1st-pacman/PKGBUILD
+++ b/pkg/de-p1st-pacman/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=pacman
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.6
+pkgver=0.0.7
 pkgrel=1
 pkgdesc="pacman with configuration"
 arch=('any')
@@ -11,7 +11,7 @@ license=('MIT')
 groups=()
 depends=('pacman' 'holo')
 makedepends=('git')
-optdepends=()
+optdepends=('de-p1st-pacman-mirrorlist')
 provides=()
 conflicts=()
 replaces=()
@@ -28,7 +28,5 @@ package() {
 
   install -Dm0644 pacman.d/de-p1st       "$pkgdir"/etc/pacman.d/de-p1st
 
-  #install -Dm0644 pacman.d/mirrorlist    "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.d/mirrorlist
-
-  install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/de-p1st-pacman/etc/pacman.conf.holoscript
+  install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/pacman.conf.holoscript
 }

From 6adc8685b6973a1b7dfe5c2df9860c00c919f10b Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 16:03:35 +0200
Subject: [PATCH 20/25] fix

---
 .../de-p1st-pacman-mirrorlist.install         | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkg/de-p1st-pacman-mirrorlist/de-p1st-pacman-mirrorlist.install

diff --git a/pkg/de-p1st-pacman-mirrorlist/de-p1st-pacman-mirrorlist.install b/pkg/de-p1st-pacman-mirrorlist/de-p1st-pacman-mirrorlist.install
new file mode 100644
index 0000000..8ef8a94
--- /dev/null
+++ b/pkg/de-p1st-pacman-mirrorlist/de-p1st-pacman-mirrorlist.install
@@ -0,0 +1,35 @@
+# This is a default template for a post-install scriptlet.
+# Uncomment only required functions and remove any functions
+# you don't need (and this header).
+
+## arg 1:  the new package version
+#pre_install() {
+	# do something here
+#}
+
+## arg 1:  the new package version
+post_install() {
+  holo apply
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+#pre_upgrade() {
+	# do something here
+#}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  holo apply
+}
+
+## arg 1:  the old package version
+#pre_remove() {
+	# do something here
+#}
+
+## arg 1:  the old package version
+post_remove() {
+  holo apply
+}

From a68199c035b365c4226c82f4c3caffe2e73106de Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 16:08:28 +0200
Subject: [PATCH 21/25] fix

---
 pkg/de-p1st-pacman-mirrorlist/PKGBUILD               | 2 +-
 pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
index a65f9f0..0ca64bb 100644
--- a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
+++ b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=pacman-mirrorlist
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.2
+pkgver=0.0.3
 pkgrel=1
 pkgdesc="selected Arch Linux mirrors"
 arch=('any')
diff --git a/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript b/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript
index 80bad69..36788d2 100644
--- a/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript
+++ b/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript
@@ -3,5 +3,5 @@
 # stdout: modified config
 
 # replace all occurrences of "mirrorlist" with "de-p1st-mirrorlist"
-sed 's|^Include\s*=\s*/etc/pacman.d/mirrorlist$|Include = /etc/pacman.d/de-p1st-mirrorlist|'
-sed 's|^#\s*Include\s*=\s*/etc/pacman.d/mirrorlist$|#Include = /etc/pacman.d/de-p1st-mirrorlist|'
+sed 's|^Include\s*=\s*/etc/pacman.d/mirrorlist$|Include = /etc/pacman.d/de-p1st-mirrorlist|'      || exit
+sed 's|^#\s*Include\s*=\s*/etc/pacman.d/mirrorlist$|#Include = /etc/pacman.d/de-p1st-mirrorlist|' || exit

From c2389dd343c1f3d3093a5fc7ed802615a1e6aa93 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 16:11:11 +0200
Subject: [PATCH 22/25] fix

---
 pkg/de-p1st-pacman-mirrorlist/PKGBUILD               | 2 +-
 pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
index 0ca64bb..3061e17 100644
--- a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
+++ b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=pacman-mirrorlist
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.3
+pkgver=0.0.4
 pkgrel=1
 pkgdesc="selected Arch Linux mirrors"
 arch=('any')
diff --git a/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript b/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript
index 36788d2..e3571aa 100644
--- a/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript
+++ b/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript
@@ -3,5 +3,4 @@
 # stdout: modified config
 
 # replace all occurrences of "mirrorlist" with "de-p1st-mirrorlist"
-sed 's|^Include\s*=\s*/etc/pacman.d/mirrorlist$|Include = /etc/pacman.d/de-p1st-mirrorlist|'      || exit
-sed 's|^#\s*Include\s*=\s*/etc/pacman.d/mirrorlist$|#Include = /etc/pacman.d/de-p1st-mirrorlist|' || exit
+sed 's|^Include\s*=\s*/etc/pacman.d/mirrorlist$|Include = /etc/pacman.d/de-p1st-mirrorlist|; sed 's|^#\s*Include\s*=\s*/etc/pacman.d/mirrorlist$|#Include = /etc/pacman.d/de-p1st-mirrorlist|'

From bc295b3447a641eae75e26bc681957daef2e67bc Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 16:12:36 +0200
Subject: [PATCH 23/25] fix

---
 pkg/de-p1st-pacman-mirrorlist/PKGBUILD               | 2 +-
 pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
index 3061e17..ac73dd1 100644
--- a/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
+++ b/pkg/de-p1st-pacman-mirrorlist/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=pacman-mirrorlist
 _reponame=arch-pkg
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.4
+pkgver=0.0.5
 pkgrel=1
 pkgdesc="selected Arch Linux mirrors"
 arch=('any')
diff --git a/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript b/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript
index e3571aa..142356d 100644
--- a/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript
+++ b/pkg/de-p1st-pacman-mirrorlist/pacman.conf.holoscript
@@ -3,4 +3,4 @@
 # stdout: modified config
 
 # replace all occurrences of "mirrorlist" with "de-p1st-mirrorlist"
-sed 's|^Include\s*=\s*/etc/pacman.d/mirrorlist$|Include = /etc/pacman.d/de-p1st-mirrorlist|; sed 's|^#\s*Include\s*=\s*/etc/pacman.d/mirrorlist$|#Include = /etc/pacman.d/de-p1st-mirrorlist|'
+sed 's|^Include\s*=\s*/etc/pacman.d/mirrorlist$|Include = /etc/pacman.d/de-p1st-mirrorlist|; s|^#\s*Include\s*=\s*/etc/pacman.d/mirrorlist$|#Include = /etc/pacman.d/de-p1st-mirrorlist|'

From d67cd74d9a8b51a9c830d957fda0c84fb91587ec Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 21:04:58 +0200
Subject: [PATCH 24/25] include pacman config in base

---
 pkg/de-p1st-base-efi/PKGBUILD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/de-p1st-base-efi/PKGBUILD b/pkg/de-p1st-base-efi/PKGBUILD
index a7a8720..92c6ee1 100644
--- a/pkg/de-p1st-base-efi/PKGBUILD
+++ b/pkg/de-p1st-base-efi/PKGBUILD
@@ -13,6 +13,8 @@ groups=()
 depends=('base' 'base-devel' 'linux-firmware' 'man-db' 'man-pages' 'nano' 'usbutils')
 # metapackage for 'linux' and 'linux-headers'
 depends+=('de-p1st-kernel')
+# pacman config
+depends+=('de-p1st-pacman')
 # metapackage for microcode
 depends+=('de-p1st-ucode') !! TODO !!
 

From 8d2b183b4a11c0fcef7b2e0cf971fcf5ee3ede1d Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Thu, 22 Apr 2021 21:07:47 +0200
Subject: [PATCH 25/25] update readme

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 91a2041..2e11783 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,10 @@ install -Dm644 $src $pkgdir/$dst
 
 ### changing existing config files
 
-**TODO**: holo AUR package
+* `holo` from the AUR
+* https://github.com/holocm/holo/blob/master/doc/holo-files.8.pod
+
+Example: [pkg/de-p1st-pacman/PKGBUILD](pkg/de-p1st-pacman/PKGBUILD)
 
 ### home skeleton