12 files changed, 269 insertions, 12 deletions

diff --git a/auto/config b/auto/config
index e0fb4cd..ecb7f73 100755
--- a/auto/config
+++ b/auto/config
@@ -48,7 +48,7 @@ bullseye)
         KSECURITY="true"
 	;;
 *)
-        KDEBOOTSTRAPOPTIONS="--include=apt-transport-https,ca-certificates,gpg,gpg-agent,mime-support --exclude=nano"
+        KDEBOOTSTRAPOPTIONS="--include=apt-transport-https,ca-certificates,gpg,gpg-agent,mailcap,media-types --exclude=nano"
 	;;
 esac
 
@@ -124,12 +124,21 @@ bullseye)
 	esac
 	;;
 bookworm)
-    LB_REPOSITORIES+="slowfire acritoxinstaller-qt4"
+    LB_REPOSITORIES+="acritoxinstaller-qt4 slowfire"
 	case $LB_ARCHITECTURE in
 	amd64) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="amd64";;
 	i386)  LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="686-pae";;
 	esac
 	;;
+trixie)
+    LB_REPOSITORIES+="acritoxinstaller-qt4 towelfire"
+	case $LB_ARCHITECTURE in
+	amd64) LB_LINUX_PACKAGES="linux-image linux-headers"; LB_LINUX_FLAVOURS="amd64";;
+	i386)  LB_REPOSITORIES+=" kernel-pae"
+	       LB_LINUX_PACKAGES="linux-image"; LB_LINUX_FLAVOURS="686-pae";;
+	esac
+	;;
+
 *)
     LB_REPOSITORIES+="spitfire steelfire silverfire speedfire"
 	case $LB_ARCHITECTURE in
diff --git a/config/chroot_local-hooks/03-towelfire-fixes b/config/chroot_local-hooks/03-towelfire-fixes
index e2337d8..5665577 100755
--- a/config/chroot_local-hooks/03-towelfire-fixes
+++ b/config/chroot_local-hooks/03-towelfire-fixes
@@ -42,6 +42,12 @@ cat <<"EOF" >/etc/skel/.gtkrc-2.0
 gtk-theme-name = "Clearlooks-Phenix"
 EOF
 
+# disable apt pager
+echo 'Binary::apt::Pager "false";' > /etc/apt/apt.conf.d/98-nopager
+
+# add scale factor for qt defaults to 100%
+echo "QT_SCALE_FACTOR=1.0" >>/etc/environment
+
 # powermanager fix new values since buster
 
 mkdir -p /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml
diff --git a/config/lists/base b/config/lists/base
index d60c620..207edb6 100644
--- a/config/lists/base
+++ b/config/lists/base
@@ -9,6 +9,8 @@ sudo
 #nif DISTRIBUTION wheezy jessie stretch buster bullseye
 polkitd
 pkexec
+#endif
+#if DISTRIBUTION bookworm
 polkitd-pkla
 #endif
 
@@ -127,7 +129,7 @@ net-tools
 #if DISTRIBUTION wheezy jessie stretch buster bullseye
 #include <printer_driver_old>
 #endif
-#nif DISTRIBUTION wheezy jessie stretch buster bullseye
+#if DISTRIBUTION bookworm
 cups-bsd
 cups-client
 foomatic-db-engine
@@ -136,6 +138,14 @@ printer-driver-gutenprint
 #include <printer_driver_all>
 libcups2
 #endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+cups-bsd
+cups-client
+foomatic-db-engine
+foomatic-db
+#include <printer_driver_all>
+libcups2
+#endif
 #if ARCHITECTURE amd64
 libcups2:i386
 #endif
@@ -144,7 +154,12 @@ libcups2:i386
 module-assistant
 build-essential
 fakeroot
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
 libstdc++5
+#endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+libstdc++6
+#endif
 bzip2
 cdbs
 dkms
@@ -152,7 +167,13 @@ devscripts
 pbuilder
 
 # system
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
 cpufrequtils
+#endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+linux-cpupower
+#endif
+
 #if DISTRIBUTION wheezy jessie stretch buster
 hddtemp
 #endif
@@ -198,9 +219,13 @@ xinit
 #if DISTRIBUTION wheezy jessie stretch
 freerdp-x11
 #endif
-#nif DISTRIBUTION wheezy jessie stretch
+#if DISTRIBUTION buster bullseye bookworm
 freerdp2-x11
 #endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+freerdp3-x11
+#endif
+
 # disktools
 gddrescue
 testdisk
@@ -227,7 +252,13 @@ exfatprogs
 #nif DISTRIBUTION wheezy
 zram
 #endif
+#if DISTRIBUTION squeeze wheezy jessie stretch buster bullseye bookworm
 httpfs2
+#endif
+# support for appimages
+#nif DISTRIBUTION squeeze wheezy jessie stretch buster bullseye bookworm
+libfuse2t64
+#endif
 
 # filesystem tools
 parted
diff --git a/config/lists/kanotix-eeepc4G b/config/lists/kanotix-eeepc4G
index 9d0ea71..67c5806 100644
--- a/config/lists/kanotix-eeepc4G
+++ b/config/lists/kanotix-eeepc4G
@@ -20,6 +20,8 @@ sudo
 #nif DISTRIBUTION wheezy jessie stretch buster bullseye
 polkitd
 pkexec
+#endif
+#if DISTRIBUTION bookworm
 polkitd-pkla
 #endif
 
@@ -128,7 +130,12 @@ cups-client
 module-assistant
 build-essential
 fakeroot
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
 libstdc++5
+#endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+libstdc++6
+#endif
 bzip2
 cdbs
 dkms
@@ -136,7 +143,12 @@ devscripts
 pbuilder
 
 # system
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
 cpufrequtils
+#endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+linux-cpupower
+#endif
 #if DISTRIBUTION wheezy jessie stretch buster
 hddtemp
 #endif
@@ -173,9 +185,12 @@ xinit
 #if DISTRIBUTION wheezy jessie stretch
 freerdp-x11
 #endif
-#nif DISTRIBUTION wheezy jessie stretch
+#if DISTRIBUTION buster bullseye bookworm
 freerdp2-x11
 #endif
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+freerdp3-x11
+#endif
 
 # disktools
 gddrescue
@@ -203,7 +218,13 @@ exfatprogs
 #nif DISTRIBUTION wheezy
 zram
 #endif
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
 httpfs2
+#endif
+# support for appimages
+#nif DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
+libfuse2t64
+#endif
 
 # filesystem tools
 parted
@@ -314,14 +335,14 @@ compton
 
 # multimedia
 #include <smplayer>
-#if DISTRIBUTION squeeze wheezy jessie bookworm
+#if DISTRIBUTION squeeze wheezy jessie bookworm trixie
 exaile
 #endif
-#nif DISTRIBUTION squeeze wheezy jessie bookworm
+#nif DISTRIBUTION squeeze wheezy jessie bookworm trixie
 clementine
 #endif
 # clementine fix
-#nif DISTRIBUTION wheezy jessie stretch buster bookworm
+#nif DISTRIBUTION wheezy jessie stretch buster bookworm trixie
 libqt5sql5-sqlite
 #endif
 # network
diff --git a/config/lists/kanotix-kde-base b/config/lists/kanotix-kde-base
index 35fdf3a..e680374 100644
--- a/config/lists/kanotix-kde-base
+++ b/config/lists/kanotix-kde-base
@@ -4,9 +4,12 @@
 #if DISTRIBUTION squeeze wheezy jessie
 #include <kde>
 #endif
-#nif DISTRIBUTION squeeze wheezy jessie
+#if DISTRIBUTION stretch buster bullseye bookworm
 #include <kde5>
 #endif
+#nif DISTRIBUTION squeeze wheezy jessie stretch buster bullseye bookworm
+#include <kde6>
+#endif
 #include <kde.kanotix>
 
 # package tool
@@ -20,7 +23,9 @@ apper
 plasma-discover
 #endif
 
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
 apt-xapian-index
+#endif
 
 # multimedia
 #if DISTRIBUTION squeeze wheezy jessie
diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master
index b9f5a7a..c39c9f7 100644
--- a/config/lists/kanotix-kde-master
+++ b/config/lists/kanotix-kde-master
@@ -27,7 +27,9 @@ kaffeine
 
 # graphics
 gimp
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
 gimp-gutenprint
+#endif
 xsane
 #if DISTRIBUTION wheezy jessie stretch
 libsane-extras
diff --git a/config/lists/kanotix-lxde-full b/config/lists/kanotix-lxde-full
index 88a2152..585f947 100644
--- a/config/lists/kanotix-lxde-full
+++ b/config/lists/kanotix-lxde-full
@@ -16,7 +16,9 @@ me-tv
 
 # graphics
 gimp
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
 gimp-gutenprint
+#endif
 xsane
 #if DISTRIBUTION wheezy jessie stretch
 libsane-extras
diff --git a/config/lists/kanotix-lxde-master b/config/lists/kanotix-lxde-master
index f5b98b3..c3b1132 100644
--- a/config/lists/kanotix-lxde-master
+++ b/config/lists/kanotix-lxde-master
@@ -21,18 +21,20 @@ geany
 
 # package tool
 synaptic
+#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm
 apt-xapian-index
+#endif
 gdebi
 
 # multimedia
-#if DISTRIBUTION wheezy jessie bookworm
+#if DISTRIBUTION wheezy jessie bookworm trixie
 exaile
 #endif
-#nif DISTRIBUTION wheezy jessie bookworm
+#nif DISTRIBUTION wheezy jessie bookworm trixie
 clementine
 #endif
 # clementine fix
-#nif DISTRIBUTION wheezy jessie stretch buster bookworm
+#nif DISTRIBUTION wheezy jessie stretch buster bookworm trixie
 libqt5sql5-sqlite
 #endif
 
diff --git a/config/lists/kde6 b/config/lists/kde6
new file mode 100644
index 0000000..957a21f
--- /dev/null
+++ b/config/lists/kde6
@@ -0,0 +1,162 @@
+# Kanotix list for kde6 (up from trixie)
+
+#include <desktop>
+
+#if ARCHITECTURE amd64
+#include <kde6-more>
+#endif
+
+# kanotix stuff
+etcskel-kanotix-kf6
+
+qt6-svg-plugins
+# for flags
+fonts-noto-color-emoji
+
+# office
+okular
+okular-extra-backends
+#if DISTRIBUTION stretch buster
+okularplugin
+#endif
+
+# plugins
+
+# multimedia
+libsdl1.2debian
+kio-audiocd
+kamera
+kio-extras
+
+# burn
+k3b
+k3b-i18n
+#if DISTRIBUTION stretch
+libk3b6-extracodecs
+#endif
+#if DISTRIBUTION buster bullseye
+libk3b7-extracodecs
+#endif
+#nif DISTRIBUTION stretch buster bullseye
+libk3b-extracodecs
+#endif
+# chat, irc
+konversation
+
+# editors
+kate
+
+# archive
+ark
+
+# tools
+#if DISTRIBUTION stretch buster bullseye
+kde-spectacle
+#endif
+#nif DISTRIBUTION stretch buster bullseye
+ksnip
+#endif
+kcalc
+kfind
+qml-module-org-kde-activities
+
+# kde
+# kde-plasma-desktop is a metapackage bump out konquerror etc
+#if DISTRIBUTION stretch buster
+kde-runtime
+#endif
+plasma-desktop
+phonon4qt5-backend-gstreamer
+plasma-workspace
+udisks2
+upower
+
+# kdebase-apps is a metapackage
+#if DISTRIBUTION stretch
+kde-baseapps-bin
+#endif
+#nif DISTRIBUTION stretch
+kdialog
+keditbookmarks
+#endif
+dolphin
+konsole
+kwrite
+
+sddm-theme-kanotix
+onboard
+onboard-kanotix
+systemsettings
+#if DISTRIBUTION stretch buster bullseye bookworm
+libkf5kdelibs4support5-bin
+#endif
+#if DISTRIBUTION stretch buster
+kde-l10n-de
+#endif
+kwalletmanager
+polkit-kde-agent-1
+kde-config-screenlocker
+#if DISTRIBUTION stretch buster bullseye bookworm
+khotkeys
+#endif
+#if DISTRIBUTION stretch buster bullseye
+ksysguard
+#endif
+#nif DISTRIBUTION stretch buster bullseye
+plasma-systemmonitor
+#endif
+# kde now optional depends
+kactivities-bin
+
+# kde plasma
+plasma-widgets-addons
+plasma-runners-addons
+qml-module-org-kde-runnermodel
+#nif DISTRIBUTION stretch buster
+qml-module-org-kde-newstuff
+#endif
+
+# themes
+kde-config-gtk-style
+gnome-icon-theme
+clearlooks-phenix-theme
+
+# network
+plasma-nm
+
+# other hardware
+#if DISTRIBUTION stretch buster
+kde-config-touchpad
+#endif
+
+blueman
+
+kwin-x11
+kwin-decoration-oxygen
+#if DISTRIBUTION stretch
+kde-wallpapers-default
+#endif
+powerdevil
+kscreen
+plasma-pa
+print-manager
+# tmp stuff for devel
+# inkscape with some recommends
+inkscape
+python3-cssselect
+python3-lxml
+python3-numpy
+python3-scour
+
+kdeutils
+kdeconnect
+
+qtqr
+#nif DISTRIBUTION stretch
+#include <simplescreenrecorder>
+#endif
+
+#nif DISTRIBUTION stretch buster
+featherpad
+featherpad-l10n
+#endif
diff --git a/config/lists/kde6-more b/config/lists/kde6-more
new file mode 100644
index 0000000..5a38c67
--- /dev/null
+++ b/config/lists/kde6-more
@@ -0,0 +1,13 @@
+# Kanotix with KDE (enhanced)
+# enhanced List only for amd64 used
+
+#nif DISTRIBUTION stretch buster bullseye
+calamares
+calamares-settings-kanotix
+git
+dolphin-plugins
+quilt
+#endif
+#if DISTRIBUTION bookworm
+plasma-workspace-wayland
+#endif
diff --git a/config/lists/printer_driver_all b/config/lists/printer_driver_all
index 4a009a2..cd395fe 100644
--- a/config/lists/printer_driver_all
+++ b/config/lists/printer_driver_all
@@ -33,7 +33,9 @@ printer-driver-foo2zjs
 printer-driver-fujixerox
 #printer driver for Fuji Xerox printers
 
+#if ARCHITECTURE amd64
 printer-driver-gutenprint
+#endif
 #printer drivers for CUPS
 
 printer-driver-hpcups
diff --git a/config/repositories/kernel-pae b/config/repositories/kernel-pae
new file mode 100644
index 0000000..8f18f6e
--- /dev/null
+++ b/config/repositories/kernel-pae
@@ -0,0 +1,2 @@
+# Debian bookworm security
+deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://security.debian.org bookworm-security/updates main contrib non-free