more packages

5 files changed, 20 insertions, 14 deletions

diff --git a/files/etc/cron.d/poudriere.pkg_server b/files/etc/cron.d/poudriere.pkg_repository
index 57d9dac..57d9dac 100644
--- a/files/etc/cron.d/poudriere.pkg_server
+++ b/files/etc/cron.d/poudriere.pkg_repository
diff --git a/files/usr/local/etc/poudriere.d/make.conf.pkg_repository b/files/usr/local/etc/poudriere.d/make.conf.pkg_repository
index 3e612a0..7e78bbc 100644
--- a/files/usr/local/etc/poudriere.d/make.conf.pkg_repository
+++ b/files/usr/local/etc/poudriere.d/make.conf.pkg_repository
@@ -30,6 +30,7 @@ editors_libreoffice_SET=KF5 PDFIUM
 editors_vim_SET=CTAGS_EXUBERANT XTERM_SAVE
 editors_vim_UNSET=CTAGS_BASE
 finance_gnucash_UNSET=AQBANKING
+graphics_digikam_SET=AUTOTAGS FACEDETECT
 graphics_vips_UNSET=MATIO
 irc_znc_SET=CYRUS
 lang_lua53_SET=LIBEDIT_DL
@@ -42,12 +43,14 @@ mail_mutt_UNSET=HTML
 mail_postfix_SET=LDAP SASL SASLKRB5
 mail_rspamd_SET=HYPERSCAN
 misc_kdeutils_UNSET=KFLOPPY KTEATIME
-multimedia_audacious_plugins_SET=LAME
+multimedia_audacious-plugins_SET=LAME SNDIO
+multimedia_audacious-plugins_UNSET=OSS
 multimedia_ffmpeg_SET=OPENSSL
 multimedia_ffmpeg_UNSET=GNUTLS
 multimedia_kdemultimedia_UNSET=KDENLIVE
 multimedia_pipewire_UNSET=JACK
-multimedia_qt6-multimedia_SET=ALSA
+multimedia_qt5-multimedia_SET=PULSEAUDIO ALSA
+multimedia_qt6-multimedia_SET=PULSEAUDIO ALSA
 multimedia_vlc_SET=FLAC MPEG2 X264 X265 VPX DCA FAAD AOM
 multimedia_webcamd_UNSET=DVB INPUT RADIO
 net-im_dino_UNSET=RTP
diff --git a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
index 4298943..883a88d 100644
--- a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
+++ b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
@@ -5,7 +5,7 @@ archivers/unzip
 archivers/zip
 audio/elisa
 audio/juk
-audio/kid3
+audio/kid3@kf5
 audio/kmix
 audio/virtual_oss
 converters/php${php_version}-iconv
@@ -40,6 +40,7 @@ finance/gnucash
 finance/kmymoney
 ftp/php${php_version}-curl
 graphics/ImageMagick7@nox11
+graphics/digikam
 graphics/drm-kmod
 graphics/p5-Image-ExifTool
 graphics/php${php_version}-exif
diff --git a/scripts/hostname/nfs1/30-autofs b/scripts/hostname/nfs1/30-autofs
index 0393acc..fe3a468 100644
--- a/scripts/hostname/nfs1/30-autofs
+++ b/scripts/hostname/nfs1/30-autofs
@@ -13,13 +13,6 @@ objectClass: automountMap
 automountMapName: auto_home
 EOF
 
-# auto_home: *
-ldap_add "automountKey=*,automountMapName=auto_home,${automount_basedn}" <<EOF
-objectClass: automount
-automountKey: *
-automountInformation: ${fqdn}:/user/&/priv
-EOF
-
 # /nfs/user: auto_user
 ldap_add "automountKey=/nfs/user,automountMapName=auto_master,${automount_basedn}" <<EOF
 objectClass: automount
@@ -32,6 +25,7 @@ automountMapName: auto_user
 EOF
 
 # auto_user: $user/{pub,priv}
+# auto_home: $user
 for userquota in ${nfs_homedirs:-}; do
   user=$(echo "$userquota" | awk -F: '{print $1}')
   ldap_add "automountKey=${user},automountMapName=auto_user,${automount_basedn}" <<EOF
@@ -39,6 +33,11 @@ objectClass: automount
 automountKey: ${user}
 automountInformation: /priv ${fqdn}:/user/&/priv /pub ${fqdn}:/user/&/pub
 EOF
+  ldap_add "automountKey=${user},automountMapName=auto_home,${automount_basedn}" <<EOF
+objectClass: automount
+automountKey: ${user}
+automountInformation: ${fqdn}:/user/&/priv
+EOF
 done
 
 # /nfs/group: auto_group
diff --git a/vars/hostclass/desktop b/vars/hostclass/desktop
index 8945ebb..6c2e45f 100644
--- a/vars/hostclass/desktop
+++ b/vars/hostclass/desktop
@@ -36,8 +36,10 @@ neofetch
 noto-basic
 noto-emoji
 password-store
+postgresql16-client
 pulseaudio
 py${python_version}-pip
+rsync
 signal-desktop
 sndio
 stow
@@ -55,15 +57,16 @@ wireguard-tools
 xorg"
 
 desktop_kde_packages="
-audacious
-audacious-plugins
+audacious-qt5
+audacious-plugins-qt5
+digikam
 dino
+elisa
 gajim
 gtksourceview4
-juk
 k3b
 kde5
-kid3-qt6
+kid3-kf5
 kmix
 konversation
 py${python_version}-omemo-dr