diff --git a/Jenkinsfile b/Jenkinsfile index 2c20cbe..6506ede 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { git ls-remote https://gitea.chacha.ddns.net/chacha/icons-collection.git refs/heads/main \ | awk '{print $1}' > .docker-cache/icons.ref test -s .docker-cache/icons.ref - echo "icons ref: $(cat .docker-cache/uticons99.ref)" + echo "icons ref: $(cat .docker-cache/icons.ref)" ''' } } @@ -169,6 +169,7 @@ pipeline { sh ''' mkdir -p config/chroot_local-includes/usr/local/games/ut99/ cp -R /root/ut-game/* config/chroot_local-includes/usr/local/games/ut99/ + cp /root/icons-collection/small/ut99.png /usr/share/icons/ ''' } } diff --git a/desktop b/desktop index 0ce7478..e3cde7f 100644 --- a/desktop +++ b/desktop @@ -65,3 +65,4 @@ xscreensaver beep xclip xsel +linneighborhood diff --git a/internal/rootfs/etc/skel/.xinitrc b/internal/rootfs/etc/skel/.xinitrc index 03704c2..a76bb61 100644 --- a/internal/rootfs/etc/skel/.xinitrc +++ b/internal/rootfs/etc/skel/.xinitrc @@ -1,5 +1,15 @@ #!/bin/sh -xrdb -merge ~/.Xresources -#fbsetbg -f /usr/share/wallpapers/retrodebian.jpg -#numlockx on & + +: "${DISPLAY:=:0}" +export DISPLAY + +if [ -f "$HOME/.resolution.config" ]; then + RES="$(sed -n '1p' "$HOME/.resolution.config")" + if [ -n "$RES" ]; then + xrandr -s "$RES" + fi +fi + +xrdb -merge "$HOME/.Xresources" + exec startfluxbox \ No newline at end of file diff --git a/internal/rootfs/etc/skel/.xscreensaver b/internal/rootfs/etc/skel/.xscreensaver index 88f022d..51e6497 100644 --- a/internal/rootfs/etc/skel/.xscreensaver +++ b/internal/rootfs/etc/skel/.xscreensaver @@ -1,10 +1,10 @@ # XScreenSaver Preferences File -# Written by xscreensaver-demo 4.24 for bob on Sun Mar 22 18:35:14 2026. +# Written by xscreensaver-demo 4.24 for bob on Mon Mar 23 14:48:12 2026. # http://www.jwz.org/xscreensaver/ timeout: 0:10:00 cycle: 0:10:00 -lock: True +lock: False lockTimeout: 0:20:00 passwdTimeout: 0:00:30 visualID: default @@ -18,14 +18,14 @@ demoCommand: xscreensaver-demo prefsCommand: xscreensaver-demo -prefs nice: 10 memoryLimit: 0 -fade: True +fade: False unfade: False fadeSeconds: 0:00:03 fadeTicks: 20 captureStderr: False ignoreUninstalledPrograms:False font: *-medium-r-*-140-*-m-* -dpmsEnabled: True +dpmsEnabled: False dpmsStandby: 1:00:00 dpmsSuspend: 1:00:00 dpmsOff: 2:00:00 @@ -34,10 +34,10 @@ grabVideoFrames: False chooseRandomImages: False imageDirectory: -mode: random -selected: -1 +mode: one +selected: 96 -textMode: url +textMode: date textLiteral: XScreenSaver textFile: /usr/share/doc/xserver-common/copyright textProgram: fortune @@ -147,7 +147,8 @@ programs: \ -length 10000 -reset 100000 \n\ - critical -root \n\ phosphor -root \n\ - xmatrix -root \n\ + xmatrix -root -small -delay 12842 -trace \ + -knock-knock \n\ petri -root -size 2 -count 20 \n\ "Petri 2" petri -root -minlifespeed 0.02 \ -maxlifespeed 0.03 -minlifespan 1 \ diff --git a/internal/rootfs/opt/retrodebian/bin/set-resolution b/internal/rootfs/opt/retrodebian/bin/set-resolution index 71a46a8..d687046 100644 --- a/internal/rootfs/opt/retrodebian/bin/set-resolution +++ b/internal/rootfs/opt/retrodebian/bin/set-resolution @@ -11,7 +11,10 @@ case "$MODE" in ;; esac -: "${DISPLAY:=:0}" -export DISPLAY +echo "$MODE" > "$HOME/.resolution.config" -exec xrandr -s "$MODE" \ No newline at end of file +if xmessage -center -buttons Yes:0,No:1 \ + "Changed resolution to $MODE.\nShould we restart X now ?"; then + echo "$MODE" > "$HOME/.resolution.config" + killall fluxbox +fi \ No newline at end of file diff --git a/internal/rootfs/opt/retrodebian/fluxbox/retrodebian-menu.section b/internal/rootfs/opt/retrodebian/fluxbox/retrodebian-menu.section index e396c78..bf949e6 100644 --- a/internal/rootfs/opt/retrodebian/fluxbox/retrodebian-menu.section +++ b/internal/rootfs/opt/retrodebian/fluxbox/retrodebian-menu.section @@ -4,6 +4,8 @@ [exec] (Files) {pcmanfm} [exec] (Text Editor) {leafpad} [exec] (Task Manager) {urxvt -e htop} + [exec] (Samba Mount) {LinNeighborhood} + [exec] (Archives) {xarchiver} [separator] [exec] (xeji) {xeji} [separator] @@ -13,6 +15,7 @@ [exec] (1024x768) {/opt/retrodebian/bin/set-resolution 1024x768} [end] [submenu] (Games) + [exec] (ut99) {/usr/local/games/ut99/ut} [end] [submenu] (Tools) [end]