setup_x11_jarvis.sh
This commit is contained in:
@@ -1,608 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Abbrechen bei Fehlern
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "===================================================="
|
|
||||||
echo "🚀 Starte J.A.R.V.I.S. Desktop OS - Pure Local Setup"
|
|
||||||
echo "===================================================="
|
|
||||||
|
|
||||||
# Benutzererkennung
|
|
||||||
REAL_USER="${SUDO_USER:-$(logname 2>/dev/null || whoami)}"
|
|
||||||
REAL_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
|
||||||
|
|
||||||
if [ -z "$REAL_USER" ] || [ "$REAL_USER" = "root" ]; then
|
|
||||||
REAL_USER=$(id -nu 1000 2>/dev/null || echo "meik")
|
|
||||||
REAL_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
|
||||||
fi
|
|
||||||
|
|
||||||
JARVIS_DIR="$REAL_HOME/jarvis-ai"
|
|
||||||
|
|
||||||
# 1. System aktualisieren & Basispakete installieren
|
|
||||||
echo "📦 Aktualisiere Paketquellen und installiere Systemkomponenten..."
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y labwc firefox-esr curl wget git sudo python3 python3-pip python3-venv original-awk tilix geany waybar wlr-randr fonts-noto-color-emoji wofi pipewire pipewire-audio-client-libraries pipewire-pulse wireplumber alsa-utils libasound2-dev libportaudio2 unzip
|
|
||||||
|
|
||||||
# 1.1 Gruppenrechte für Grafik und Eingabe
|
|
||||||
echo "👥 Füge Benutzer '$REAL_USER' zu den Grafik- und Input-Gruppen hinzu..."
|
|
||||||
sudo usermod -aG video,render,input "$REAL_USER"
|
|
||||||
systemctl --user --now enable pipewire.service pipewire-pulse.service wireplumber.service
|
|
||||||
|
|
||||||
# 2. Architektur erkennen und wdotool installieren
|
|
||||||
ARCH=$(uname -m)
|
|
||||||
echo "🔍 Erkannte Systemarchitektur: $ARCH"
|
|
||||||
|
|
||||||
if [ "$ARCH" = "x86_64" ]; then
|
|
||||||
wget https://github.com/cushycush/wdotool/releases/download/v0.5.3/wdotool_0.5.3-1_amd64.deb -O /tmp/wdotool.deb
|
|
||||||
sudo apt install -y /tmp/wdotool.deb
|
|
||||||
rm /tmp/wdotool.deb
|
|
||||||
elif [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then
|
|
||||||
curl --proto '=https' --tlsv1.2 -LsSf https://github.com/cushycush/wdotool/releases/download/v0.5.3/wdotool-installer.sh | sh
|
|
||||||
else
|
|
||||||
echo "❌ Unbekannte Architektur: $ARCH. Installation abgebrochen."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 3. Den realen Installationspfad von wdotool ermitteln
|
|
||||||
echo "🛠️ Konfiguriere globalen wdotool-Wrapper..."
|
|
||||||
if [ -f "/usr/bin/wdotool" ]; then REAL_WDOTOOL="/usr/bin/wdotool"
|
|
||||||
elif [ -f "$REAL_HOME/.cargo/bin/wdotool" ]; then REAL_WDOTOOL="$REAL_HOME/.cargo/bin/wdotool"
|
|
||||||
elif [ -f "$REAL_HOME/.local/bin/wdotool" ]; then REAL_WDOTOOL="$REAL_HOME/.local/bin/wdotool"
|
|
||||||
else REAL_WDOTOOL=$(which wdotool || true); fi
|
|
||||||
|
|
||||||
if [ -z "$REAL_WDOTOOL" ]; then echo "❌ Fehler: wdotool nicht gefunden!"; exit 1; fi
|
|
||||||
|
|
||||||
sudo mv "$REAL_WDOTOOL" /usr/local/bin/wdotool.real
|
|
||||||
|
|
||||||
# 4.1 wdotool Wrapper erstellen
|
|
||||||
sudo cat << 'EOF' | sudo tee /usr/local/bin/wdotool > /dev/null
|
|
||||||
#!/bin/bash
|
|
||||||
export XDG_RUNTIME_DIR=/run/user/$(id -u)
|
|
||||||
export WAYLAND_DISPLAY=wayland-0
|
|
||||||
exec /usr/local/bin/wdotool.real "$@"
|
|
||||||
EOF
|
|
||||||
sudo chmod +x /usr/local/bin/wdotool
|
|
||||||
|
|
||||||
# 4.2 wdotool Wrapper erstellen
|
|
||||||
sudo cat << 'EOF' | sudo tee /usr/local/bin/jwin > /dev/null
|
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
ACTION=$1
|
|
||||||
APP_NAME=$2
|
|
||||||
PARAM1=$3
|
|
||||||
WD="wdotool --backend wlr-protocols"
|
|
||||||
|
|
||||||
if [ -z "$ACTION" ] || [ -z "$APP_NAME" ]; then
|
|
||||||
echo "❌ Fehler: Falsche Syntax."
|
|
||||||
echo "Nutzung: jwin <start|activate|close|snap|maximize> <Programm/Fenstername> [Parameter]"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# =========================================================
|
|
||||||
# 1. SONDERFALL: PROGRAMM STARTEN (Mit Display-Erkennung)
|
|
||||||
# =========================================================
|
|
||||||
if [ "$ACTION" == "start" ]; then
|
|
||||||
shift
|
|
||||||
|
|
||||||
if [ -z "$WAYLAND_DISPLAY" ]; then
|
|
||||||
export WAYLAND_DISPLAY=$(ls /run/user/$(id -u)/wayland-* 2>/dev/null | head -n 1 | xargs basename)
|
|
||||||
[ -z "$WAYLAND_DISPLAY" ] && export WAYLAND_DISPLAY="wayland-0"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$DISPLAY" ]; then
|
|
||||||
export DISPLAY=":0"
|
|
||||||
fi
|
|
||||||
|
|
||||||
nohup "$@" >/dev/null 2>&1 &
|
|
||||||
echo "✅ Programm '$APP_NAME' wurde entkoppelt im Hintergrund gestartet (Display: $WAYLAND_DISPLAY)."
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# =========================================================
|
|
||||||
# 2. SONDERFALL: PROGRAMM SCHLIESSEN (Direkt & unfehlbar)
|
|
||||||
# =========================================================
|
|
||||||
if [ "$ACTION" == "close" ]; then
|
|
||||||
# Namen in Kleinbuchstaben umwandeln für maximale Trefferquote
|
|
||||||
LOW_APP=$(echo "$APP_NAME" | tr '[:upper:]' '[:lower:]')
|
|
||||||
|
|
||||||
# Direktes Signal an das System senden
|
|
||||||
pkill -f "$LOW_APP"
|
|
||||||
|
|
||||||
echo "✅ Schließ-Signal (pkill) an '$APP_NAME' gesendet."
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# =========================================================
|
|
||||||
# 3. WAYLAND-SUCHE (Nur noch für activate, snap, maximize)
|
|
||||||
# =========================================================
|
|
||||||
if [ "$APP_NAME" == "active" ]; then
|
|
||||||
WINDOW_ID=$($WD getactivewindow 2>/dev/null | awk '{print $1}')
|
|
||||||
else
|
|
||||||
WINDOW_LINE=$($WD search --ignore-case --any --name "$APP_NAME" --class "$APP_NAME" 2>/dev/null | head -n 1)
|
|
||||||
|
|
||||||
if [ -z "$WINDOW_LINE" ]; then
|
|
||||||
SAFE_APP_NAME=$(echo "$APP_NAME" | sed 's/[.[\*^$]/\\&/g')
|
|
||||||
WINDOW_LINE=$($WD search --ignore-case --regex --any --name "$SAFE_APP_NAME" --class "$SAFE_APP_NAME" 2>/dev/null | head -n 1)
|
|
||||||
fi
|
|
||||||
WINDOW_ID=$(echo "$WINDOW_LINE" | awk '{print $1}')
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$ACTION" in
|
|
||||||
activate)
|
|
||||||
if [ -n "$WINDOW_ID" ]; then
|
|
||||||
$WD windowactivate "$WINDOW_ID"
|
|
||||||
echo "✅ Fenster '$APP_NAME' (ID: $WINDOW_ID) ist jetzt im Fokus."
|
|
||||||
else
|
|
||||||
$WD key alt+Tab
|
|
||||||
echo "⚠️ Keine direkte Fenster-ID gefunden, wechsle Fokus via Alt+Tab."
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
maximize)
|
|
||||||
if [ -n "$WINDOW_ID" ]; then
|
|
||||||
$WD windowactivate "$WINDOW_ID"
|
|
||||||
sleep 0.1
|
|
||||||
fi
|
|
||||||
$WD key super+up
|
|
||||||
echo "✅ Maximieren-Signal gesendet."
|
|
||||||
;;
|
|
||||||
snap)
|
|
||||||
if [ -z "$PARAM1" ]; then
|
|
||||||
echo "❌ Fehler: Für 'snap' wird eine Richtung benötigt."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "$WINDOW_ID" ]; then
|
|
||||||
$WD windowactivate "$WINDOW_ID"
|
|
||||||
sleep 0.1
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$PARAM1" in
|
|
||||||
left) $WD key super+Left ;;
|
|
||||||
right) $WD key super+Right ;;
|
|
||||||
up) $WD key super+Up ;;
|
|
||||||
down) $WD key super+Down ;;
|
|
||||||
top-left) $WD key super+shift+Left ;;
|
|
||||||
top-right) $WD key super+shift+Up ;;
|
|
||||||
bottom-right) $WD key super+shift+Down ;;
|
|
||||||
bottom-left) $WD key super+shift+Right ;;
|
|
||||||
*) echo "❌ Unbekannte Richtung: $PARAM1" ; exit 1 ;;
|
|
||||||
esac
|
|
||||||
echo "✅ Fenster '$APP_NAME' nach $PARAM1 angedockt."
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "❌ Unbekannte Aktion: $ACTION."
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
EOF
|
|
||||||
|
|
||||||
sudo chmod +x /usr/local/bin/jwin
|
|
||||||
|
|
||||||
|
|
||||||
# 5. Desktop-Konfiguration (labwc & environment)
|
|
||||||
echo "📂 Konfiguriere labwcAutostart und Tastaturlayout..."
|
|
||||||
mkdir -p "$REAL_HOME/.config/labwc"
|
|
||||||
|
|
||||||
cat << 'EOF' > "$REAL_HOME/.config/labwc/environment"
|
|
||||||
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=labwc
|
|
||||||
XKB_DEFAULT_LAYOUT=de
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# 6. Auto-Start in .profile eintragen
|
|
||||||
echo "⚙️ Richte .profile für Wayland Auto-Start ein..."
|
|
||||||
if ! grep -q "labwc" "$REAL_HOME/.profile"; then
|
|
||||||
cat << 'EOF' >> "$REAL_HOME/.profile"
|
|
||||||
|
|
||||||
if [ "$(tty)" = "/dev/tty1" ]; then
|
|
||||||
export WLR_RENDERER=pixman
|
|
||||||
export WLR_NO_HARDWARE_CURSORS=1
|
|
||||||
export LIBGL_ALWAYS_SOFTWARE=1
|
|
||||||
dbus-run-session labwc > ~/labwc.log 2>&1
|
|
||||||
logout
|
|
||||||
fi
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 7. Waybar & Wofi Powermenu
|
|
||||||
echo "📊 Konfiguriere Waybar und Wofi Power-Menü..."
|
|
||||||
mkdir -p "$REAL_HOME/.config/waybar"
|
|
||||||
|
|
||||||
cat << 'EOF' > "$REAL_HOME/.config/waybar/config"
|
|
||||||
{
|
|
||||||
"layer": "top", "position": "bottom", "height": 34,
|
|
||||||
"modules-left": ["custom/terminal", "custom/browser", "wlr/taskbar"],
|
|
||||||
"modules-right": ["clock", "custom/logout"],
|
|
||||||
"custom/terminal": { "format": "📁 Term", "on-click": "tilix", "tooltip": false },
|
|
||||||
"custom/browser": { "format": "🌐 Web", "on-click": "MOZ_WEBRENDER=software MOZ_ENABLE_WAYLAND=1 firefox-esr", "tooltip": false },
|
|
||||||
"wlr/taskbar": { "format": "{icon}", "icon-size": 16, "on-click": "activate", "on-click-right": "minimize" },
|
|
||||||
"clock": { "format": "🕒 {:%H:%M:%S}", "interval": 1 },
|
|
||||||
"custom/logout": { "format": "⚙️ System ", "on-click": "~/.config/labwc/powermenu.sh", "tooltip": false }
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat << 'EOF' > "$REAL_HOME/.config/waybar/style.css"
|
|
||||||
* { font-family: sans-serif; font-size: 12px; }
|
|
||||||
window#waybar { background-color: #1e293b; color: white; border-top: 1px solid #334155; }
|
|
||||||
#custom-terminal, #custom-browser { padding: 0 8px; background: #334155; margin: 3px 2px; border-radius: 3px; }
|
|
||||||
#custom-terminal:hover, #custom-browser:hover { background: #475569; }
|
|
||||||
#taskbar button { padding: 0 10px; color: #94a3b8; }
|
|
||||||
#taskbar button.active { background-color: #0f172a; color: #38bdf8; }
|
|
||||||
#clock { padding: 0 15px; background-color: #0f172a; }
|
|
||||||
#custom-logout { padding: 0 12px; background-color: #ef4444; color: white; }
|
|
||||||
#custom-logout:hover { background-color: #dc2626; }
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat << 'EOF' > "$REAL_HOME/.config/labwc/powermenu.sh"
|
|
||||||
#!/bin/bash
|
|
||||||
OPTIONS="🚪 Abmelden\n🔄 Neu starten\n🛑 Herunterfahren"
|
|
||||||
CHOICE=$(echo -e "$OPTIONS" | wofi --dmenu --prompt "Systemaktion wählen:" --width 280 --height 180 --style "$HOME/.config/labwc/wofi-power.css")
|
|
||||||
case "$CHOICE" in
|
|
||||||
*"Abmelden") labwc --exit ;;
|
|
||||||
*"Neu starten") sudo systemctl reboot ;;
|
|
||||||
*"Herunterfahren") sudo systemctl poweroff ;;
|
|
||||||
esac
|
|
||||||
EOF
|
|
||||||
chmod +x "$REAL_HOME/.config/labwc/powermenu.sh"
|
|
||||||
|
|
||||||
cat << 'EOF' > "$REAL_HOME/.config/labwc/wofi-power.css"
|
|
||||||
window { background-color: #1e293b; color: white; border: 2px solid #334155; border-radius: 8px; font-family: sans-serif; }
|
|
||||||
#entry { padding: 8px; color: white; }
|
|
||||||
#entry:selected { background-color: #334155; color: #38bdf8; }
|
|
||||||
#input { background-color: #0f172a; color: white; border: 1px solid #334155; margin: 5px; }
|
|
||||||
EOF
|
|
||||||
|
|
||||||
echo "%sudo ALL=(ALL) NOPASSWD: /usr/bin/systemctl poweroff, /usr/bin/systemctl reboot" | sudo tee /etc/sudoers.d/powermenu > /dev/null
|
|
||||||
sudo chmod 0440 /etc/sudoers.d/powermenu
|
|
||||||
|
|
||||||
|
|
||||||
# ===================================================================
|
|
||||||
# 8. J.A.R.V.I.S. REIN LOKALE INSTALLATION
|
|
||||||
# ===================================================================
|
|
||||||
echo "🧠 Installiere J.A.R.V.I.S. AI Desktop Backend..."
|
|
||||||
mkdir -p "$JARVIS_DIR"/{config,workspace}
|
|
||||||
|
|
||||||
# J.A.R.V.I.S. Requirements
|
|
||||||
cat << 'EOF' > "$JARVIS_DIR/requirements.txt"
|
|
||||||
openai
|
|
||||||
google-genai
|
|
||||||
python-dotenv
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# J.A.R.V.I.S. .env Template
|
|
||||||
cat << 'EOF' > "$JARVIS_DIR/config/.env"
|
|
||||||
WEB_USER_NAME=$REAL_USER
|
|
||||||
AI_PROVIDER=nvdia
|
|
||||||
OPENAI_API_KEY=dein-openai-key
|
|
||||||
OPENAI_MODEL=
|
|
||||||
GOOGLE_API_KEY=dein-google-key
|
|
||||||
NVIDIA_API_KEY=dein-nvidia-key
|
|
||||||
NVIDIA_MODEL=moonshotai/kimi-k2.6
|
|
||||||
GOOGLE_MODEL=gemini-2.5-flash
|
|
||||||
OLLAMA_BASE_URL=http://127.0.0.1:11434/v1
|
|
||||||
OLLAMA_MODEL=llama3
|
|
||||||
GROQ_API_KEY=dein-groq-key
|
|
||||||
GROQ_MODEL=groq/compound
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# J.A.R.V.I.S. Optimierter System-Prompt inkl. wdotool-Handbuch
|
|
||||||
cat << 'EOF' > "$JARVIS_DIR/config/system_prompt.txt"
|
|
||||||
Du bist J.A.R.V.I.S., ein KI-Systemassistent, der direkt auf einem Debian Wayland-Desktop läuft. Du hast vollen lokalen Zugriff auf das System.
|
|
||||||
|
|
||||||
UMGEBUNG & GEDÄCHTNIS:
|
|
||||||
- Arbeitsverzeichnis: {workspace_dir}
|
|
||||||
- Notizen: {notes_file}
|
|
||||||
- Todos: {todo_file}
|
|
||||||
|
|
||||||
DESKTOP STEUERUNG & FENSTER-MANAGEMENT:
|
|
||||||
Du steuerst die grafische Oberfläche (Wayland/labwc) über Befehlszeilen-Tools.
|
|
||||||
|
|
||||||
1. Programme & Fenster verwalten (Tool: jwin)
|
|
||||||
Du kannst Fenster steuern, indem du das jwin-Skript aufrufst.
|
|
||||||
Folgende Aktionen sind erlaubt:
|
|
||||||
- start (Startet ein Programm)
|
|
||||||
- activate (Holt ein Fenster in den Vordergrund)
|
|
||||||
- close (Schließt das Fenster)
|
|
||||||
- snap (Dockt das Fenster an. Parameter: left, right, up, down, top-left, bottom-left, top-right, bottom-right)
|
|
||||||
- maximize (Maximiert das Fenster)
|
|
||||||
Beispiele:
|
|
||||||
<EXECUTE>jwin snap firefox right</EXECUTE> (Schiebt Firefox auf die rechte Bildschirmhälfte)
|
|
||||||
<EXECUTE>jwin snap firefox bottom-right</EXECUTE> (Schiebt Firefox auf die rechte untere Bildschirmviertel)
|
|
||||||
<EXECUTE>jwin activate terminal</EXECUTE> (Holt das Terminal in den Vordergrund)
|
|
||||||
|
|
||||||
Regel für Multitasking-Fenster: Wenn der User mehrere Instanzen derselben App starten und verteilen möchte, führe die Befehle immer abwechselnd aus und nutze das Schlüsselwort active für das Snapping:
|
|
||||||
Beispiel-Verkettung für das System:
|
|
||||||
<EXECUTE>jwin start firefox && sleep 1.5 && jwin snap active top-left && jwin start firefox && sleep 1.5 && jwin snap active top-right</EXECUTE>
|
|
||||||
|
|
||||||
2. Tastatur & Maus (Tool: wdotool)
|
|
||||||
- Tastatur: wdotool key ctrl+l, wdotool key alt+Tab, wdotool type "Hallo"
|
|
||||||
- Maus: wdotool mousemove 500 400 (absolut), wdotool click 1 (1=links, 3=rechts)
|
|
||||||
|
|
||||||
3. System- & Display-Infos
|
|
||||||
- Bildschirmauflösung ermitteln: <EXECUTE>wlr-randr | grep current | awk '{print $1}'</EXECUTE>
|
|
||||||
|
|
||||||
{installed_apps}
|
|
||||||
|
|
||||||
WICHTIGE REGELN FÜR DIE AUSFÜHRUNG:
|
|
||||||
1. Wenn der Nutzer nach einer App fragt (z.B. "starte den Editor"), schaue in der obigen Liste nach dem passenden Programmnamen und nimm EXAKT den dort definierten Befehl.
|
|
||||||
2. Rate niemals Befehle, die nicht in der Liste stehen!
|
|
||||||
3. Wenn du eine Aktion ausführst, MUSST du den Linux-Befehl EXAKT in <EXECUTE> und </EXECUTE> Tags setzen.
|
|
||||||
4. VERBOTEN: Verwende NIEMALS Markdown-Codeblöcke (```) um oder in den <EXECUTE>-Tags! Schreibe die Tags als simplen, rohen Text.
|
|
||||||
5. ERZWUNGEN: Sag nicht nur, dass du etwas tust – du MUSST den <EXECUTE> Tag in deiner Antwort mitsenden, sonst passiert nichts!
|
|
||||||
|
|
||||||
Beispiel für einen perfekten Workflow:
|
|
||||||
Das mache ich sofort für dich!
|
|
||||||
<EXECUTE>jwin activate Firefox && sleep 1 && jwin move Firefox 0 0</EXECUTE>
|
|
||||||
|
|
||||||
WICHTIGE REGELN FÜR TEXTE IN EDITOREN:
|
|
||||||
1. Wenn der Nutzer einen Text (wie eine Einladung, Notiz oder Code) in einem Editor wie Geany erstellen möchte, erstelle den Text NIEMALS direkt mit "wdotool type" in einer langen Kette! Das ist zu fehleranfällig.
|
|
||||||
2. Nutze stattdessen IMMER diesen zweistufigen, krisenfesten Weg:
|
|
||||||
Schritt A: Schreibe den generierten Text zuerst in eine temporäre Datei (z.B. mit echo oder cat).
|
|
||||||
Schritt B: Öffne diese Datei anschließend direkt mit Geany.
|
|
||||||
|
|
||||||
Beispiel für das korrekte Vorgehen:
|
|
||||||
<EXECUTE>cat << 'EOF' > /tmp/einladung.txt
|
|
||||||
Liebe Familie...
|
|
||||||
'EOF'
|
|
||||||
geany /tmp/einladung.txt</EXECUTE>
|
|
||||||
|
|
||||||
Schreibe immer eine kurze Textantwort dazu, was du gerade tust. Du duzt {user_name} konsequent, dein Tonfall ist locker und technisch versiert.
|
|
||||||
EOF
|
|
||||||
|
|
||||||
chmod +x "$JARVIS_DIR/start.sh"
|
|
||||||
|
|
||||||
# Rechte korrigieren
|
|
||||||
chown -R "$REAL_USER:$REAL_USER" "$JARVIS_DIR"
|
|
||||||
chown -R "$REAL_USER:$REAL_USER" "$REAL_HOME/.config"
|
|
||||||
chown "$REAL_USER:$REAL_USER" "$REAL_HOME/.profile"
|
|
||||||
|
|
||||||
# Python venv installieren
|
|
||||||
echo "🐍 Erstelle Python-Umgebung für J.A.R.V.I.S...."
|
|
||||||
sudo -u "$REAL_USER" bash -c "cd $JARVIS_DIR && python3 -m venv venv && ./venv/bin/pip install --upgrade pip && ./venv/bin/pip install -r requirements.txt"
|
|
||||||
|
|
||||||
# Autostart (Waybar & JARVIS direkt in Tilix öffnen)
|
|
||||||
cat << EOF > "$REAL_HOME/.config/labwc/autostart"
|
|
||||||
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=labwc
|
|
||||||
waybar &
|
|
||||||
tilix --title="J.A.R.V.I.S. Terminal" -e "$JARVIS_DIR/start.sh" &
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Shortcuts
|
|
||||||
cat << EOF > "$REAL_HOME/.config/labwc/rc.xml"
|
|
||||||
<?xml version="1.0"?>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
This is a very simple config file with many options missing. For a complete
|
|
||||||
set of options with comments, see docs/rc.xml.all
|
|
||||||
-->
|
|
||||||
|
|
||||||
<labwc_config>
|
|
||||||
|
|
||||||
<theme>
|
|
||||||
<name></name>
|
|
||||||
<cornerRadius>8</cornerRadius>
|
|
||||||
<font name="sans" size="10" />
|
|
||||||
</theme>
|
|
||||||
|
|
||||||
<regions>
|
|
||||||
<region name="top-left" x="0%" y="0%" height="50%" width="50%" />
|
|
||||||
<region name="top" x="0%" y="0%" height="50%" width="100%" />
|
|
||||||
<region name="top-right" x="50%" y="0%" height="50%" width="50%" />
|
|
||||||
<region name="left" x="0%" y="0%" height="100%" width="50%" />
|
|
||||||
<region name="center" x="10%" y="10%" height="80%" width="80%" />
|
|
||||||
<region name="right" x="50%" y="0%" height="100%" width="50%" />
|
|
||||||
<region name="bottom-left" x="0%" y="50%" height="50%" width="50%" />
|
|
||||||
<region name="bottom" x="0%" y="50%" height="50%" width="100%" />
|
|
||||||
<region name="bottom-right" x="50%" y="50%" height="50%" width="50%" />
|
|
||||||
</regions>
|
|
||||||
|
|
||||||
<keyboard>
|
|
||||||
<numlock>on</numlock>
|
|
||||||
<keybind key="W-F11">
|
|
||||||
<action name="Maximize" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-Left">
|
|
||||||
<action name="SnapToEdge" direction="left" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-Right">
|
|
||||||
<action name="SnapToEdge" direction="right" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-Up">
|
|
||||||
<action name="SnapToEdge" direction="up" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-Down">
|
|
||||||
<action name="SnapToEdge" direction="down" />
|
|
||||||
</keybind>
|
|
||||||
<!-- SnapToRegion via W-Numpad -->
|
|
||||||
<keybind key="W-KP_7">
|
|
||||||
<action name="SnapToRegion" region="top-left" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-KP_8">
|
|
||||||
<action name="SnapToRegion" region="top" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-KP_9">
|
|
||||||
<action name="SnapToRegion" region="top-right" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-KP_4">
|
|
||||||
<action name="SnapToRegion" region="left" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-KP_5">
|
|
||||||
<action name="SnapToRegion" region="center" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-KP_6">
|
|
||||||
<action name="SnapToRegion" region="right" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-KP_1">
|
|
||||||
<action name="SnapToRegion" region="bottom-left" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-KP_2">
|
|
||||||
<action name="SnapToRegion" region="bottom" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-KP_3">
|
|
||||||
<action name="SnapToRegion" region="bottom-right" />
|
|
||||||
</keybind>
|
|
||||||
|
|
||||||
<keybind key="W-S-Left">
|
|
||||||
<action name="SnapToRegion" region="top-left" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-S-Up">
|
|
||||||
<action name="SnapToRegion" region="top-right" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-S-Down">
|
|
||||||
<action name="SnapToRegion" region="bottom-right" />
|
|
||||||
</keybind>
|
|
||||||
<keybind key="W-S-Right">
|
|
||||||
<action name="SnapToRegion" region="bottom-left" />
|
|
||||||
</keybind>
|
|
||||||
</keyboard>
|
|
||||||
|
|
||||||
<mouse>
|
|
||||||
<default />
|
|
||||||
<!-- Show a custom menu on desktop right click -->
|
|
||||||
<context name="Root">
|
|
||||||
<mousebind button="Right" action="Press">
|
|
||||||
<action name="ShowMenu" menu="some-custom-menu" />
|
|
||||||
</mousebind>
|
|
||||||
</context>
|
|
||||||
</mouse>
|
|
||||||
|
|
||||||
</labwc_config>
|
|
||||||
EOF
|
|
||||||
|
|
||||||
chmod +x "$REAL_HOME/.config/labwc/autostart"
|
|
||||||
chown "$REAL_USER:$REAL_USER" "$REAL_HOME/.config/labwc/autostart"
|
|
||||||
|
|
||||||
|
|
||||||
####################################
|
|
||||||
# Voice setup
|
|
||||||
####################################
|
|
||||||
|
|
||||||
# Modell herunterladen
|
|
||||||
wget https://alphacephei.com/vosk/models/vosk-model-small-de-0.15.zip
|
|
||||||
# Entpacken
|
|
||||||
unzip vosk-model-small-de-0.15.zip
|
|
||||||
# Ordner umbenennen, damit das Skript ihn leicht findet
|
|
||||||
mv vosk-model-small-de-0.15 model
|
|
||||||
rm vosk-model-small-de-0.15.zip
|
|
||||||
|
|
||||||
|
|
||||||
cat << 'EOF' > "$JARVIS_DIR/wakeword.py"
|
|
||||||
#!/usr/bin/env python3
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import json
|
|
||||||
import queue
|
|
||||||
import time
|
|
||||||
import subprocess
|
|
||||||
import sounddevice as sd
|
|
||||||
import numpy as np
|
|
||||||
from vosk import Model, KaldiRecognizer
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
MODEL_PATH = "model"
|
|
||||||
AUDIO_RATE = 48000
|
|
||||||
LOCK_FILE = Path("/tmp/.jarvis_speaking")
|
|
||||||
|
|
||||||
if not os.path.exists(MODEL_PATH):
|
|
||||||
print(f"❌ Modell-Ordner '{MODEL_PATH}' wurde nicht gefunden!")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
audio_queue = queue.Queue()
|
|
||||||
|
|
||||||
def audio_callback(indata, frames, time, status):
|
|
||||||
if status:
|
|
||||||
print(status, file=sys.stderr)
|
|
||||||
audio_queue.put(bytes(indata))
|
|
||||||
|
|
||||||
print("🧠 J.A.R.V.I.S. lädt das Sprachmodell...")
|
|
||||||
model = Model(MODEL_PATH)
|
|
||||||
|
|
||||||
# Zwei Recognizer: Einer für das Wake-Word, einer für den eigentlichen Befehl (offen)
|
|
||||||
wake_recognizer = KaldiRecognizer(model, AUDIO_RATE, '["jarvis", "[unk]"]')
|
|
||||||
command_recognizer = KaldiRecognizer(model, AUDIO_RATE) # Sucht nach JEDEM deutschen Wort
|
|
||||||
|
|
||||||
print("🎙️ J.A.R.V.I.S. ist online und lauscht... (Sag 'Jarvis')")
|
|
||||||
|
|
||||||
with sd.RawInputStream(samplerate=AUDIO_RATE, blocksize=8000, dtype='int16',
|
|
||||||
channels=1, callback=audio_callback):
|
|
||||||
|
|
||||||
while True:
|
|
||||||
data = audio_queue.get()
|
|
||||||
|
|
||||||
# NEU: Wenn J.A.R.V.I.S. gerade spricht, leere die Queue und ignoriere das Audio
|
|
||||||
if LOCK_FILE.exists():
|
|
||||||
while not audio_queue.empty():
|
|
||||||
audio_queue.get()
|
|
||||||
wake_recognizer.Reset() # Verhindert, dass Bruchstücke von vorhin gespeichert bleiben
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Phase 1: Auf Wake-Word warten
|
|
||||||
if wake_recognizer.AcceptWaveform(data):
|
|
||||||
result = json.loads(wake_recognizer.Result())
|
|
||||||
if "jarvis" in result.get("text", ""):
|
|
||||||
print("\n⚡ [WAKEWORD DETECTED] Ja, Sir?")
|
|
||||||
|
|
||||||
# Bestätigungston abspielen
|
|
||||||
# Kurzer, smarter Beep-Ton (800 Hz, 0.1 Sekunden)
|
|
||||||
duration = 0.1
|
|
||||||
frequency = 800.0
|
|
||||||
t = np.linspace(0, duration, int(AUDIO_RATE * duration), endpoint=False)
|
|
||||||
beep = np.sin(2 * np.pi * frequency * t) * 0.3 # 0.3 für angenehme Lautstärke
|
|
||||||
sd.play(beep, samplerate=AUDIO_RATE)
|
|
||||||
sd.wait()
|
|
||||||
# Warteschlange leeren, um alten Ton nicht als Befehl zu interpretieren
|
|
||||||
while not audio_queue.empty():
|
|
||||||
audio_queue.get()
|
|
||||||
|
|
||||||
print("👂 Höre zu...")
|
|
||||||
command_text = ""
|
|
||||||
start_time = time.time()
|
|
||||||
|
|
||||||
# Phase 2: Für 4 Sekunden den darauffolgenden Befehl aufnehmen
|
|
||||||
while time.time() - start_time < 4.0:
|
|
||||||
cmd_data = audio_queue.get()
|
|
||||||
if command_recognizer.AcceptWaveform(cmd_data):
|
|
||||||
res = json.loads(command_recognizer.Result())
|
|
||||||
command_text += " " + res.get("text", "")
|
|
||||||
|
|
||||||
# Letzten Rest auslesen
|
|
||||||
final_res = json.loads(command_recognizer.FinalResult())
|
|
||||||
command_text += " " + final_res.get("text", "")
|
|
||||||
command_text = command_text.strip()
|
|
||||||
|
|
||||||
if command_text:
|
|
||||||
print(f"🗣️ Erkannter Befehl: '{command_text}'")
|
|
||||||
print("🧠 Übermittle an J.A.R.V.I.S. Gehirn...")
|
|
||||||
|
|
||||||
# Rufe jarvis.py im virtuellen Environment auf und übergib den Befehl
|
|
||||||
# (Wir nutzen hier Google Gemini oder was auch immer in deiner .env aktiv ist!)
|
|
||||||
subprocess.run([
|
|
||||||
"/home/meik/jarvis-ai/venv/bin/python3",
|
|
||||||
"/home/meik/jarvis-ai/jarvis.py",
|
|
||||||
"--voice-cmd",
|
|
||||||
command_text
|
|
||||||
])
|
|
||||||
else:
|
|
||||||
print("🔇 Kein Befehl verstanden.")
|
|
||||||
|
|
||||||
print("\n🎙️ Zurück im Standby. Lausche auf 'Jarvis'...")
|
|
||||||
wake_recognizer.Reset()
|
|
||||||
command_recognizer.Reset()
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Piper installieren
|
|
||||||
wget https://github.com/rhasspy/piper/releases/download/v1.2.0/piper_amd64.tar.gz
|
|
||||||
tar -xf piper_amd64.tar.gz
|
|
||||||
rm piper_amd64.tar.gz
|
|
||||||
|
|
||||||
# Das eigentliche Sprachmodell (.onnx)
|
|
||||||
wget https://huggingface.co/rhasspy/piper-voices/resolve/main/de/de_DE/thorsten/high/de_DE-thorsten-high.onnx
|
|
||||||
|
|
||||||
# Die dazugehörige Konfigurationsdatei (.json)
|
|
||||||
wget https://huggingface.co/rhasspy/piper-voices/resolve/main/de/de_DE/thorsten/high/de_DE-thorsten-high.onnx.json
|
|
||||||
|
|
||||||
|
|
||||||
echo "===================================================="
|
|
||||||
echo "✅ Lokales Setup erfolgreich abgeschlossen!"
|
|
||||||
echo "👉 1. Trage deine API-Keys in $JARVIS_DIR/config/.env ein."
|
|
||||||
echo "👉 2. Starte das System neu oder logge dich neu ein."
|
|
||||||
echo "===================================================="
|
|
||||||
106
setup_x11_jarvis.sh
Executable file
106
setup_x11_jarvis.sh
Executable file
@@ -0,0 +1,106 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Abbrechen bei Fehlern
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo "===================================================="
|
||||||
|
echo "🚀 Starte J.A.R.V.I.S. Desktop OS - X11 Openbox Setup"
|
||||||
|
echo "===================================================="
|
||||||
|
|
||||||
|
# Benutzererkennung
|
||||||
|
REAL_USER="${SUDO_USER:-$(logname 2>/dev/null || whoami)}"
|
||||||
|
REAL_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
||||||
|
|
||||||
|
if [ -z "$REAL_USER" ] || [ "$REAL_USER" = "root" ]; then
|
||||||
|
REAL_USER=$(id -nu 1000 2>/dev/null || echo "meik")
|
||||||
|
REAL_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
||||||
|
fi
|
||||||
|
|
||||||
|
JARVIS_DIR="$REAL_HOME/jarvis-ai"
|
||||||
|
|
||||||
|
# 1. System aktualisieren & X11 / Openbox Pakete installieren
|
||||||
|
echo "📦 Installiere X11-Server, Openbox und Automatisierungstools..."
|
||||||
|
sudo apt update
|
||||||
|
sudo apt install -y \
|
||||||
|
xserver-xorg \
|
||||||
|
xinit \
|
||||||
|
x11-xserver-utils \
|
||||||
|
openbox \
|
||||||
|
tint2 \
|
||||||
|
rofi \
|
||||||
|
xdotool \
|
||||||
|
wmctrl \
|
||||||
|
firefox-esr \
|
||||||
|
curl \
|
||||||
|
wget \
|
||||||
|
git \
|
||||||
|
sudo \
|
||||||
|
python3 \
|
||||||
|
python3-pip \
|
||||||
|
python3-venv \
|
||||||
|
tilix \
|
||||||
|
geany \
|
||||||
|
fonts-noto-color-emoji \
|
||||||
|
pipewire \
|
||||||
|
pipewire-audio-client-libraries \
|
||||||
|
pipewire-pulse \
|
||||||
|
wireplumber \
|
||||||
|
alsa-utils \
|
||||||
|
libasound2-dev \
|
||||||
|
libportaudio2 \
|
||||||
|
unzip
|
||||||
|
|
||||||
|
# 1.1 Gruppenrechte für Audio und Grafik setzen
|
||||||
|
echo "👥 Setze Gruppenrechte für '$REAL_USER'..."
|
||||||
|
sudo usermod -aG video,render,input,audio "$REAL_USER"
|
||||||
|
|
||||||
|
# 2. Openbox Konfigurationsverzeichnis erstellen
|
||||||
|
echo "⚙️ Konfiguriere Openbox für '$REAL_USER'..."
|
||||||
|
mkdir -p "$REAL_HOME/.config/openbox"
|
||||||
|
|
||||||
|
# 3. Autostart-Datei für Openbox erstellen
|
||||||
|
cat << EOF > "$REAL_HOME/.config/openbox/autostart"
|
||||||
|
# Tint2 Taskleiste im Hintergrund starten
|
||||||
|
tint2 &
|
||||||
|
|
||||||
|
# Falls ein Hintergrundbild gewünscht ist (optional, benötigt 'feh'):
|
||||||
|
# feh --bg-scale /pfad/zum/bild.jpg &
|
||||||
|
|
||||||
|
# J.A.R.V.I.S. Sprachsteuerung (Wakeword-Skript) starten
|
||||||
|
if [ -f "$JARVIS_DIR/wakeword.py" ]; then
|
||||||
|
echo "🎙️ Starte J.A.R.V.I.S. Sprachsteuerung..." >> "$JARVIS_DIR/data/desktop.log"
|
||||||
|
"$JARVIS_DIR/venv/bin/python3" "$JARVIS_DIR/wakeword.py" >> "$JARVIS_DIR/data/wakeword.log" 2>&1 &
|
||||||
|
fi
|
||||||
|
EOF
|
||||||
|
|
||||||
|
chmod +x "$REAL_HOME/.config/openbox/autostart"
|
||||||
|
|
||||||
|
# 4. .xinitrc erstellen (ermöglicht den Start via 'startx' aus der Konsole)
|
||||||
|
cat << EOF > "$REAL_HOME/.xinitrc"
|
||||||
|
#!/bin/sh
|
||||||
|
# X11 Umgebungsvariablen setzen falls nötig
|
||||||
|
export QT_QPA_PLATFORM=xcb
|
||||||
|
export GDK_BACKEND=x11
|
||||||
|
|
||||||
|
# Openbox Session starten
|
||||||
|
exec openbox-session
|
||||||
|
EOF
|
||||||
|
|
||||||
|
chmod +x "$REAL_HOME/.xinitrc"
|
||||||
|
|
||||||
|
# Eigentumsrechte korrigieren
|
||||||
|
chown -R "$REAL_USER:$REAL_USER" "$REAL_HOME/.config" "$REAL_HOME/.xinitrc"
|
||||||
|
|
||||||
|
# 5. Virtuelle Python-Umgebung einrichten (falls noch nicht geschehen)
|
||||||
|
if [ ! -d "$JARVIS_DIR/venv" ]; then
|
||||||
|
echo "🐍 Richte virtuelles Python-Environment ein..."
|
||||||
|
mkdir -p "$JARVIS_DIR"
|
||||||
|
python3 -m venv "$JARVIS_DIR/venv"
|
||||||
|
"$JARVIS_DIR/venv/bin/pip" install --upgrade pip
|
||||||
|
"$JARVIS_DIR/venv/bin/pip" install -r requirements.txt
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "===================================================="
|
||||||
|
echo "✅ X11 Openbox-Umgebung erfolgreich eingerichtet!"
|
||||||
|
echo "👉 Starte die grafische Oberfläche einfach mit dem Befehl: startx"
|
||||||
|
echo "===================================================="
|
||||||
Reference in New Issue
Block a user