From 4c17f40078187e5944d0468d0b3cfd254d9a4303 Mon Sep 17 00:00:00 2001
From: Ryan Kuba <ryankuba@gmail.com>
Date: Tue, 17 Jun 2025 14:51:06 +0000
Subject: [PATCH] rebase fedora-xfce to selkies setup default settings (#306)

---
 .editorconfig                               |  0
 .github/ISSUE_TEMPLATE/issue.bug.yml        |  0
 .github/ISSUE_TEMPLATE/issue.feature.yml    |  0
 .github/workflows/call_issue_pr_tracker.yml |  0
 .github/workflows/call_issues_cron.yml      |  0
 .github/workflows/permissions.yml           |  0
 Dockerfile                                  | 19 +++--
 Dockerfile.aarch64                          | 19 +++--
 Jenkinsfile                                 |  4 +-
 jenkins-vars.yml                            |  4 +-
 root/defaults/startwm.sh                    | 17 ++--
 root/defaults/xfce/xfce4-panel.xml          | 54 ++++++++++++
 root/defaults/xfce/xfwm4.xml                | 91 +++++++++++++++++++++
 root/defaults/xfce/xsettings.xml            | 42 ++++++++++
 root/usr/bin/exo-open                       |  2 +-
 root/usr/bin/thunar                         |  2 +
 16 files changed, 225 insertions(+), 29 deletions(-)
 mode change 100755 => 100644 .editorconfig
 mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml
 mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml
 mode change 100755 => 100644 .github/workflows/call_issue_pr_tracker.yml
 mode change 100755 => 100644 .github/workflows/call_issues_cron.yml
 mode change 100755 => 100644 .github/workflows/permissions.yml
 create mode 100644 root/defaults/xfce/xfce4-panel.xml
 create mode 100644 root/defaults/xfce/xfwm4.xml
 create mode 100644 root/defaults/xfce/xsettings.xml
 create mode 100755 root/usr/bin/thunar

diff --git a/.editorconfig b/.editorconfig
old mode 100755
new mode 100644
diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml
old mode 100755
new mode 100644
diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml
old mode 100755
new mode 100644
diff --git a/Dockerfile b/Dockerfile
index 5cf84fc5..53f444a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:fedora41
+FROM ghcr.io/linuxserver/baseimage-selkies:fedora42
 
 # set version label
 ARG BUILD_DATE
@@ -7,12 +7,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 # title
-ENV TITLE="Fedora XFCE"
+ENV TITLE="Fedora XFCE" \
+    NO_GAMEPAD="true"
 
 RUN \
   echo "**** add icon ****" && \
   curl -o \
-    /kclient/public/icon.png \
+    /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
   echo "**** install packages ****" && \
   dnf install -y --setopt=install_weak_deps=False --best \
@@ -36,14 +37,18 @@ RUN \
     xfdesktop \
     xfwm4 \
     xfwm4-themes && \
-  echo "**** application tweaks ****" && \
+  echo "**** xfce tweaks ****" && \
   sed -i \
     's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
     /usr/share/applications/chromium-browser.desktop && \
-  mv /usr/bin/exo-open /usr/bin/exo-open-real && \
-  echo "**** xfce tweaks ****" && \
+  mv \
+    /usr/bin/exo-open \
+    /usr/bin/exo-open-real && \
+  mv \
+    /usr/bin/thunar \
+    /usr/bin/thunar-real && \
   rm -f \
-    /etc/xdg/autostart/xfce-polkit.desktop && \
+    /etc/xdg/autostart/xscreensaver.desktop && \
   echo "**** cleanup ****" && \
   dnf autoremove -y && \
   dnf clean all && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 632fc6c8..317bd6d5 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-fedora41
+FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-fedora42
 
 # set version label
 ARG BUILD_DATE
@@ -7,12 +7,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 # title
-ENV TITLE="Fedora XFCE"
+ENV TITLE="Fedora XFCE" \
+    NO_GAMEPAD="true"
 
 RUN \
   echo "**** add icon ****" && \
   curl -o \
-    /kclient/public/icon.png \
+    /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/webtop-logo.png && \
   echo "**** install packages ****" && \
   dnf install -y --setopt=install_weak_deps=False --best \
@@ -36,14 +37,18 @@ RUN \
     xfdesktop \
     xfwm4 \
     xfwm4-themes && \
-  echo "**** application tweaks ****" && \
+  echo "**** xfce tweaks ****" && \
   sed -i \
     's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
     /usr/share/applications/chromium-browser.desktop && \
-  mv /usr/bin/exo-open /usr/bin/exo-open-real && \
-  echo "**** xfce tweaks ****" && \
+  mv \
+    /usr/bin/exo-open \
+    /usr/bin/exo-open-real && \
+  mv \
+    /usr/bin/thunar \
+    /usr/bin/thunar-real && \
   rm -f \
-    /etc/xdg/autostart/xfce-polkit.desktop && \
+    /etc/xdg/autostart/xscreensaver.desktop && \
   echo "**** cleanup ****" && \
   dnf autoremove -y && \
   dnf clean all && \
diff --git a/Jenkinsfile b/Jenkinsfile
index b581b780..ca34663d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,8 +30,8 @@ pipeline {
     MULTIARCH = 'true'
     CI = 'true'
     CI_WEB = 'true'
-    CI_PORT = '3000'
-    CI_SSL = 'false'
+    CI_PORT = '3001'
+    CI_SSL = 'true'
     CI_DELAY = '120'
     CI_DOCKERENV = 'TZ=US/Pacific'
     CI_AUTH = 'user:password'
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index fdfc6231..a4e57866 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -19,8 +19,8 @@ repo_vars:
   - MULTIARCH = 'true'
   - CI = 'true'
   - CI_WEB = 'true'
-  - CI_PORT = '3000'
-  - CI_SSL = 'false'
+  - CI_PORT = '3001'
+  - CI_SSL = 'true'
   - CI_DELAY = '120'
   - CI_DOCKERENV = 'TZ=US/Pacific'
   - CI_AUTH = 'user:password'
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index fdb93b00..eab612f1 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bash
 
 # Enable Nvidia GPU support if detected
 if which nvidia-smi; then
@@ -7,14 +7,11 @@ if which nvidia-smi; then
   export GALLIUM_DRIVER=zink
 fi
 
-# Disable compositing
-setterm blank 0
-setterm powerdown 0
-if [ -f "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]; then
-  sed -i \
-    '/use_compositing/c <property name="use_compositing" type="bool" value="false"/>' \
-    "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+# Default settings
+if [ ! -d "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml ]; then
+  mkdir -p "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml
+  cp /defaults/xfce/* "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/
 fi
 
-# Launch DE
-/usr/bin/xfce4-session > /dev/null 2>&1
+# Start DE
+dbus-launch /usr/bin/xfce4-session > /dev/null 2>&1
diff --git a/root/defaults/xfce/xfce4-panel.xml b/root/defaults/xfce/xfce4-panel.xml
new file mode 100644
index 00000000..9d909b83
--- /dev/null
+++ b/root/defaults/xfce/xfce4-panel.xml
@@ -0,0 +1,54 @@
+<?xml version="1.1" encoding="UTF-8"?>
+
+<channel name="xfce4-panel" version="1.0">
+  <property name="configver" type="int" value="2"/>
+  <property name="panels" type="array">
+    <value type="int" value="1"/>
+    <property name="dark-mode" type="bool" value="true"/>
+    <property name="panel-1" type="empty">
+      <property name="position" type="string" value="p=6;x=0;y=0"/>
+      <property name="length" type="uint" value="100"/>
+      <property name="position-locked" type="bool" value="true"/>
+      <property name="icon-size" type="uint" value="16"/>
+      <property name="size" type="uint" value="26"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="1"/>
+        <value type="int" value="2"/>
+        <value type="int" value="3"/>
+        <value type="int" value="4"/>
+        <value type="int" value="5"/>
+        <value type="int" value="6"/>
+        <value type="int" value="7"/>
+        <value type="int" value="8"/>
+        <value type="int" value="9"/>
+        <value type="int" value="10"/>
+      </property>
+      <property name="background-style" type="uint" value="0"/>
+    </property>
+  </property>
+  <property name="plugins" type="empty">
+    <property name="plugin-1" type="string" value="applicationsmenu"/>
+    <property name="plugin-2" type="string" value="tasklist">
+      <property name="grouping" type="uint" value="1"/>
+    </property>
+    <property name="plugin-3" type="string" value="separator">
+      <property name="expand" type="bool" value="true"/>
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-4" type="string" value="pager"/>
+    <property name="plugin-5" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-6" type="string" value="systray">
+      <property name="square-icons" type="bool" value="true"/>
+    </property>
+    <property name="plugin-7" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-8" type="string" value="clock"/>
+    <property name="plugin-9" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-10" type="string" value="actions"/>
+  </property>
+</channel>
diff --git a/root/defaults/xfce/xfwm4.xml b/root/defaults/xfce/xfwm4.xml
new file mode 100644
index 00000000..240377d4
--- /dev/null
+++ b/root/defaults/xfce/xfwm4.xml
@@ -0,0 +1,91 @@
+<?xml version="1.1" encoding="UTF-8"?>
+
+<channel name="xfwm4" version="1.0">
+  <property name="general" type="empty">
+    <property name="activate_action" type="string" value="bring"/>
+    <property name="borderless_maximize" type="bool" value="true"/>
+    <property name="box_move" type="bool" value="false"/>
+    <property name="box_resize" type="bool" value="false"/>
+    <property name="button_layout" type="string" value="O|SHMC"/>
+    <property name="button_offset" type="int" value="0"/>
+    <property name="button_spacing" type="int" value="0"/>
+    <property name="click_to_focus" type="bool" value="true"/>
+    <property name="cycle_apps_only" type="bool" value="false"/>
+    <property name="cycle_draw_frame" type="bool" value="true"/>
+    <property name="cycle_raise" type="bool" value="false"/>
+    <property name="cycle_hidden" type="bool" value="true"/>
+    <property name="cycle_minimum" type="bool" value="true"/>
+    <property name="cycle_minimized" type="bool" value="false"/>
+    <property name="cycle_preview" type="bool" value="true"/>
+    <property name="cycle_tabwin_mode" type="int" value="0"/>
+    <property name="cycle_workspaces" type="bool" value="false"/>
+    <property name="double_click_action" type="string" value="maximize"/>
+    <property name="double_click_distance" type="int" value="5"/>
+    <property name="double_click_time" type="int" value="250"/>
+    <property name="easy_click" type="string" value="Alt"/>
+    <property name="focus_delay" type="int" value="250"/>
+    <property name="focus_hint" type="bool" value="true"/>
+    <property name="focus_new" type="bool" value="true"/>
+    <property name="frame_opacity" type="int" value="100"/>
+    <property name="frame_border_top" type="int" value="0"/>
+    <property name="full_width_title" type="bool" value="true"/>
+    <property name="horiz_scroll_opacity" type="bool" value="false"/>
+    <property name="inactive_opacity" type="int" value="100"/>
+    <property name="maximized_offset" type="int" value="0"/>
+    <property name="mousewheel_rollup" type="bool" value="true"/>
+    <property name="move_opacity" type="int" value="100"/>
+    <property name="placement_mode" type="string" value="center"/>
+    <property name="placement_ratio" type="int" value="20"/>
+    <property name="popup_opacity" type="int" value="100"/>
+    <property name="prevent_focus_stealing" type="bool" value="false"/>
+    <property name="raise_delay" type="int" value="250"/>
+    <property name="raise_on_click" type="bool" value="true"/>
+    <property name="raise_on_focus" type="bool" value="false"/>
+    <property name="raise_with_any_button" type="bool" value="true"/>
+    <property name="repeat_urgent_blink" type="bool" value="false"/>
+    <property name="resize_opacity" type="int" value="100"/>
+    <property name="scroll_workspaces" type="bool" value="true"/>
+    <property name="shadow_delta_height" type="int" value="0"/>
+    <property name="shadow_delta_width" type="int" value="0"/>
+    <property name="shadow_delta_x" type="int" value="0"/>
+    <property name="shadow_delta_y" type="int" value="-3"/>
+    <property name="shadow_opacity" type="int" value="50"/>
+    <property name="show_app_icon" type="bool" value="false"/>
+    <property name="show_dock_shadow" type="bool" value="true"/>
+    <property name="show_frame_shadow" type="bool" value="true"/>
+    <property name="show_popup_shadow" type="bool" value="false"/>
+    <property name="snap_resist" type="bool" value="false"/>
+    <property name="snap_to_border" type="bool" value="true"/>
+    <property name="snap_to_windows" type="bool" value="false"/>
+    <property name="snap_width" type="int" value="10"/>
+    <property name="vblank_mode" type="string" value="auto"/>
+    <property name="theme" type="string" value="Greybird-dark"/>
+    <property name="tile_on_move" type="bool" value="true"/>
+    <property name="title_alignment" type="string" value="center"/>
+    <property name="title_font" type="string" value="Sans Bold 9"/>
+    <property name="title_horizontal_offset" type="int" value="0"/>
+    <property name="titleless_maximize" type="bool" value="false"/>
+    <property name="title_shadow_active" type="string" value="false"/>
+    <property name="title_shadow_inactive" type="string" value="false"/>
+    <property name="title_vertical_offset_active" type="int" value="0"/>
+    <property name="title_vertical_offset_inactive" type="int" value="0"/>
+    <property name="toggle_workspaces" type="bool" value="false"/>
+    <property name="unredirect_overlays" type="bool" value="true"/>
+    <property name="urgent_blink" type="bool" value="false"/>
+    <property name="use_compositing" type="bool" value="false"/>
+    <property name="workspace_count" type="int" value="4"/>
+    <property name="wrap_cycle" type="bool" value="true"/>
+    <property name="wrap_layout" type="bool" value="true"/>
+    <property name="wrap_resistance" type="int" value="10"/>
+    <property name="wrap_windows" type="bool" value="false"/>
+    <property name="wrap_workspaces" type="bool" value="false"/>
+    <property name="zoom_desktop" type="bool" value="true"/>
+    <property name="zoom_pointer" type="bool" value="true"/>
+    <property name="workspace_names" type="array">
+      <value type="string" value="Workspace 1"/>
+      <value type="string" value="Workspace 2"/>
+      <value type="string" value="Workspace 3"/>
+      <value type="string" value="Workspace 4"/>
+    </property>
+  </property>
+</channel>
diff --git a/root/defaults/xfce/xsettings.xml b/root/defaults/xfce/xsettings.xml
new file mode 100644
index 00000000..143138ca
--- /dev/null
+++ b/root/defaults/xfce/xsettings.xml
@@ -0,0 +1,42 @@
+<?xml version="1.1" encoding="UTF-8"?>
+
+<channel name="xsettings" version="1.0">
+  <property name="Net" type="empty">
+    <property name="ThemeName" type="string" value="Greybird-dark"/>
+    <property name="IconThemeName" type="empty"/>
+    <property name="DoubleClickTime" type="empty"/>
+    <property name="DoubleClickDistance" type="empty"/>
+    <property name="DndDragThreshold" type="empty"/>
+    <property name="CursorBlink" type="empty"/>
+    <property name="CursorBlinkTime" type="empty"/>
+    <property name="SoundThemeName" type="empty"/>
+    <property name="EnableEventSounds" type="empty"/>
+    <property name="EnableInputFeedbackSounds" type="empty"/>
+  </property>
+  <property name="Xft" type="empty">
+    <property name="DPI" type="empty"/>
+    <property name="Antialias" type="empty"/>
+    <property name="Hinting" type="empty"/>
+    <property name="HintStyle" type="empty"/>
+    <property name="RGBA" type="empty"/>
+  </property>
+  <property name="Gtk" type="empty">
+    <property name="CanChangeAccels" type="empty"/>
+    <property name="ColorPalette" type="empty"/>
+    <property name="FontName" type="empty"/>
+    <property name="MonospaceFontName" type="empty"/>
+    <property name="IconSizes" type="empty"/>
+    <property name="KeyThemeName" type="empty"/>
+    <property name="MenuImages" type="empty"/>
+    <property name="ButtonImages" type="empty"/>
+    <property name="MenuBarAccel" type="empty"/>
+    <property name="CursorThemeName" type="empty"/>
+    <property name="CursorThemeSize" type="empty"/>
+    <property name="DecorationLayout" type="string" value="icon,menu:minimize,maximize,close"/>
+    <property name="DialogsUseHeader" type="empty"/>
+    <property name="TitlebarMiddleClick" type="empty"/>
+  </property>
+  <property name="Gdk" type="empty">
+    <property name="WindowScalingFactor" type="empty"/>
+  </property>
+</channel>
diff --git a/root/usr/bin/exo-open b/root/usr/bin/exo-open
index e40fb556..6a7d1be4 100755
--- a/root/usr/bin/exo-open
+++ b/root/usr/bin/exo-open
@@ -2,6 +2,6 @@
 
 if [ "${2}" == "WebBrowser" ]; then
   /usr/bin/dex-autostart /usr/share/applications/chromium-browser.desktop
-else 
+else
   /usr/bin/exo-open-real "$@"
 fi
diff --git a/root/usr/bin/thunar b/root/usr/bin/thunar
new file mode 100755
index 00000000..952938a2
--- /dev/null
+++ b/root/usr/bin/thunar
@@ -0,0 +1,2 @@
+#!/bin/bash
+dbus-launch thunar-real "$@"