Asahi-Skripte: GNOME-Desktop, WireGuard, FreeCAD, p10k-Fix
setup-base-asahi.sh: - WireGuard-Setup (wireguard-tools + m1.conf Hinweis) - Header bereinigt, Nummerierung auf 1-8 setup-desktop-asahi.sh: - XFCE-Block durch GNOME-Einstellungen ersetzt (Dash to Panel, Power, Uhr 24h, Batterie-%, Terminal-Font) - FreeCAD als Flatpak - Powerlevel10k Instant Prompt quiet-Fix
This commit is contained in:
René
parent
b27d5c81c1
commit
3f33bdf776
2 changed files with 68 additions and 51 deletions
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
# macbook-setup/setup-desktop-asahi.sh
|
||||
# Desktop-Setup fuer Asahi Linux (Fedora Remix) auf Apple Silicon M1
|
||||
# Braucht eine laufende Desktop-Session (XFCE) — NICHT in chroot ausfuehren!
|
||||
# Braucht eine laufende Desktop-Session (GNOME) — NICHT in chroot ausfuehren!
|
||||
# Verwendung: bash setup-desktop-asahi.sh
|
||||
# Wird automatisch beim ersten Login gestartet (via Autostart)
|
||||
|
||||
|
|
@ -86,6 +86,10 @@ else
|
|||
warn "PrusaSlicer Flatpak nicht verfuegbar fuer ARM64 — ggf. aus Source bauen"
|
||||
fi
|
||||
|
||||
# FreeCAD
|
||||
flatpak install --user -y flathub org.freecad.FreeCAD
|
||||
ok "FreeCAD installiert (Flatpak)"
|
||||
|
||||
# ── 6. PlatformIO (pipx) ────────────────────────────────────────────────
|
||||
echo -e "\n=== 6/8 PlatformIO ==="
|
||||
if ! command -v pio &>/dev/null; then
|
||||
|
|
@ -150,6 +154,13 @@ if [[ -f "$DOTFILES_DIR/zsh/install-zsh-dotfiles.sh" ]]; then
|
|||
ok "Dot-Files: .zshrc"
|
||||
fi
|
||||
|
||||
# Powerlevel10k Instant Prompt: quiet-Modus ganz oben in .zshrc
|
||||
# Muss VOR dem oh-my-zsh source stehen, nicht in .p10k.zsh (wird dort ueberschrieben)
|
||||
if [[ -f ~/.zshrc ]] && ! grep -q 'POWERLEVEL9K_INSTANT_PROMPT=quiet' ~/.zshrc; then
|
||||
sed -i '1i typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet' ~/.zshrc
|
||||
ok "Powerlevel10k Instant Prompt: quiet"
|
||||
fi
|
||||
|
||||
# ~/.secrets fuer API-Keys (source in .zshrc eintragen)
|
||||
if ! grep -q 'source ~/.secrets' ~/.zshrc 2>/dev/null; then
|
||||
echo '' >> ~/.zshrc
|
||||
|
|
@ -166,45 +177,42 @@ else
|
|||
warn ".p10k.zsh nicht im Dotfiles-Repo — beim ersten zsh-Start 'p10k configure' ausfuehren"
|
||||
fi
|
||||
|
||||
# ── 8. XFCE-Einstellungen ───────────────────────────────────────────────
|
||||
echo -e "\n=== 8/8 XFCE-Einstellungen ==="
|
||||
# ── 8. GNOME-Einstellungen ───────────────────────────────────────────────
|
||||
echo -e "\n=== 8/8 GNOME-Einstellungen ==="
|
||||
|
||||
# Keyboard: XFCE soll System-Layout respektieren
|
||||
if command -v xfconf-query &>/dev/null; then
|
||||
xfconf-query -c keyboard-layout -p /Default/XkbDisable -n -t bool -s true 2>/dev/null || true
|
||||
ok "XFCE Keyboard: System-Layout wird verwendet"
|
||||
fi
|
||||
|
||||
# Energieeinstellungen
|
||||
if command -v xfconf-query &>/dev/null; then
|
||||
xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/dpms-on-ac-off -s 0 --create -t int
|
||||
xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/dpms-on-ac-sleep -s 0 --create -t int
|
||||
xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/blank-on-ac -s 0 --create -t int
|
||||
xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/blank-on-battery -s 5 --create -t int
|
||||
xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/dpms-on-battery-sleep -s 6 --create -t int
|
||||
xfconf-query -c xfce4-power-manager -p /xfce4-power-manager/dpms-on-battery-off -s 7 --create -t int
|
||||
ok "XFCE Power Manager konfiguriert"
|
||||
# Dash to Panel aktivieren (Taskleiste oben statt Dock + Top Bar)
|
||||
if gnome-extensions list 2>/dev/null | grep -q dash-to-panel; then
|
||||
gnome-extensions enable dash-to-panel@jderose9.github.com 2>/dev/null || true
|
||||
# Panel-Position: oben
|
||||
dconf write /org/gnome/shell/extensions/dash-to-panel/panel-positions '"{\"0\":\"TOP\"}"'
|
||||
dconf write /org/gnome/shell/extensions/dash-to-panel/panel-sizes '"{\"0\":32}"'
|
||||
ok "Dash to Panel aktiviert (oben, 32px)"
|
||||
else
|
||||
warn "xfconf-query nicht gefunden — XFCE Energieeinstellungen uebersprungen"
|
||||
warn "Dash to Panel nicht installiert — mit 'sudo dnf install gnome-shell-extension-dash-to-panel' nachinstallieren"
|
||||
fi
|
||||
|
||||
# XFCE Terminal: MesloLGS NF als Schriftart setzen
|
||||
XFCE_TERM_RC="$HOME/.config/xfce4/terminal/terminalrc"
|
||||
if [[ -d "$HOME/.config/xfce4" ]]; then
|
||||
mkdir -p "$(dirname "$XFCE_TERM_RC")"
|
||||
if [[ -f "$XFCE_TERM_RC" ]]; then
|
||||
sed -i 's/^FontName=.*/FontName=MesloLGS NF 11/' "$XFCE_TERM_RC" 2>/dev/null || true
|
||||
else
|
||||
cat > "$XFCE_TERM_RC" <<'TERMEOF'
|
||||
[Configuration]
|
||||
FontName=MesloLGS NF 11
|
||||
MiscAlwaysShowTabs=FALSE
|
||||
MiscBell=FALSE
|
||||
MiscDefaultGeometry=120x35
|
||||
ScrollingBar=TERMINAL_SCROLLBAR_NONE
|
||||
TERMEOF
|
||||
fi
|
||||
ok "XFCE Terminal: MesloLGS NF Schriftart"
|
||||
# Energieeinstellungen: am Netzteil nicht dimmen/ausschalten
|
||||
gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-ac-type 'nothing'
|
||||
gsettings set org.gnome.settings-daemon.plugins.power sleep-inactive-battery-timeout 900
|
||||
gsettings set org.gnome.desktop.session idle-delay 300
|
||||
ok "GNOME Power: Batterie-Sleep 15min, Idle-Dimming 5min, AC kein Sleep"
|
||||
|
||||
# Uhr: 24h-Format mit Datum und Wochentag
|
||||
gsettings set org.gnome.desktop.interface clock-format '24h'
|
||||
gsettings set org.gnome.desktop.interface clock-show-date true
|
||||
gsettings set org.gnome.desktop.interface clock-show-weekday true
|
||||
ok "GNOME Uhr: 24h mit Datum und Wochentag"
|
||||
|
||||
# Batterie-Prozent anzeigen
|
||||
gsettings set org.gnome.desktop.interface show-battery-percentage true
|
||||
ok "GNOME Batterie-Prozent angezeigt"
|
||||
|
||||
# GNOME Terminal: MesloLGS NF als Schriftart setzen
|
||||
GNOME_TERM_PROFILE=$(gsettings get org.gnome.Terminal.ProfilesList default 2>/dev/null | tr -d "'")
|
||||
if [[ -n "$GNOME_TERM_PROFILE" ]]; then
|
||||
dconf write /org/gnome/terminal/legacy/profiles:/:$GNOME_TERM_PROFILE/use-system-font false
|
||||
dconf write /org/gnome/terminal/legacy/profiles:/:$GNOME_TERM_PROFILE/font "'MesloLGS NF 11'"
|
||||
ok "GNOME Terminal: MesloLGS NF 11"
|
||||
fi
|
||||
|
||||
# ── Autostart entfernen ─────────────────────────────────────────────────
|
||||
|
|
@ -224,8 +232,8 @@ warn "Noch manuell erledigen:"
|
|||
echo " 1. Synology Drive Client installieren (falls ARM64-Version verfuegbar)"
|
||||
echo " 2. Thunderbird starten -> Profil aus Synology Drive einbinden"
|
||||
echo " 3. Brave starten -> Synchronisation einrichten"
|
||||
echo " 4. Falls p10k-Icons fehlen: Terminal-Schriftart auf 'MesloLGS NF' setzen"
|
||||
echo " 5. API-Key aus Bitwarden in ~/.secrets eintragen:"
|
||||
echo " 4. API-Key aus Bitwarden in ~/.secrets eintragen:"
|
||||
echo " echo 'export ANTHROPIC_API_KEY=\"sk-ant-...\"' > ~/.secrets && chmod 600 ~/.secrets"
|
||||
echo " 6. Falls PrusaSlicer fehlt: aus Source bauen (kein ARM64-Flatpak)"
|
||||
echo " 7. PlatformIO testen: ESP32-Toolchains evtl. nur x86 verfuegbar"
|
||||
echo " 5. Falls PrusaSlicer fehlt: aus Source bauen (kein ARM64-Flatpak)"
|
||||
echo " 6. PlatformIO testen: ESP32-Toolchains evtl. nur x86 verfuegbar"
|
||||
echo " 7. Dash to Panel konfigurieren: Rechtsklick auf Leiste -> Einstellungen"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue