xfce4-screensaver config (for trixie)

diff --git a/.gitignore b/.gitignore
index 6ba0205a6faa270990f6733e6b83cd45541ff445..c52a1948b81d1d61a972a04680da734a3931b871 100644 (file)
--- 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 3b333bd6ca95a9f58af3bc49a1fb3938656e47de..7af8ad80fa0830c55c85d70e4c24b8540a41eec2 100644 (file)
--- 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 38d7fcbb4c9c34517efa24978ed26856fc04a8ff..fb0b9bc8c67c635c7d28470909dff76f54db688d 100644 (file)
--- 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 (symlink)
index 5c00eddda33c817ffc777ef69b31056750a08b36..0000000000000000000000000000000000000000
--- 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 (file)
index 0000000000000000000000000000000000000000..dfd46c7fe7431a8431765fb96fb15936e0474bd9
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 (file)
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 (symlink)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (symlink)
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 efb83589b198ad0cf78d19d14c688504092f3b55..0957d2bd518d0dfaecec9ae2e8fbf9c22e85a547 100644 (file)
--- 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 db2b3d619f341f79fb1a8bdbfd8dc787504c8e8e..bf486a0685dcd5c854dfdbbd7b5c56c94baf7645 100644 (file)
--- 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 3f8710eac5ce6c5e6ca25419262b2ded36eff0ed..6fc2717344f737dd3813b07308dea1b7e92f56ea 100644 (file)
--- 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 @@
         <value type="int" value="20"/>
         <value type="int" value="100"/>
         <value type="int" value="120"/>
-        <value type="int" value="140"/>
+        <value type="int" value="130"/>
         <value type="int" value="200"/>
         <value type="int" value="210"/>
         <value type="int" value="300"/>

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 (file)
index 0000000..ac12438
--- /dev/null
+++ b/modules/xfce/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-screensaver" version="1.0">
+  <property name="saver" type="empty">
+    <property name="mode" type="int" value="2"/>
+    <property name="themes" type="empty">
+      <property name="list" type="array">
+        <value type="string" value="screensavers-xfce-popsquares"/>
+      </property>
+    </property>
+    <property name="idle-activation" type="empty">
+      <property name="delay" type="int" value="10"/>
+    </property>
+  </property>
+  <property name="lock" type="empty">
+    <property name="saver-activation" type="empty">
+      <property name="delay" type="int" value="2"/>
+    </property>
+  </property>
+</channel>