From: Paul Hänsch Date: Thu, 16 May 2024 11:44:46 +0000 (+0200) Subject: xfce4-screensaver config (for trixie) X-Git-Url: http://git.plutz.net/?p=blast;a=commitdiff_plain;h=HEAD;hp=8193e3f2e8eae034014071ca6799d9f88fd9c201 xfce4-screensaver config (for trixie) --- diff --git a/.gitignore b/.gitignore index 6ba0205..c52a194 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,12 @@ sys_root_stretch_*/ sys_root_buster_*/ sys_root_bullseye_*/ sys_root_bookworm_*/ +sys_root_trixie_*/ cfg_root/ img_mount/ iso_root/ config.mk +*.mk *.img *.iso *.squash diff --git a/Makefile b/Makefile index 3b333bd..7af8ad8 100644 --- a/Makefile +++ b/Makefile @@ -36,9 +36,7 @@ ifndef release release := bullseye endif -KEYRING := keys/debian-archive-${release}-stable.gpg KEYRING := keys/debian-archive-${release}-automatic.gpg -# KEYRING := keys/debian-archive-${release}-security-automatic.gpg ifndef SOURCES define SOURCES := @@ -329,7 +327,7 @@ _format_boot: ${PBOOT} _format: _format_root _format_boot _iso_image: ${ISOROOT} - grub-mkrescue -o "$${ISO}" "$${ISOROOT}" + grub-mkrescue --compress=xz -o "$${ISO}" "$${ISOROOT}" .PHONY: _syslinux_efi32 _syslinux_efi64 _syslinux_bios .PHONY: _grub_efi32 _grub_efi64 diff --git a/debian-bookworm-desktop.mk b/debian-bookworm-desktop.mk index 38d7fcb..fb0b9bc 100644 --- a/debian-bookworm-desktop.mk +++ b/debian-bookworm-desktop.mk @@ -28,8 +28,8 @@ packages += inkscape inkscape-tutorials packages += k3b k3b-i18n kate kbd kcalc kdenlive kde-spectacle kde-style-breeze krita krita-l10n packages += libnss3-tools libblockdev-crypto2 libk3b-extracodecs libpam-mount libpam-script libreoffice libreoffice-gnome libreoffice-gtk3 libreoffice-l10n-de libreoffice-style-breeze live-boot live-boot-initramfs-tools locales lvm2 lightdm packages += man-db marble mdadm mesa-utils mousepad mumble -packages += nbd-client netcat-openbsd network-manager-gnome nis nscd ntfs-3g -packages += obs-studio okular openssh-server +packages += nbd-client netcat-openbsd network-manager-gnome nscd ntfs-3g ntpdate +packages += obs-studio okular os-prober packages += p7zip-full pavucontrol pdfchain plymouth plymouth-themes packages += recordmydesktop packages += samba-common-bin squashfs-tools synaptic syslinux syslinux-common syslinux-efi systemd @@ -61,7 +61,7 @@ packages += minetest-mod-pipeworks minetest-mod-protector packages += minetest-mod-unified-inventory # Games - Teenage / Adult -# packages += 0ad flare-game openarena +# packages += 0ad flare-game openarena warzone2100 ## Hostname for the generated machine hostname=${mainuser}-debian diff --git a/keys/debian-archive-bookworm-automatic.gpg b/keys/debian-archive-bookworm-automatic.gpg deleted file mode 120000 index 5c00edd..0000000 --- a/keys/debian-archive-bookworm-automatic.gpg +++ /dev/null @@ -1 +0,0 @@ -debian-archive-bullseye-automatic.gpg \ No newline at end of file diff --git a/keys/debian-archive-bookworm-automatic.gpg b/keys/debian-archive-bookworm-automatic.gpg new file mode 100644 index 0000000..dfd46c7 Binary files /dev/null and b/keys/debian-archive-bookworm-automatic.gpg differ diff --git a/keys/debian-archive-bookworm-security-automatic.gpg b/keys/debian-archive-bookworm-security-automatic.gpg new file mode 100644 index 0000000..219463c Binary files /dev/null and b/keys/debian-archive-bookworm-security-automatic.gpg differ diff --git a/keys/debian-archive-bookworm-stable.gpg b/keys/debian-archive-bookworm-stable.gpg deleted file mode 120000 index 9a7a715..0000000 --- a/keys/debian-archive-bookworm-stable.gpg +++ /dev/null @@ -1 +0,0 @@ -debian-archive-bullseye-stable.gpg \ No newline at end of file diff --git a/keys/debian-archive-bullseye-stable.gpg b/keys/debian-archive-bullseye-stable.gpg deleted file mode 100644 index 8ecabc7..0000000 Binary files a/keys/debian-archive-bullseye-stable.gpg and /dev/null differ diff --git a/keys/debian-archive-buster-automatic.gpg b/keys/debian-archive-buster-automatic.gpg deleted file mode 100644 index 9ff7af7..0000000 Binary files a/keys/debian-archive-buster-automatic.gpg and /dev/null differ diff --git a/keys/debian-archive-buster-security-automatic.gpg b/keys/debian-archive-buster-security-automatic.gpg deleted file mode 100644 index 81afdb7..0000000 Binary files a/keys/debian-archive-buster-security-automatic.gpg and /dev/null differ diff --git a/keys/debian-archive-buster-stable.gpg b/keys/debian-archive-buster-stable.gpg deleted file mode 100644 index 7dbe646..0000000 Binary files a/keys/debian-archive-buster-stable.gpg and /dev/null differ diff --git a/keys/debian-archive-stretch-stable.gpg b/keys/debian-archive-stretch-stable.gpg deleted file mode 100644 index 2c3f78f..0000000 Binary files a/keys/debian-archive-stretch-stable.gpg and /dev/null differ diff --git a/keys/debian-archive-trixie-automatic.gpg b/keys/debian-archive-trixie-automatic.gpg new file mode 120000 index 0000000..fdfb061 --- /dev/null +++ b/keys/debian-archive-trixie-automatic.gpg @@ -0,0 +1 @@ +debian-archive-bookworm-automatic.gpg \ No newline at end of file diff --git a/modules/default.mk b/modules/default.mk index efb8358..0957d2b 100644 --- a/modules/default.mk +++ b/modules/default.mk @@ -2,7 +2,7 @@ ifdef imagesize ROOT_MB := $(shell printf '%i\n' "$$(( ${imagesize} - ${BOOT_MB} - 3 ))") endif -PACKAGES += btrfs-progs bzip2 ca-certificates cron deborphan dnsutils file firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make net-tools nmap ntpdate openssh-client pciutils psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip +PACKAGES += btrfs-progs bzip2 ca-certificates cron dnsutils file firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make net-tools nmap ntpdate openssh-client pciutils psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip ifdef packages PACKAGES += $(subst ${comma_},${space_},${packages}) diff --git a/modules/xfce/etc/xdg/xfce4/panel/whiskermenu-10.rc b/modules/xfce/etc/xdg/xfce4/panel/whiskermenu-10.rc index db2b3d6..bf486a0 100644 --- a/modules/xfce/etc/xdg/xfce4/panel/whiskermenu-10.rc +++ b/modules/xfce/etc/xdg/xfce4/panel/whiskermenu-10.rc @@ -1 +1 @@ -favorites=libreoffice-startcenter.desktop,firefox-esr.desktop,clementine.desktop,org.kde.marble.desktop,org.kde.marble.desktop,audacity.desktop,org.kde.kdenlive.desktop,blender.desktop,inkscape.desktop,org.kde.krita.desktop,xfce4-file-manager.desktop,xfce4-terminal.desktop +favorites=libreoffice-startcenter.desktop,chromium.desktop,clementine.desktop,org.kde.marble.desktop,audacity.desktop,org.kde.kdenlive.desktop,blender.desktop,inkscape.desktop,org.kde.krita.desktop,xfce4-file-manager.desktop,xfce4-terminal.desktop diff --git a/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml index 3f8710e..6fc2717 100644 --- a/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ b/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -15,7 +15,7 @@ - + diff --git a/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml b/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml new file mode 100644 index 0000000..ac12438 --- /dev/null +++ b/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + +