From 58233e7b4fcd71cb884b66314ebfa2095348a0b5 Mon Sep 17 00:00:00 2001
From: rene <mail@motocamp.de>
Date: Mon, 16 Mar 2026 18:43:51 +0100
Subject: [PATCH] setup-base: HiDPI-Konfiguration fuer beide MacBook-Modelle

Beide MBPs (13" und 16") haben Retina-Displays, daher
Skalierung nicht mehr auf MODEL=16 beschraenken.
---
 setup-base.sh | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/setup-base.sh b/setup-base.sh
index 8cb3798..ff4b981 100755
--- a/setup-base.sh
+++ b/setup-base.sh
@@ -268,14 +268,13 @@ fi
 
 ok "Systemkonfigurationen gesetzt"
 
-# ── 8. XFCE-Konfiguration (MBP 16": Compositor aus, Display-Skalierung) ─
-if [[ "$MODEL" == "16" ]]; then
-    echo -e "\n=== 8/11 XFCE-Konfiguration (MBP 16\") ==="
-    XFCE_XML_DIR="/home/rene/.config/xfce4/xfconf/xfce-perchannel-xml"
-    mkdir -p "$XFCE_XML_DIR"
+# ── 8. XFCE-Konfiguration (beide MBPs haben Retina-Displays) ─────────────
+echo -e "\n=== 8/11 XFCE-Konfiguration (HiDPI) ==="
+XFCE_XML_DIR="/home/rene/.config/xfce4/xfconf/xfce-perchannel-xml"
+mkdir -p "$XFCE_XML_DIR"
 
-    # Compositor deaktivieren + HiDPI-Theme + Titelschrift
-    cat > "$XFCE_XML_DIR/xfwm4.xml" <<XFEOF
+# Compositor deaktivieren + HiDPI-Theme + Titelschrift
+cat > "$XFCE_XML_DIR/xfwm4.xml" <<XFEOF
 <?xml version="1.0" encoding="UTF-8"?>
 <channel name="xfwm4" version="1.0">
   <property name="general" type="empty">
@@ -286,8 +285,8 @@ if [[ "$MODEL" == "16" ]]; then
 </channel>
 XFEOF
 
-    # Display-Skalierung für Retina (2x)
-    cat > "$XFCE_XML_DIR/xsettings.xml" <<XSEOF
+# Display-Skalierung für Retina (2x)
+cat > "$XFCE_XML_DIR/xsettings.xml" <<XSEOF
 <?xml version="1.0" encoding="UTF-8"?>
 <channel name="xsettings" version="1.0">
   <property name="Gdk" type="empty">
@@ -302,15 +301,12 @@ XFEOF
 </channel>
 XSEOF
 
-    # xfce4-display-settings deaktivieren (Endlosschleife)
-    dpkg-divert --local --rename --divert /usr/bin/xfce4-display-settings.real /usr/bin/xfce4-display-settings 2>/dev/null || true
-    ln -sf /usr/bin/true /usr/bin/xfce4-display-settings
+# xfce4-display-settings deaktivieren (Endlosschleife)
+dpkg-divert --local --rename --divert /usr/bin/xfce4-display-settings.real /usr/bin/xfce4-display-settings 2>/dev/null || true
+ln -sf /usr/bin/true /usr/bin/xfce4-display-settings
 
-    chown -R 1000:1000 /home/rene/.config/xfce4
-    ok "XFCE: Compositor aus, Retina-Skalierung, Display-Settings deaktiviert"
-else
-    echo -e "\n=== 8/11 XFCE-Konfiguration — Standard (MBP 13\") ==="
-fi
+chown -R 1000:1000 /home/rene/.config/xfce4
+ok "XFCE: Compositor aus, Retina-Skalierung, Display-Settings deaktiviert"
 
 # ── 9. Netzwerk: NetworkManager statt netplan ─────────────────────────────
 echo -e "\n=== 9/11 Netzwerk ==="