clawdie/clawdie-iso
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix/desktop-layout-and-hostname'

Browse source
This commit is contained in:
Clawdie Operator 2026-06-04 06:46:10 +00:00
commit 0ae0549c92
4 changed files with 70 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.sh
View file

@ -1354,8 +1354,8 @@ EOF
fi fi
# Keep a real hostname so startx/xauth do not derive invalid display names # Keep a real hostname so startx/xauth do not derive invalid display names
# such as bare :0 or /unix:0 on the installer-derived "Amnesiac" profile. # such as bare :0 or /unix:0 on the installer-derived "Amnesiac" profile.
set_config_line "${MOUNT_POINT}/etc/rc.conf" 'hostname="clawdie-live"' set_config_line "${MOUNT_POINT}/etc/rc.conf" 'hostname="usb.clawdie.home.arpa"'
if ! grep -Eq '^hostname="clawdie-live"' "${MOUNT_POINT}/etc/rc.conf"; then if ! grep -Eq '^hostname="usb.clawdie.home.arpa"' "${MOUNT_POINT}/etc/rc.conf"; then
echo "ERROR: live USB hostname is not configured in /etc/rc.conf" echo "ERROR: live USB hostname is not configured in /etc/rc.conf"
exit 1 exit 1
fi fi
@ -1401,12 +1401,11 @@ EOF
# hidbus / iichid — HID-over-I²C bridge for modern touchpads / keyboards. # hidbus / iichid — HID-over-I²C bridge for modern touchpads / keyboards.
# hms / hmt / hkbd — HID mouse / multitouch / keyboard class drivers. # hms / hmt / hkbd — HID mouse / multitouch / keyboard class drivers.
# acpi_video — backlight control sysctls (hw.acpi.video.lcd0.brightness). # acpi_video — backlight control sysctls (hw.acpi.video.lcd0.brightness).
# acpi_asus / acpi_asus_wmi — ASUS-laptop fn-keys, hotkeys, fan control. No-op on non-ASUS hardware.
append_rc_list_values "${MOUNT_POINT}/etc/rc.conf" kld_list \ append_rc_list_values "${MOUNT_POINT}/etc/rc.conf" kld_list \
linux linux64 zfs \ linux linux64 zfs \
cuse \ cuse \
hidbus iichid hms hmt hkbd \ hidbus iichid hms hmt hkbd \
acpi_video acpi_asus acpi_asus_wmi acpi_video
mkdir -p "${MOUNT_POINT}/etc/ssh/sshd_config.d" mkdir -p "${MOUNT_POINT}/etc/ssh/sshd_config.d"
install -m 0644 "${LIVE_SESSION_DIR}/sshd-live.conf" \ install -m 0644 "${LIVE_SESSION_DIR}/sshd-live.conf" \
@ -1542,7 +1541,7 @@ EOF
mkdir -p "${MOUNT_POINT}/usr/local/etc/xdg/xfce4/xfconf/xfce-perchannel-xml" mkdir -p "${MOUNT_POINT}/usr/local/etc/xdg/xfce4/xfconf/xfce-perchannel-xml"
cp "${PANEL_SKEL}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml" \ cp "${PANEL_SKEL}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml" \
"${MOUNT_POINT}/usr/local/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml" "${MOUNT_POINT}/usr/local/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml"
for _xfconf_xml in xsettings.xml xfwm4.xml xfce4-desktop.xml xfce4-power-manager.xml; do for _xfconf_xml in xsettings.xml xfwm4.xml xfce4-desktop.xml xfce4-power-manager.xml displays.xml; do
if [ -f "${PANEL_SKEL}/.config/xfce4/xfconf/xfce-perchannel-xml/${_xfconf_xml}" ]; then if [ -f "${PANEL_SKEL}/.config/xfce4/xfconf/xfce-perchannel-xml/${_xfconf_xml}" ]; then
cp "${PANEL_SKEL}/.config/xfce4/xfconf/xfce-perchannel-xml/${_xfconf_xml}" \ cp "${PANEL_SKEL}/.config/xfce4/xfconf/xfce-perchannel-xml/${_xfconf_xml}" \
"${MOUNT_POINT}/usr/local/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/${_xfconf_xml}" "${MOUNT_POINT}/usr/local/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/${_xfconf_xml}"

41
live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml Normal file
View file

@ -0,0 +1,41 @@
<?xml version="1.1" encoding="UTF-8"?>
<channel name="displays" version="1.0">
<property name="ActiveProfile" type="string" value="Default"/>
<property name="Notify" type="int" value="1"/>
<property name="AutoEnableProfiles" type="int" value="3"/>
<property name="Default" type="empty">
<property name="HDMI-A-0" type="string" value="Philips Consumer Electronics Company 58&quot;">
<property name="Active" type="bool" value="true"/>
<property name="EDID" type="string" value="eb3a88b3e924dff0eef60b51ede5d142f7854918"/>
<property name="DuplicateEDID" type="bool" value="false"/>
<property name="Resolution" type="string" value="1920x1080"/>
<property name="RefreshRate" type="double" value="60"/>
<property name="ModeFlags" type="uint64" value="5"/>
<property name="Rotation" type="int" value="270"/>
<property name="Reflection" type="string" value="0"/>
<property name="Primary" type="bool" value="false"/>
<property name="Scale" type="double" value="1"/>
<property name="Position" type="empty">
<property name="X" type="int" value="0"/>
<property name="Y" type="int" value="0"/>
</property>
</property>
<property name="eDP" type="string" value="Laptop">
<property name="Active" type="bool" value="true"/>
<property name="EDID" type="string" value="094c68e1cb71ed69083c70a30d0d951ed88f1a73"/>
<property name="DuplicateEDID" type="bool" value="false"/>
<property name="Resolution" type="string" value="1920x1080"/>
<property name="RefreshRate" type="double" value="60.003425830763959"/>
<property name="ModeFlags" type="uint64" value="9"/>
<property name="Rotation" type="int" value="0"/>
<property name="Reflection" type="string" value="0"/>
<property name="Primary" type="bool" value="true"/>
<property name="Scale" type="double" value="1"/>
<property name="Position" type="empty">
<property name="X" type="int" value="1080"/>
<property name="Y" type="int" value="840"/>
</property>
</property>
</property>
</channel>

22
live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
View file

@ -7,12 +7,34 @@
<property name="image-style" type="int" value="5"/> <property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/local/share/clawdie-iso/wallpapers/clawdie-operator-bg.png"/> <property name="last-image" type="string" value="/usr/local/share/clawdie-iso/wallpapers/clawdie-operator-bg.png"/>
<property name="image-show" type="bool" value="true"/> <property name="image-show" type="bool" value="true"/>
<property name="image-path" type="string" value="/usr/local/share/clawdie-iso/wallpapers/clawdie-operator-bg.png"/>
</property> </property>
<property name="workspace1" type="empty"> <property name="workspace1" type="empty">
<property name="color-style" type="int" value="0"/> <property name="color-style" type="int" value="0"/>
<property name="image-style" type="int" value="5"/> <property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/local/share/clawdie-iso/wallpapers/clawdie-operator-bg.png"/> <property name="last-image" type="string" value="/usr/local/share/clawdie-iso/wallpapers/clawdie-operator-bg.png"/>
<property name="image-show" type="bool" value="true"/> <property name="image-show" type="bool" value="true"/>
<property name="image-path" type="string" value="/usr/local/share/clawdie-iso/wallpapers/clawdie-operator-bg.png"/>
</property>
</property>
<property name="screen0" type="empty">
<property name="monitoreDP" type="empty">
<property name="workspace0" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-path" type="string" value="/usr/local/share/clawdie-iso/wallpapers/clawdie-operator-bg.png"/>
<property name="image-show" type="bool" value="true"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/local/share/clawdie-iso/wallpapers/clawdie-operator-bg.png"/>
</property>
</property>
<property name="monitorHDMI-A-0" type="empty">
<property name="workspace0" type="empty">
<property name="color-style" type="int" value="0"/>
<property name="image-path" type="string" value="/usr/local/share/clawdie-iso/wallpapers/clawdie-operator-bg.png"/>
<property name="image-show" type="bool" value="true"/>
<property name="image-style" type="int" value="5"/>
<property name="last-image" type="string" value="/usr/local/share/clawdie-iso/wallpapers/clawdie-operator-bg.png"/>
</property>
</property> </property>
</property> </property>
</property> </property>

5
live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
View file

@ -40,6 +40,7 @@
<value type="int" value="10"/> <value type="int" value="10"/>
<value type="int" value="12"/> <value type="int" value="12"/>
</property> </property>
<property name="output-name" type="string" value="eDP"/>
</property> </property>
</property> </property>
<property name="plugins" type="empty"> <property name="plugins" type="empty">
@ -93,13 +94,13 @@
<property name="update-interval" type="int" value="4"/> <property name="update-interval" type="int" value="4"/>
</property> </property>
<property name="plugin-10" type="string" value="xkb"> <property name="plugin-10" type="string" value="xkb">
<property name="display-type" type="uint" value="1"/> <property name="display-type" type="uint" value="0"/>
<property name="display-name" type="uint" value="0"/> <property name="display-name" type="uint" value="0"/>
<property name="group-policy" type="uint" value="0"/> <property name="group-policy" type="uint" value="0"/>
</property> </property>
<property name="plugin-12" type="string" value="clock"> <property name="plugin-12" type="string" value="clock">
<property name="mode" type="uint" value="2"/> <property name="mode" type="uint" value="2"/>
<property name="digital-format" type="string" value="%H:%M %d.%b.%Y"/> <property name="digital-format" type="string" value="%H:%M %d.%b.%y"/>
<property name="font" type="string" value="Noto Sans 14"/> <property name="font" type="string" value="Noto Sans 14"/>
<property name="fg-color" type="array"> <property name="fg-color" type="array">
<value type="uint" value="65535"/> <value type="uint" value="65535"/>