diff --git a/pkg/de-p1st-installer/example-vbox.cfg b/pkg/de-p1st-installer/example-vbox.cfg index ebb3ee3..c648429 100644 --- a/pkg/de-p1st-installer/example-vbox.cfg +++ b/pkg/de-p1st-installer/example-vbox.cfg @@ -25,7 +25,8 @@ CPU_VENDOR=autodetect BIOS_TYPE=uefi # If set to "1", then the data, boot and luks partitions -# will be left mounted/opened after installation +# will be left mounted/opened for manual inspection +# after the installation LEAVE_MOUNTED=1 PACSTRAP_INTERACTIVE=1 @@ -41,12 +42,13 @@ ADDITIONAL_PKGS=() ADDITIONAL_PKGS+=('mkinitcpio' 'de-p1st-kernel-lts' 'de-p1st-ucode-placeholder' 'virtualbox-guest-utils') # # XFCE4 desktop with HiDPI -ADDITIONAL_PKGS+=('de-p1st-gpu-generic' 'de-p1st-xfce4-hidpi' 'de-p1st-sddm-autologin-yoda' 'de-p1st-sddm-tablet') +ADDITIONAL_PKGS+=('de-p1st-gpu-generic' 'de-p1st-xfce4-hidpi' 'de-p1st-sddm-tablet') # # smartcard ADDITIONAL_PKGS+=('de-p1st-smartcard') # other programs -ADDITIONAL_PKGS+=('signal-desktop' 'nextcloud-client' 'keepassxc' 'xournalpp' 'intellij-idea-ultimate-edition' 'intellij-idea-ultimate-edition-jre') +ADDITIONAL_PKGS+=('signal-desktop' 'nextcloud-client' 'keepassxc' 'xournalpp') +ADDITIONAL_PKGS+=('intellij-idea-ultimate-edition' 'intellij-idea-ultimate-edition-jre') # gallery / image viewer ADDITIONAL_PKGS+=('nomacs' 'qt5-imageformats') # diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD index 6d7f0e1..8d511cf 100644 --- a/pkg/de-p1st-pacman/PKGBUILD +++ b/pkg/de-p1st-pacman/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=pacman _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.1.0 +pkgver=0.1.1 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 3aa8352..ad53ac8 100644 --- a/pkg/de-p1st-pacman/pacman.conf.holoscript +++ b/pkg/de-p1st-pacman/pacman.conf.holoscript @@ -1,5 +1,9 @@ #!/bin/sh # stdin: default config # stdout: modified config -cat + +# Enable parallel downloads +sed 's|^#ParallelDownloads\s*=.*$|ParallelDownloads = 4|' + +# Include de-p1st mirror echo 'Include = /etc/pacman.d/de-p1st' diff --git a/pkg/de-p1st-xfce4-hidpi/PKGBUILD b/pkg/de-p1st-xfce4-hidpi/PKGBUILD index bb6443d..7e5e14d 100644 --- a/pkg/de-p1st-xfce4-hidpi/PKGBUILD +++ b/pkg/de-p1st-xfce4-hidpi/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=xfce4-hidpi _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.5 +pkgver=0.0.6 pkgrel=1 pkgdesc="HiDPI for XFCE4" arch=('any') @@ -19,8 +19,9 @@ package() { cd "${_reponame}/pkg/${pkgname}" install -Dm0544 xsettings.xml.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml.holoscript + install -Dm0544 thunar.xml.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar.xml.holoscript install -Dm0644 99_hidpi.sh "$pkgdir"/etc/profile.d/99_hidpi.sh - install -Dm0644 p1st-hidpi.conf "$pkgdir"/etc/sddm.conf.d/p1st-hidpi.conf + install -Dm0644 p1st-hidpi.conf "$pkgdir"/etc/sddm.conf.d/p1st-hidpi.conf } diff --git a/pkg/de-p1st-xfce4-hidpi/TESTED b/pkg/de-p1st-xfce4-hidpi/TESTED index 2b653b2..ab208d9 100644 --- a/pkg/de-p1st-xfce4-hidpi/TESTED +++ b/pkg/de-p1st-xfce4-hidpi/TESTED @@ -1,3 +1,6 @@ WindowScalingFactor 99_hidpi.sh -> QT_AUTO_SCREEN_SCALE_FACTOR and QT_FONT_DPI -sddm HiDpi \ No newline at end of file +sddm HiDpi + +TODO: cursor size 32 +TODO: thunar settings \ No newline at end of file diff --git a/pkg/de-p1st-xfce4-hidpi/thunar.xml.holoscript b/pkg/de-p1st-xfce4-hidpi/thunar.xml.holoscript new file mode 100644 index 0000000..cbb4f7c --- /dev/null +++ b/pkg/de-p1st-xfce4-hidpi/thunar.xml.holoscript @@ -0,0 +1,9 @@ +#!/bin/sh +# stdin: default config +# stdout: modified config + +# Decrease size +sed ' + s|||; + s|||; + ' <<< "$stdin" diff --git a/pkg/de-p1st-xfce4-hidpi/xsettings.xml.holoscript b/pkg/de-p1st-xfce4-hidpi/xsettings.xml.holoscript index 96f4b3e..59fc2fa 100644 --- a/pkg/de-p1st-xfce4-hidpi/xsettings.xml.holoscript +++ b/pkg/de-p1st-xfce4-hidpi/xsettings.xml.holoscript @@ -2,5 +2,18 @@ # stdin: default config # stdout: modified config -# Double Windows Scaling Factor -sed 's|||' +# save stdin in variable +stdin=$(cat) + +# assert WindowScalingFactor is as expected +echo "$stdin" | grep --quiet '' + +# assert CursorThemeSize is as expected +echo "$stdin" | grep --quiet '' + +# 1. Double WindowScalingFactor +# 2.Increase cursor size to 32 +sed ' + s|||; + s|||; + ' <<< "$stdin" diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD index 4d7ba41..28b2aea 100644 --- a/pkg/de-p1st-xfce4/PKGBUILD +++ b/pkg/de-p1st-xfce4/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=xfce4 _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.17 +pkgver=0.0.18 pkgrel=1 pkgdesc="XFCE4 with configuration" arch=('any') @@ -76,18 +76,7 @@ package() { # (It will not be copied to ~/.config/xfce4/xfconf/xfce-perchannel-xml/*.xml) # Thus we place it in the skeleton for new users! - # === higher screen resolution in a VM === - # config/xfce4/xfconf/xfce4-perchannel-xml/displays.xml - # === desktop === - # config/xfce4/xfconf/xfce4-perchannel-xml/xfce4-desktop.xml - # === workspaces === - # config/xfce4/xfconf/xfce4-perchannel-xml/xfwm4.xml - # === panel === - # config/xfce4/xfconf/xfce4-perchannel-xml/xfce4-panel.xml - # config/xfce4/panel/launcher-8/16218680691.desktop - # === Whisker Menu === - # config/xfce4/panel/whiskermenu-7.rc - # + # See comments in individual files in directory "config" mkdir -p "$pkgdir"/etc/skel/ cp -ra config "$pkgdir"/etc/skel/.config diff --git a/pkg/de-p1st-xfce4/TESTED b/pkg/de-p1st-xfce4/TESTED index 53ca525..eafdb5c 100644 --- a/pkg/de-p1st-xfce4/TESTED +++ b/pkg/de-p1st-xfce4/TESTED @@ -1,8 +1,16 @@ -.face shown in Whisker Menu -desktop-icons on primary display is set to "true" -2 workspaces (instead of 4) -"screenshot" launcher works -lower (2nd) panel removed +Whisker Menu: +-> .face shown as user icon +-> Firefox as favourite top right -TODO: Whisker Menu: Favourite: Firefox -TODO: depend on "de-p1st-wallpaper" and use this for xfce +desktop-icons on primary display is set to "true" + +Panel1: +-> 2 workspaces (instead of 4) +-> "screenshot" launcher works + +Panel2: +-> lower (2nd) panel removed + +TODO: power manager settings +TODO: wallpaper +TODO: thunar settings \ No newline at end of file diff --git a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml new file mode 100644 index 0000000..22667b8 --- /dev/null +++ b/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 8a84c88..30980d0 100644 --- a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -3,10 +3,21 @@ - + when using HiDPI --> + + + + + + + + + + + \ No newline at end of file diff --git a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml new file mode 100644 index 0000000..9c4c39b --- /dev/null +++ b/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml @@ -0,0 +1,10 @@ + + + + + + + + + +