From adc5367a8c1590efcf11ffd4a1bcb704598f187a Mon Sep 17 00:00:00 2001 From: rene Date: Wed, 11 Mar 2026 18:29:20 +0100 Subject: [PATCH] Brave/LibreOffice auf Flatpak/Snap, HiDPI-Fix, Autostart mit Terminal - Brave: .deb entfernt (crasht mit SIGTRAP auf aelterer HW), Flatpak statt dessen - LibreOffice: apt entfernt (Installationsfehler), Snap statt dessen - default-jre entfernt (nur fuer LibreOffice .deb noetig) - flatpak Paket in setup-base.sh (kein sudo in setup-desktop.sh noetig) - HiDPI: DPI 96 statt 128, Cursor 48, xfwm4 Default-xhdpi Theme - Autostart oeffnet Terminal-Fenster fuer interaktive Eingaben --- README.md | 9 +++++++++ setup-base.sh | 39 ++++++++++++++------------------------- setup-desktop.sh | 9 ++++----- setup.sh | 10 ++++++++-- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 779460d..2522032 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,15 @@ cd macbook-setup - Forgejo-Zugang für Dot-Files-Clone - Thunderbird-Profil-Backup in Synology Drive +## Paketquellen + +| App | Quelle | Grund | +|-----|--------|-------| +| LibreOffice | Snap | .deb-Version hat Installationsfehler auf MBP | +| FreeCAD | Snap | Standard | +| Brave Browser | Flatpak | .deb crasht (int3/SIGTRAP) auf aelterer Hardware | +| PrusaSlicer | Flatpak | Standard | + ## Hardware-Besonderheiten ### MBP 16" Mid 2014 (Intel + Nvidia GT 750M) diff --git a/setup-base.sh b/setup-base.sh index 67089e4..3fd70f8 100755 --- a/setup-base.sh +++ b/setup-base.sh @@ -104,13 +104,12 @@ apt install -y \ pipx \ zoxide \ micro \ - libreoffice libreoffice-l10n-de \ + flatpak \ thunderbird thunderbird-locale-de \ keepassxc \ htop btop \ timeshift \ vlc \ - default-jre \ language-pack-de \ wngerman \ bc \ @@ -118,28 +117,13 @@ apt install -y \ || { fail "apt install fehlgeschlagen"; dpkg --configure -a; apt install -f -y; } ok "Pakete installiert (apt)" -# FreeCAD via Snap -snap install freecad 2>/dev/null || warn "FreeCAD Snap übersprungen" +# FreeCAD + LibreOffice via Snap +snap install freecad 2>/dev/null || warn "FreeCAD Snap uebersprungen" +snap install libreoffice 2>/dev/null || warn "LibreOffice Snap uebersprungen" -# ── 6. Brave Browser ───────────────────────────────────────────────────── +# ── 6. Brave Browser (wird in setup-desktop.sh als Flatpak installiert) ── echo -e "\n=== 6/11 Brave Browser ===" -curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg \ - https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg -curl -fsSLo /etc/apt/sources.list.d/brave-browser-release.sources \ - https://brave-browser-apt-release.s3.brave.com/brave-browser.sources -apt update && apt install -y brave-browser || warn "Brave Browser fehlgeschlagen" - -# Brave: --disable-gpu Flag setzen (AMD geblockt, Intel i915 allein reicht nicht für GPU-Accel) -if [[ "$MODEL" == "16" ]]; then - mkdir -p /etc/brave-browser - echo '{"hardware_acceleration_mode_previous": false}' > /etc/brave-browser/initial_preferences 2>/dev/null || true - # Override .desktop Datei mit --disable-gpu - BRAVE_DESKTOP="/usr/share/applications/brave-browser.desktop" - if [[ -f "$BRAVE_DESKTOP" ]]; then - sed -i 's|Exec=/usr/bin/brave-browser-stable|Exec=/usr/bin/brave-browser-stable --disable-gpu|g' "$BRAVE_DESKTOP" - fi -fi -ok "Brave installiert" +ok "Brave wird als Flatpak in setup-desktop.sh installiert" # ── 7. Systemkonfigurationen ───────────────────────────────────────────── echo -e "\n=== 7/11 Systemkonfigurationen ===" @@ -160,17 +144,19 @@ if [[ "$MODEL" == "16" ]]; then XFCE_XML_DIR="/home/rene/.config/xfce4/xfconf/xfce-perchannel-xml" mkdir -p "$XFCE_XML_DIR" - # Compositor deaktivieren + # Compositor deaktivieren + HiDPI-Theme + Titelschrift cat > "$XFCE_XML_DIR/xfwm4.xml" < + + XFEOF - # Display-Skalierung für Retina (2x, DPI 128) + # Display-Skalierung für Retina (2x) cat > "$XFCE_XML_DIR/xsettings.xml" < @@ -178,7 +164,10 @@ XFEOF - + + + + XSEOF diff --git a/setup-desktop.sh b/setup-desktop.sh index e167f31..589105a 100755 --- a/setup-desktop.sh +++ b/setup-desktop.sh @@ -71,14 +71,13 @@ export PATH="$HOME/.npm-global/bin:$PATH" npm install -g @anthropic-ai/claude-code ok "Claude Code installiert" -# ── 5. PrusaSlicer (Flatpak) ──────────────────────────────────────────── -echo -e "\n=== 5/8 PrusaSlicer ===" -if ! command -v flatpak &>/dev/null; then - sudo apt install -y flatpak -fi +# ── 5. Flatpak-Apps (PrusaSlicer + Brave) ────────────────────────────── +echo -e "\n=== 5/8 Flatpak-Apps ===" flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak install --user -y flathub com.prusa3d.PrusaSlicer ok "PrusaSlicer installiert (Flatpak)" +flatpak install --user -y flathub com.brave.Browser +ok "Brave Browser installiert (Flatpak)" # ── 6. PlatformIO (pipx) ──────────────────────────────────────────────── echo -e "\n=== 6/8 PlatformIO ===" diff --git a/setup.sh b/setup.sh index ba42cda..9f6cad4 100644 --- a/setup.sh +++ b/setup.sh @@ -41,8 +41,14 @@ ok "Phase 1 abgeschlossen" # ── Phase 2: Desktop-Setup als Autostart einrichten ────────────────────── echo -e "\n>>> Phase 2: setup-desktop.sh wird als Autostart eingerichtet" mkdir -p ~/.config/autostart -printf '[Desktop Entry]\nType=Application\nName=MacBook Setup Desktop\nExec=bash -c "curl -fsSL %s/setup-desktop.sh | bash 2>&1 | tee /tmp/setup-desktop.log"\nHidden=false\nX-GNOME-Autostart-enabled=true\n' "$SETUP_RAW" \ - > ~/.config/autostart/macbook-setup-desktop.desktop +cat > ~/.config/autostart/macbook-setup-desktop.desktop <&1 | tee /tmp/setup-desktop.log; echo; echo Setup abgeschlossen - Enter zum Schliessen; read'" +Hidden=false +X-GNOME-Autostart-enabled=true +DTEOF ok "Autostart für setup-desktop.sh eingerichtet" echo ""