From b13bd329227c0aa0fb44c9c0e087c340820ab5aa Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Sat, 1 May 2021 15:08:40 +0200
Subject: [PATCH] update de-p1st-base-efi

---
 pkg/de-p1st-base-efi/PKGBUILD              | 34 +++++++++++++++-------
 pkg/de-p1st-installer/de-p1st-installer.sh |  6 ++++
 pkg/de-p1st-kernel-lts/PKGBUILD            | 17 -----------
 pkg/de-p1st-kernel/PKGBUILD                | 17 -----------
 4 files changed, 30 insertions(+), 44 deletions(-)
 delete mode 100644 pkg/de-p1st-kernel-lts/PKGBUILD
 delete mode 100644 pkg/de-p1st-kernel/PKGBUILD

diff --git a/pkg/de-p1st-base-efi/PKGBUILD b/pkg/de-p1st-base-efi/PKGBUILD
index b814574..0158df6 100644
--- a/pkg/de-p1st-base-efi/PKGBUILD
+++ b/pkg/de-p1st-base-efi/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=base-efi
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.5
+pkgver=0.1.1
 pkgrel=1
 pkgdesc="Arch Linux base packages"
 arch=('any')
@@ -10,17 +10,22 @@ url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 groups=()
 
+
 depends=('base' 'meta-group-base-devel' 'linux-firmware' 'man-db' 'man-pages' 'de-p1st-nano')
-# metapackage for 'linux' and 'linux-headers'
-depends+=('de-p1st-kernel')
-# pacman config
-depends+=('de-p1st-pacman')
-# metapackage for microcode
-# depends+=('de-p1st-ucode') # !! TODO !!
+# filesystems: luks, btrfs, ext4, f2fs
+depends+=('lvm2' 'btrfs-progs' 'e2fsprogs' 'f2fs-tools')
+# filesystems: exfat support
+depends+=('fuse-exfat' 'exfat-utils')
+# filesystems: ntfs write support
+depends+=('ntfs-3g')
 # bootmanager
 depends+=('de-p1st-grub' 'efibootmgr')
+# pacman config
+depends+=('de-p1st-pacman')
+# sudo itself is part of base-devel, but sudo configuration is not ;)
+depends+=('de-p1st-sudo')
 # shell
-depends+=('zsh' 'grml-zsh-config')
+depends+=('zsh' 'zsh-completions' 'grml-zsh-config')
 # virtual console keyboard config
 depends+=('de-p1st-keyboard')
 # networking
@@ -28,14 +33,23 @@ depends+=('de-p1st-networkmanager' 'de-p1st-dns')
 # gnupg
 depends+=('de-p1st-gnupg')
 
-
+# task manager
+depends+=('htop')
 # fonts
 depends+=('noto-fonts' 'ttf-material-design-icons-git' 'ttf-unifont')
 
 # other
 # depends+=('usbutils')
 
-optdepends=()
+
+# Default Kernel
+optdepends=('linux' 'linux-headers')
+# or LTS Kernel
+optdepends+=('linux-lts' 'linux-lts-headers')
+# CPU vendor specific microcode
+optdepends+=('amd-ucode' 'intel-ucode')
+
+
 provides=()
 conflicts=()
 replaces=()
diff --git a/pkg/de-p1st-installer/de-p1st-installer.sh b/pkg/de-p1st-installer/de-p1st-installer.sh
index 64f8580..74bac6b 100755
--- a/pkg/de-p1st-installer/de-p1st-installer.sh
+++ b/pkg/de-p1st-installer/de-p1st-installer.sh
@@ -166,6 +166,12 @@ function main() {
   # TODO: use FS_DEFAULT_MOUNT_OPTIONS and FS_MOUNT_OPTIONS in combination
   mount "$DATA_PART" /mnt || return $?
   mkdir /mnt/boot && mount "$BOOT_PART" /mnt/boot || return $?
+
+
+  # TODO: testing
+  #   if bios type is bios then ... :/
+  #   amd/intel-ucode
+  pacstrap /mnt "${KERNEL}" "${KERNEL}-headers" de-p1st-base-efi
 }
 
 main "$@"
diff --git a/pkg/de-p1st-kernel-lts/PKGBUILD b/pkg/de-p1st-kernel-lts/PKGBUILD
deleted file mode 100644
index ee505aa..0000000
--- a/pkg/de-p1st-kernel-lts/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maintainer: Daniel Langbein <daniel@systemli.org>
-_pkgname=kernel-lts
-_reponame=arch
-pkgname="de-p1st-$_pkgname"
-pkgver=0.0.1
-pkgrel=2
-pkgdesc="linux-lts and linux-lts-headers"
-arch=('any')
-url="https://codeberg.org/privacy1st/${_reponame}"
-license=('MIT')
-groups=()
-depends=('linux-lts' 'linux-lts-headers')
-optdepends=()
-provides=('de-p1st-kernel')
-conflicts=()
-replaces=()
-changelog=
diff --git a/pkg/de-p1st-kernel/PKGBUILD b/pkg/de-p1st-kernel/PKGBUILD
deleted file mode 100644
index d8425bc..0000000
--- a/pkg/de-p1st-kernel/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maintainer: Daniel Langbein <daniel@systemli.org>
-_pkgname=kernel
-_reponame=arch
-pkgname="de-p1st-$_pkgname"
-pkgver=0.0.1
-pkgrel=2
-pkgdesc="linux and linux-headers"
-arch=('any')
-url="https://codeberg.org/privacy1st/${_reponame}"
-license=('MIT')
-groups=()
-depends=('linux' 'linux-headers')
-optdepends=()
-provides=() # implicitly provides $pkgname
-conflicts=()
-replaces=()
-changelog=