diff options
Diffstat (limited to 'config')
| -rwxr-xr-x | config/chroot_local-hooks/03-towelfire-fixes | 19 | ||||
| -rw-r--r-- | config/chroot_local-includes/etc/sddm.conf.d/kde_settings.conf | 15 | ||||
| -rwxr-xr-x | config/chroot_local-includes/lib/live/config/0086-sddm | 38 | ||||
| -rwxr-xr-x | config/chroot_local-includes/lib/live/config/9023-kwayland | 5 | ||||
| -rw-r--r-- | config/lists/base | 29 | ||||
| -rw-r--r-- | config/lists/base.kanotix | 4 | ||||
| -rw-r--r-- | config/lists/broadcom-firm | 5 | ||||
| -rw-r--r-- | config/lists/cupsi386 | 10 | ||||
| -rw-r--r-- | config/lists/firmware | 6 | ||||
| -rw-r--r-- | config/lists/kanotix-eeepc4G | 37 | ||||
| -rw-r--r-- | config/lists/kanotix-kde-master | 7 | ||||
| -rw-r--r-- | config/lists/kanotix-lxde-full | 4 | ||||
| -rw-r--r-- | config/lists/kanotix-lxde-master | 4 | ||||
| -rw-r--r-- | config/lists/kanotix-lxde-min | 4 | ||||
| -rw-r--r-- | config/lists/kde6 | 7 | ||||
| -rw-r--r-- | config/lists/kde6-more | 1 | ||||
| -rw-r--r-- | config/repositories/kernel-pae | 2 | ||||
| -rw-r--r-- | config/repositories/towelfire | 3 | ||||
| -rw-r--r-- | config/repositories/towelfire.gpg | 52 |
19 files changed, 236 insertions, 16 deletions
diff --git a/config/chroot_local-hooks/03-towelfire-fixes b/config/chroot_local-hooks/03-towelfire-fixes index e2337d8..29c4123 100755 --- a/config/chroot_local-hooks/03-towelfire-fixes +++ b/config/chroot_local-hooks/03-towelfire-fixes @@ -42,6 +42,25 @@ 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 + +# pin bookworm security pin + if [ -x /var/lib/dpkg/info/linux-image-686-pae.preinst ]; then +cat <<"EOF" >/etc/apt/preferences.d/pae +Package: * +Pin: release n=bookworm-security +Pin-Priority: 100 +EOF + fi +# add scale factor for qt defaults to 100% +echo "QT_SCALE_FACTOR=1.0" >>/etc/environment + +# fix for sddm layout +if [ -f /usr/share/sddm/scripts/Xsetup ]; then + echo "setxkbmap" >> /usr/share/sddm/scripts/Xsetup +fi + # powermanager fix new values since buster mkdir -p /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml diff --git a/config/chroot_local-includes/etc/sddm.conf.d/kde_settings.conf b/config/chroot_local-includes/etc/sddm.conf.d/kde_settings.conf new file mode 100644 index 0000000..1ee5714 --- /dev/null +++ b/config/chroot_local-includes/etc/sddm.conf.d/kde_settings.conf @@ -0,0 +1,15 @@ +[Autologin] +Relogin=false +Session=plasmax11 +User=kanotix + +[General] +HaltCommand= +RebootCommand= + +[Theme] +Current=maldives + +[Users] +MaximumUid=60000 +MinimumUid=1000 diff --git a/config/chroot_local-includes/lib/live/config/0086-sddm b/config/chroot_local-includes/lib/live/config/0086-sddm new file mode 100755 index 0000000..98da070 --- /dev/null +++ b/config/chroot_local-includes/lib/live/config/0086-sddm @@ -0,0 +1,38 @@ +#!/bin/sh + +. /usr/lib/live/config.sh + +## live-config(7) - System Configuration Components +## Copyright (C) 2016-2020 The Debian Live team +## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch> +## +## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +## This is free software, and you are welcome to redistribute it +## under certain conditions; see COPYING for details. + + +#set -e + +Init () +{ + # Checking if package is installed or already configured + if ! pkg_is_installed "sddm" || \ + component_was_executed "sddm_kanotix" + then + exit 0 + fi + + echo -n " sddm_kanotix" +} + +Config () +{ + # remove file created by 0085-sddm + rm -f /etc/sddm.conf + + # Creating state file + touch /var/lib/live/config/sddm_kanotix +} + +Init +Config diff --git a/config/chroot_local-includes/lib/live/config/9023-kwayland b/config/chroot_local-includes/lib/live/config/9023-kwayland index 152f32f..7950e60 100755 --- a/config/chroot_local-includes/lib/live/config/9023-kwayland +++ b/config/chroot_local-includes/lib/live/config/9023-kwayland @@ -16,11 +16,16 @@ Configure_kwayland () if grep -qs "kwayland" /proc/cmdline then if [ -x /usr/bin/startplasma-wayland ]; then + if [ -x /usr/sbin/lightdm ]; then echo "[Desktop]" >/home/${LIVE_USERNAME}/.dmrc echo "Session=plasmawayland" >>/home/${LIVE_USERNAME}/.dmrc chown 1000:1000 /home/${LIVE_USERNAME}/.dmrc echo "[Seat:*]" >> /usr/share/lightdm/lightdm.conf.d/51_kanotix.conf echo "user-session=plasmawayland" >> /usr/share/lightdm/lightdm.conf.d/51_kanotix.conf + fi + if [ -x /usr/bin/sddm ]; then + sed -i 's/Session=plasmax11/Session=plasma/' /etc/sddm.conf.d/kde_settings.conf + fi fi fi diff --git a/config/lists/base b/config/lists/base index 05d35d2..0be58b5 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 @@ -58,6 +60,10 @@ zstd # tools bc clinfo +#nif DISTRIBUTION bullseye bookworm +fastfetch +hstr +#endif mc most less @@ -99,6 +105,10 @@ zsync debconf-utils rpm2cpio usbutils +util-linux +#nif DISTRIBUTION bullseye +util-linux-extra +#endif exif fsarchiver xterm @@ -142,17 +152,22 @@ cups-client foomatic-db-engine foomatic-db #include <printer_driver_all> -libcups2 +libcups2t64 #endif #if ARCHITECTURE amd64 -libcups2:i386 +#include <cupsi386> #endif # build 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 @@ -160,7 +175,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 @@ -242,6 +263,10 @@ zram #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/base.kanotix b/config/lists/base.kanotix index b42fc20..a276e8a 100644 --- a/config/lists/base.kanotix +++ b/config/lists/base.kanotix @@ -4,6 +4,10 @@ user-profile-kanotix kanotix-archive-keyring kanotix-starrise-base +#nif DISTRIBUTION bullseye bookworm +kanotix-spring-base +#endif + plymouth-theme-kanotix-logo acritoxinstaller-kanotix diff --git a/config/lists/broadcom-firm b/config/lists/broadcom-firm new file mode 100644 index 0000000..24c7b80 --- /dev/null +++ b/config/lists/broadcom-firm @@ -0,0 +1,5 @@ +# We do not use dkms on i386 + +#if ARCHITECTURE amd64 +broadcom-sta-dkms +#endif diff --git a/config/lists/cupsi386 b/config/lists/cupsi386 new file mode 100644 index 0000000..2b00c3c --- /dev/null +++ b/config/lists/cupsi386 @@ -0,0 +1,10 @@ +# config list cups +# eliminate build error + +#if DISTRIBUTION bookworm +libcups2:i386 +#endif + +#nif DISTRIBUTION bookworm +libcups2t64:i386 +#endif diff --git a/config/lists/firmware b/config/lists/firmware index 889f330..fa08af1 100644 --- a/config/lists/firmware +++ b/config/lists/firmware @@ -9,4 +9,10 @@ linux-firmware linux-firmware-nonfree # broadcom +#if DISTRIBUTION bullseye bookwom broadcom-sta-dkms +#endif + +#nif DISTRIBUTION bullseye bookwom +#include <broadcom-firm> +#endif diff --git a/config/lists/kanotix-eeepc4G b/config/lists/kanotix-eeepc4G index 5220366..10433d5 100644 --- a/config/lists/kanotix-eeepc4G +++ b/config/lists/kanotix-eeepc4G @@ -3,8 +3,10 @@ # Kanotix base Packages List # install only needed firmware firmware-atheros +#nif DISTRIBUTION bullseye +eeepc-firmware-extra +#endif #if ARCHITECTURE amd64 -eeepc4g-firmware-extra git #endif @@ -20,6 +22,8 @@ sudo #nif DISTRIBUTION wheezy jessie stretch buster bullseye polkitd pkexec +#endif +#if DISTRIBUTION bookworm polkitd-pkla #endif @@ -97,6 +101,10 @@ zsync debconf-utils rpm2cpio usbutils +util-linux +#nif DISTRIBUTION bullseye +util-linux-extra +#endif exif fsarchiver xterm @@ -128,7 +136,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 +149,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 @@ -169,6 +187,15 @@ vdpauinfo #nif DISTRIBUTION wheezy mesa-vdpau-drivers #endif +#nif DISTRIBUTION wheezy jessie +mesa-va-drivers +#endif +#if DISTRIBUTION stretch +#include <vulkan-steelfire> +#endif +#nif DISTRIBUTION wheezy jessie stretch +#include <vulkan> +#endif xinit #if DISTRIBUTION wheezy jessie stretch freerdp-x11 @@ -209,6 +236,10 @@ zram #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 @@ -377,10 +408,10 @@ xchat # other gnome-screenshot seahorse -#if DISTRIBUTION bookworm +#if DISTRIBUTION bullseye bookworm keepassxc #endif -#nif DISTRIBUTION bookworm +#nif DISTRIBUTION bullseye bookworm keepassxc-minimal #endif diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master index b9f5a7a..e81db89 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 @@ -51,10 +53,10 @@ khelpcenter #endif # tools -#if DISTRIBUTION bookworm +#if DISTRIBUTION bullseye bookworm keepassxc #endif -#nif DISTRIBUTION bookworm +#nif DISTRIBUTION bullseye bookworm keepassxc-minimal #endif @@ -80,6 +82,7 @@ foobillardplus neverball neverputt kmahjongg +ksudoku # benchmark #if DISTRIBUTION wheezy jessie stretch buster diff --git a/config/lists/kanotix-lxde-full b/config/lists/kanotix-lxde-full index 88a2152..3dcc2fb 100644 --- a/config/lists/kanotix-lxde-full +++ b/config/lists/kanotix-lxde-full @@ -16,13 +16,17 @@ me-tv # graphics gimp +#if DISTRIBUTION wheezy jessie stretch buster bullseye bookworm gimp-gutenprint +#endif xsane #if DISTRIBUTION wheezy jessie stretch libsane-extras #endif sane-utils sane +#gpicview pcmanfm heif support +heif-gdk-pixbuf # network diff --git a/config/lists/kanotix-lxde-master b/config/lists/kanotix-lxde-master index c3b1132..28b03c4 100644 --- a/config/lists/kanotix-lxde-master +++ b/config/lists/kanotix-lxde-master @@ -104,9 +104,9 @@ gst123 #include <awesome> #endif seahorse -#if DISTRIBUTION bookworm +#if DISTRIBUTION bullseye bookworm keepassxc #endif -#nif DISTRIBUTION bookworm +#nif DISTRIBUTION bullseye bookworm keepassxc-minimal #endif diff --git a/config/lists/kanotix-lxde-min b/config/lists/kanotix-lxde-min index 185be45..461a7f5 100644 --- a/config/lists/kanotix-lxde-min +++ b/config/lists/kanotix-lxde-min @@ -127,9 +127,9 @@ xchat # other gnome-screenshot seahorse -#if DISTRIBUTION bookworm +#if DISTRIBUTION bullseye bookworm keepassxc #endif -#nif DISTRIBUTION bookworm +#nif DISTRIBUTION bullseye bookworm keepassxc-minimal #endif diff --git a/config/lists/kde6 b/config/lists/kde6 index 957a21f..d947c51 100644 --- a/config/lists/kde6 +++ b/config/lists/kde6 @@ -50,12 +50,9 @@ kate ark # tools -#if DISTRIBUTION stretch buster bullseye -kde-spectacle -#endif -#nif DISTRIBUTION stretch buster bullseye ksnip -#endif +xdg-desktop-portal-kde + kcalc kfind qml-module-org-kde-activities diff --git a/config/lists/kde6-more b/config/lists/kde6-more index 5a38c67..a914401 100644 --- a/config/lists/kde6-more +++ b/config/lists/kde6-more @@ -11,3 +11,4 @@ quilt #if DISTRIBUTION bookworm plasma-workspace-wayland #endif +neochat 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 diff --git a/config/repositories/towelfire b/config/repositories/towelfire new file mode 100644 index 0000000..8d87ee5 --- /dev/null +++ b/config/repositories/towelfire @@ -0,0 +1,3 @@ +# Kanotix Towelfire +deb [signed-by=/usr/share/keyrings/kanotix25.asc] http://kanotix.com/files/towelfire ./ +deb-src [signed-by=/usr/share/keyrings/kanotix25.asc] http://kanotix.com/files/towelfire ./ diff --git a/config/repositories/towelfire.gpg b/config/repositories/towelfire.gpg new file mode 100644 index 0000000..e6f5028 --- /dev/null +++ b/config/repositories/towelfire.gpg @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +IKBNCrg= +=F0OQ +-----END PGP PUBLIC KEY BLOCK----- |