From 5db97bc597715a411b941fbc3e85738f612b6ada Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Tue, 22 Jun 2021 12:29:50 +0200 Subject: [PATCH] add de-p1st-zoom --- build-pkg/pkglist-AUR.txt | 4 ++-- build-pkg/pkglist-de-p1st.txt | 2 +- notes.md | 22 +++++++++++++--------- pkg/de-p1st-installer/PKGBUILD | 2 +- pkg/de-p1st-installer/example-vbox.cfg | 6 +++--- pkg/de-p1st-zoom/.install | 15 +++++++++++++++ pkg/de-p1st-zoom/PKGBUILD | 23 +++++++++++++++++++++++ pkg/de-p1st-zoom/Zoom.desktop.holoscript | 5 +++++ 8 files changed, 63 insertions(+), 16 deletions(-) create mode 100644 pkg/de-p1st-zoom/.install create mode 100644 pkg/de-p1st-zoom/PKGBUILD create mode 100644 pkg/de-p1st-zoom/Zoom.desktop.holoscript diff --git a/build-pkg/pkglist-AUR.txt b/build-pkg/pkglist-AUR.txt index c8f78b2..b2d4879 100644 --- a/build-pkg/pkglist-AUR.txt +++ b/build-pkg/pkglist-AUR.txt @@ -1,3 +1,3 @@ -adwaita-qt aurutils balena-etcher calindori-git chili-sddm-theme chromaprint-fftw crema davs2 decklink-sdk discord_arch_electron firefox-profile-switcher-connector flite1-patched gnome-meta gnome-shell-extension-appindicator-git handbrake-full holo iio-sensor-proxy-git intellij-idea-ultimate-edition jellyfin-bin kirigami-addons-git lensfun-git libklvanc-git libopenmpt-svn librist libwacom-surface mauikit-git meta-group-base-devel mkcue mozilla-common mugshot ncurses5-compat-libs nextcloud-client-git nordic-kde-git opencl-amd openh264 portfolio-file-manager pycharm-professional pyspread python-mpv qt4 qt-installer-framework sddm-theme-deepin-git shine signal-desktop-beta-bin softmaker-office-2021-bin sphinxbase tagspaces-bin timeshift ttf-material-design-icons-git ttf-unifont uavs3d uavs3d-git umldesigner vo-amrwbenc vobcopy vulkan-amdgpu-pro vulkan-headers-git wkhtmltopdf-static woeusb x264-git xavs xavs2 xfce4-meta xfce4-theme-switcher xorg-meta xournalpp-git yay zotero -adwaita-qt4 fedora-firefox-wayland-bin kclock pocketsphinx riseup-vpn youplay +adwaita-qt aurutils balena-etcher calindori-git chili-sddm-theme chromaprint-fftw crema davs2 decklink-sdk discord_arch_electron firefox-profile-switcher-connector flite1-patched gnome-meta gnome-shell-extension-appindicator-git handbrake-full holo iio-sensor-proxy-git intellij-idea-ultimate-edition jellyfin-bin kirigami-addons-git lensfun-git libklvanc-git libopenmpt-svn librist libwacom-surface mauikit-git meta-group-base-devel mkcue mozilla-common mugshot ncurses5-compat-libs nextcloud-client-git nordic-kde-git opencl-amd openh264 portfolio-file-manager pycharm-professional pyspread python-mpv qt4 qt-installer-framework sddm-theme-deepin-git shine signal-desktop-beta-bin softmaker-office-2021-bin sphinxbase tagspaces-bin timeshift ttf-material-design-icons-git ttf-unifont uavs3d uavs3d-git umldesigner vo-amrwbenc vobcopy vulkan-amdgpu-pro vulkan-headers-git wkhtmltopdf-static woeusb x264-git xavs xavs2 xfce4-meta xfce4-theme-switcher xorg-meta xournalpp-git yay zoom zotero +adwaita-qt4 fedora-firefox-wayland-bin kclock pocketsphinx riseup-vpn youplay zoom-firejail ffmpeg-amd-full diff --git a/build-pkg/pkglist-de-p1st.txt b/build-pkg/pkglist-de-p1st.txt index de0682c..e042737 100644 --- a/build-pkg/pkglist-de-p1st.txt +++ b/build-pkg/pkglist-de-p1st.txt @@ -1,4 +1,4 @@ -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-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-base de-p1st-xfce4 diff --git a/notes.md b/notes.md index 61d368f..1b6965f 100644 --- a/notes.md +++ b/notes.md @@ -101,10 +101,7 @@ $ sudo pacman -S de-p1st-test Enter a number (default=1): ``` -## TODOs - -* How does Pacman pick the default option? Are packages simply - ordered alphabetically? +## TODOs (Ordered by priority) * split up the "base" package: * base-headless (no fonts required) @@ -112,14 +109,21 @@ Enter a number (default=1): * remove "de-p1st-grub" from base * just one "base" package for both: BIOS and (U)EFI installation! -* installer: support BIOS boot mode -* installer: Option to disable full disk encryption +* installer: support BIOS boot mode? Or drop BIOS support? +* installer: systemd-boot as alternative to GRUB? + * https://wiki.archlinux.org/title/systemd-boot * for each PKG: built with docker then sign wit pgp * signed package db -* build for multiple architectures - * https://ownyourbits.com/2018/06/27/running-and-building-arm-docker-containers-in-x86/ - * https://ownyourbits.com/2018/06/27/running-and-building-arm-docker-containers-in-x86/#comment-19124 + +* installer: Option to disable full disk encryption + +* How does Pacman pick the default option? Are packages simply + ordered alphabetically? * de-p1st-pacman -> ungoogled-chromium * https://github.com/ungoogled-software/ungoogled-chromium-archlinux#open-build-service-repository + +* build for multiple architectures + * https://ownyourbits.com/2018/06/27/running-and-building-arm-docker-containers-in-x86/ + * https://ownyourbits.com/2018/06/27/running-and-building-arm-docker-containers-in-x86/#comment-19124 diff --git a/pkg/de-p1st-installer/PKGBUILD b/pkg/de-p1st-installer/PKGBUILD index 636c4c6..a485366 100644 --- a/pkg/de-p1st-installer/PKGBUILD +++ b/pkg/de-p1st-installer/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=installer _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.1.15 +pkgver=0.1.16 pkgrel=1 pkgdesc="Bash script to install Arch Linux" arch=('any') diff --git a/pkg/de-p1st-installer/example-vbox.cfg b/pkg/de-p1st-installer/example-vbox.cfg index fb6a39f..b3c786f 100644 --- a/pkg/de-p1st-installer/example-vbox.cfg +++ b/pkg/de-p1st-installer/example-vbox.cfg @@ -34,8 +34,8 @@ PACSTRAP_INTERACTIVE=1 ############## ADDITIONAL_PKGS from here on ############## ADDITIONAL_PKGS=() -# Specify the preferred providers for initramfs, de-p1st-kernel, de-p1st-ucode -ADDITIONAL_PKGS+=('mkinitcpio' 'de-p1st-kernel-lts' 'de-p1st-ucode-placeholder') +# Specify the preferred providers for initramfs, de-p1st-kernel, de-p1st-ucode, de-p1st-sddm-theme +ADDITIONAL_PKGS+=('mkinitcpio' 'de-p1st-kernel-lts' 'de-p1st-ucode-placeholder' 'de-p1st-sddm-theme-nordic') # VBox guest additions ADDITIONAL_PKGS+=('virtualbox-guest-utils') # XFCE4 desktop with HiDPI @@ -56,7 +56,7 @@ ADDITIONAL_PKGS+=('de-p1st-smartcard') # Other programs -ADDITIONAL_PKGS+=('signal-desktop' 'nextcloud-client' 'keepassxc' 'xournalpp') +ADDITIONAL_PKGS+=('signal-desktop' 'nextcloud-client' 'keepassxc' 'xournalpp' 'zotero') # Development ADDITIONAL_PKGS+=('intellij-idea-ultimate-edition' 'intellij-idea-ultimate-edition-jre') # Document viewer diff --git a/pkg/de-p1st-zoom/.install b/pkg/de-p1st-zoom/.install new file mode 100644 index 0000000..b754ef5 --- /dev/null +++ b/pkg/de-p1st-zoom/.install @@ -0,0 +1,15 @@ +## arg 1: the new package version +post_install() { + holo apply +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + holo apply +} + +## arg 1: the old package version +post_remove() { + holo apply +} diff --git a/pkg/de-p1st-zoom/PKGBUILD b/pkg/de-p1st-zoom/PKGBUILD new file mode 100644 index 0000000..668c03a --- /dev/null +++ b/pkg/de-p1st-zoom/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Daniel Langbein +_pkgname=zoom +_reponame=arch +pkgname="de-p1st-$_pkgname" +pkgver=0.0.1 +pkgrel=1 +pkgdesc=".desktop to always run Zoom in Firejail" +arch=('any') +url="https://codeberg.org/privacy1st/${_reponame}" +license=('MIT') +depends=('zoom' 'zoom-firejail') +depends+=('holo' 'git' 'base') # holo and its dependencies: git because of git-diff; without base "holo apply" may fail on initial system installation +makedepends=('git') # to fetch source(s) via git +install='.install' +source=("git+${url}.git") +sha256sums=('SKIP') + +package() { + cd "${_reponame}/pkg/${pkgname}" + + # disable "Zoom" desktop entry as one should use "ZoomFirejail" + install -Dm0544 Zoom.desktop.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/usr/share/applications/Zoom.desktop.holoscript +} diff --git a/pkg/de-p1st-zoom/Zoom.desktop.holoscript b/pkg/de-p1st-zoom/Zoom.desktop.holoscript new file mode 100644 index 0000000..ecb540c --- /dev/null +++ b/pkg/de-p1st-zoom/Zoom.desktop.holoscript @@ -0,0 +1,5 @@ +#!/bin/sh +# stdin: default config +# stdout: modified config + +echo "NoDisplay=true"