From 9fae097bc9ddd5509edb39c674c62ccff5bb5376 Mon Sep 17 00:00:00 2001 From: langfingaz Date: Thu, 13 May 2021 15:44:02 +0000 Subject: [PATCH] add htop pkg; fix locale? --- Dockerfile | 5 +++-- LICENSE | 2 +- README.md | 3 +++ build-pkg-docker.sh | 5 ++++- build-pkg.sh | 5 +---- pkg/de-p1st-base/PKGBUILD | 2 +- pkg/de-p1st-htop/PKGBUILD | 20 +++++++++++++++++++ pkg/de-p1st-htop/htoprc | 39 +++++++++++++++++++++++++++++++++++++ pkg/de-p1st-locale/PKGBUILD | 5 +++-- prototype/proto.PKGBUILD | 2 +- 10 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 pkg/de-p1st-htop/PKGBUILD create mode 100644 pkg/de-p1st-htop/htoprc diff --git a/Dockerfile b/Dockerfile index 2845bf2..17fb989 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ -# https://github.com/ungoogled-software/ungoogled-chromium-archlinux/blob/master/.github/workflows/build/Dockerfile -# https://github.com/WhyNotHugo/docker-makepkg/blob/main/Dockerfile +# Inspiration: +# * https://github.com/ungoogled-software/ungoogled-chromium-archlinux/blob/master/.github/workflows/build/Dockerfile +# * https://github.com/WhyNotHugo/docker-makepkg/blob/main/Dockerfile FROM archlinux:base-devel diff --git a/LICENSE b/LICENSE index 9bbfa12..2ffa165 100644 --- a/LICENSE +++ b/LICENSE @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THE SOFTWARE. diff --git a/README.md b/README.md index 6d35450..8255e05 100644 --- a/README.md +++ b/README.md @@ -84,3 +84,6 @@ $ sudo pacman -S de-p1st-test Enter a number (default=1): ``` + +**TODO**: How does Pacman pick the default option? Are packages simply +ordered alphabetically? \ No newline at end of file diff --git a/build-pkg-docker.sh b/build-pkg-docker.sh index ce0a6c0..0cf7635 100755 --- a/build-pkg-docker.sh +++ b/build-pkg-docker.sh @@ -50,8 +50,11 @@ function main() { # build-pkg "${PKG}" || return $? # done + # Stage0: Take special care of package de-p1st-locale + # TODO + # Stage1 - build-and-push xorg-meta de-p1st-systemd de-p1st-sudo de-p1st-screen 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-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $? + build-and-push xorg-meta 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-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $? # Stage2 build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns || return $? # Stage3 diff --git a/build-pkg.sh b/build-pkg.sh index 80f0ffb..b58ea08 100755 --- a/build-pkg.sh +++ b/build-pkg.sh @@ -74,10 +74,7 @@ function main() { build-pkg "$PKG" || return $? done else - # No arguments given - # -> build in specified order EXCEPT de-p1st-locale - - build-pkg xorg-meta de-p1st-systemd de-p1st-sudo de-p1st-screen 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-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $? + build-pkg xorg-meta 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-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $? push-pkg || return $? build-pkg de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns || return $? diff --git a/pkg/de-p1st-base/PKGBUILD b/pkg/de-p1st-base/PKGBUILD index 8ebd515..f469d14 100644 --- a/pkg/de-p1st-base/PKGBUILD +++ b/pkg/de-p1st-base/PKGBUILD @@ -43,7 +43,7 @@ depends+=('de-p1st-networkmanager' 'de-p1st-dns') depends+=('de-p1st-gnupg') # task manager -depends+=('htop') +depends+=('de-p1st-htop') # fonts depends+=('de-p1st-font') diff --git a/pkg/de-p1st-htop/PKGBUILD b/pkg/de-p1st-htop/PKGBUILD new file mode 100644 index 0000000..06a2cdf --- /dev/null +++ b/pkg/de-p1st-htop/PKGBUILD @@ -0,0 +1,20 @@ +# Maintainer: Daniel Langbein +_pkgname=nano +_reponame=arch +pkgname="de-p1st-$_pkgname" +pkgver=0.0.1 +pkgrel=1 +pkgdesc="htop with configuration" +arch=('any') +url="https://codeberg.org/privacy1st/${_reponame}" +license=('MIT') +depends=('htop') +makedepends=('git') +source=("git+${url}.git") +sha256sums=('SKIP') + +package() { + cd "${_reponame}/pkg/${pkgname}" + + install -m0644 htoprc "$pkgdir"/etc/htoprc +} diff --git a/pkg/de-p1st-htop/htoprc b/pkg/de-p1st-htop/htoprc new file mode 100644 index 0000000..b3e0879 --- /dev/null +++ b/pkg/de-p1st-htop/htoprc @@ -0,0 +1,39 @@ +# When changing settings inside htop, the file ~/.config/htop/htoprc +# will be created and used in favour of this one. +fields=0 48 17 18 38 39 40 2 46 47 49 1 +sort_key=46 +sort_direction=1 +tree_sort_key=0 +tree_sort_direction=1 +hide_kernel_threads=1 +hide_userland_threads=0 +shadow_other_users=0 +show_thread_names=0 +show_program_path=1 +highlight_base_name=0 +highlight_megabytes=1 +highlight_threads=1 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 +tree_view=0 +tree_view_always_by_pid=0 +header_margin=1 +detailed_cpu_time=0 +cpu_count_from_one=0 +show_cpu_usage=1 +show_cpu_frequency=1 +show_cpu_temperature=0 +degree_fahrenheit=0 +update_process_names=0 +account_guest_in_cpu_meter=0 +color_scheme=0 +enable_mouse=1 +delay=15 +left_meters=LeftCPUs2 Memory Swap DiskIO +left_meter_modes=1 1 1 2 +right_meters=RightCPUs2 Tasks LoadAverage Uptime +right_meter_modes=1 2 2 2 +hide_function_bar=0 \ No newline at end of file diff --git a/pkg/de-p1st-locale/PKGBUILD b/pkg/de-p1st-locale/PKGBUILD index 99af669..76236fc 100644 --- a/pkg/de-p1st-locale/PKGBUILD +++ b/pkg/de-p1st-locale/PKGBUILD @@ -2,14 +2,15 @@ _pkgname=locale _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.7 -pkgrel=2 +pkgver=0.0.8 +pkgrel=1 pkgdesc="locale and timezone" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') depends=('holo') makedepends=('git') +backup=('etc/locale.conf') install='.install' source=("git+${url}.git") sha256sums=('SKIP') diff --git a/prototype/proto.PKGBUILD b/prototype/proto.PKGBUILD index f10e0ce..695b273 100644 --- a/prototype/proto.PKGBUILD +++ b/prototype/proto.PKGBUILD @@ -15,7 +15,7 @@ optdepends=() provides=() conflicts=() replaces=() -backup=() +backup=() # Use relative paths without leading slash options=() install= changelog=