i18n: migrate all German text to English

Enforce the repo convention that committed text is English.
Translates ABOUTME headers, code comments, log/error messages,
shell prompts, and documentation across all files.
CLAUDE.md files remain in German per policy.
This commit is contained in:
nevaforget 2026-03-28 14:53:23 +01:00
parent ef78e32394
commit 0a266510e0
17 changed files with 197 additions and 197 deletions

4
.gitignore vendored
View File

@ -1,5 +1,5 @@
# ABOUTME: Gitignore für Moonarch. # ABOUTME: Gitignore for Moonarch.
# ABOUTME: Schließt temporäre Dateien und Build-Artefakte aus. # ABOUTME: Excludes temporary files and build artifacts.
*.pyc *.pyc
__pycache__/ __pycache__/

View File

@ -1,49 +1,49 @@
# Moonarch # Moonarch
Reproduzierbares Arch-Linux-Setup mit Niri (Wayland Compositor), greetd/moongreet, Catppuccin Mocha Theming und durchgehender Automatisierung. Reproducible Arch Linux setup with Niri (Wayland compositor), greetd/moongreet, Catppuccin Mocha theming and full automation.
## Schnellstart ## Quick Start
### Variante A: Config im Live-System herunterladen ### Option A: Download config in the live system
1. [Arch ISO](https://archlinux.org/download/) auf USB flashen und davon booten 1. Flash the [Arch ISO](https://archlinux.org/download/) to USB and boot from it
2. Im Live-System: 2. In the live system:
```bash ```bash
curl -O https://gitea.moonarch.de/nevaforget/moonarch/raw/branch/main/config/user_configuration.json curl -O https://gitea.moonarch.de/nevaforget/moonarch/raw/branch/main/config/user_configuration.json
archinstall --config user_configuration.json archinstall --config user_configuration.json
``` ```
3. Disk + Kernel interaktiv waehlen, Rest kommt aus der Config 3. Choose disk + kernel interactively, the rest comes from the config
### Variante B: Config auf den USB-Stick legen (Ventoy) ### Option B: Place config on USB stick (Ventoy)
1. [Ventoy](https://www.ventoy.net/) auf USB installieren 1. Install [Ventoy](https://www.ventoy.net/) on USB
2. Arch ISO und `user_configuration.json` auf die Ventoy-Partition kopieren 2. Copy the Arch ISO and `user_configuration.json` to the Ventoy partition
3. Davon booten, dann: 3. Boot from it, then:
```bash ```bash
archinstall --config /run/media/ventoy/user_configuration.json archinstall --config /run/media/ventoy/user_configuration.json
``` ```
### Nach archinstall ### After archinstall
1. Reboot — das Repo liegt bereits in `/opt/moonarch` (via custom-commands) 1. Reboot — the repo is already in `/opt/moonarch` (via custom-commands)
2. Einloggen, dann: 2. Log in, then:
```bash ```bash
/opt/moonarch/scripts/post-install.sh /opt/moonarch/scripts/post-install.sh
``` ```
3. Nochmal rebooten — fertig 3. Reboot again — done
## Struktur ## Structure
``` ```
config/ archinstall-Konfiguration config/ archinstall configuration
packages/ Paketlisten (official.txt + aur.txt) packages/ Package lists (official.txt + aur.txt)
scripts/ Post-Install, Update, Theme-Installer scripts/ Post-install, update, theme installer
defaults/ defaults/
bin/ moonarch-* Helper-Scripts (/usr/local/bin/) bin/ moonarch-* helper scripts (/usr/local/bin/)
xdg/ XDG-Defaults (/etc/xdg/) xdg/ XDG defaults (/etc/xdg/)
shell/ Zsh-Konfiguration shell/ Zsh configuration
etc/ greetd + moongreet Konfiguration etc/ greetd + moongreet configuration
backgrounds/ Default-Wallpaper backgrounds/ Default wallpaper
``` ```
## Update ## Update
@ -52,7 +52,7 @@ defaults/
moonarch-update moonarch-update
``` ```
Aktualisiert Repo, Systempakete, fehlende Pakete und Defaults — alles interaktiv mit Bestaetigungen. Updates repo, system packages, missing packages and defaults — all interactive with confirmations.
## Stack ## Stack

View File

@ -1,6 +1,6 @@
{ {
"__comment": "ABOUTME: archinstall-Konfiguration für Moonarch.", "__comment": "ABOUTME: archinstall configuration for Moonarch.",
"__comment2": "ABOUTME: Basis-Setup — Kernel, Disk und Filesystem werden interaktiv gewählt.", "__comment2": "ABOUTME: Base setup — kernel, disk and filesystem are chosen interactively.",
"audio_config": { "audio_config": {
"audio": "pipewire" "audio": "pipewire"

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# ABOUTME: Prüft Bluetooth-Geräte auf niedrigen Akkustand und sendet Notification. # ABOUTME: Checks Bluetooth devices for low battery and sends a notification.
# ABOUTME: Kann per Timer oder Cron regelmäßig ausgeführt werden. # ABOUTME: Can be run periodically via timer or cron.
NOTIFY_AT_PERCENTAGE=70 NOTIFY_AT_PERCENTAGE=70
ICON="/usr/share/icons/Newaita-reborn/status/symbolic/battery-empty-symbolic.svg" ICON="/usr/share/icons/Newaita-reborn/status/symbolic/battery-empty-symbolic.svg"

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# ABOUTME: Zeigt eine Notification beim Umschalten von Caps Lock an. # ABOUTME: Shows a notification when toggling Caps Lock.
# ABOUTME: Gedacht für Keybinding oder Input-Event-Trigger. # ABOUTME: Intended for keybinding or input event triggers.
sleep 0.2 sleep 0.2

View File

@ -1,6 +1,6 @@
#!/usr/bin/bash #!/usr/bin/bash
# ABOUTME: Waybar-Modul das den Batteriestatus eines HID++ Geräts als JSON ausgibt. # ABOUTME: Waybar module that outputs HID++ device battery status as JSON.
# ABOUTME: Findet den richtigen hidpp_battery_* Eintrag dynamisch per MODEL_NAME (Argument). # ABOUTME: Finds the correct hidpp_battery_* entry dynamically by MODEL_NAME (argument).
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "Usage: moonarch-waybar-hidpp <model_name>" >&2 echo "Usage: moonarch-waybar-hidpp <model_name>" >&2
@ -45,4 +45,4 @@ for dev in /sys/class/power_supply/hidpp_battery_*; do
fi fi
done done
# Gerät nicht gefunden — keine Ausgabe, Waybar versteckt das Modul # Device not found — no output, Waybar hides the module

View File

@ -1,11 +1,11 @@
# ABOUTME: greetd-Konfiguration fuer Moonarch. # ABOUTME: greetd configuration for Moonarch.
# ABOUTME: Startet Niri als Compositor fuer den Moongreet-Greeter. # ABOUTME: Starts Niri as Wayland compositor for the Moongreet greeter.
[terminal] [terminal]
vt = 1 vt = 1
[default_session] [default_session]
# Moongreet braucht einen Wayland-Compositor — niri stellt diesen bereit. # Moongreet needs a Wayland compositor — Niri provides it.
# Siehe niri-greeter.kdl fuer die Compositor-Konfiguration. # See niri-greeter.kdl for the compositor configuration.
command = "niri -c /etc/greetd/niri-greeter.kdl" command = "niri -c /etc/greetd/niri-greeter.kdl"
user = "greeter" user = "greeter"

View File

@ -1,5 +1,5 @@
// ABOUTME: Niri-Konfiguration fuer den Moongreet Login-Greeter. // ABOUTME: Niri configuration for the Moongreet login greeter.
// ABOUTME: Wird von greetd gestartet — minimale Config ohne Keybinds fuer Sicherheit. // ABOUTME: Started by greetd — minimal config without keybinds for security.
input { input {
keyboard { keyboard {
@ -35,11 +35,11 @@ layout {
} }
} }
// Moongreet starten und niri beenden, sobald moongreet sich schliesst. // Start moongreet and quit niri once moongreet exits.
// Retry-Loop stellt sicher, dass niri auch bei fruehen Crashes von moongreet beendet wird. // Retry loop ensures niri shuts down even on early moongreet crashes.
spawn-sh-at-startup "moongreet; while ! niri msg action quit --skip-confirmation 2>/dev/null; do sleep 0.5; done" spawn-sh-at-startup "moongreet; while ! niri msg action quit --skip-confirmation 2>/dev/null; do sleep 0.5; done"
// Greeter-Fenster maximiert darstellen // Maximize greeter window
window-rule { window-rule {
open-maximized true open-maximized true
} }
@ -55,5 +55,5 @@ animations {
} }
binds { binds {
// Keine Keybinds — verhindert Zugriff auf Terminals oder andere Aktionen // No keybinds — prevents access to terminals or other actions
} }

View File

@ -1,5 +1,5 @@
# ABOUTME: Moongreet-Konfiguration fuer Moonarch. # ABOUTME: Moongreet configuration for Moonarch.
# ABOUTME: Definiert Aussehen und Verhalten des Login-Greeters. # ABOUTME: Defines appearance and behavior of the login greeter.
[appearance] [appearance]
background = "/usr/share/moonarch/wallpaper.jpg" background = "/usr/share/moonarch/wallpaper.jpg"

View File

@ -1,13 +1,13 @@
{ {
// ABOUTME: User-Override fuer Waybar — erweitert die systemweite Config aus /etc/xdg/waybar/. // ABOUTME: User override for Waybar — extends the system-wide config from /etc/xdg/waybar/.
// ABOUTME: Eigene Module hier definieren und in modules-left/center/right eintragen. // ABOUTME: Define custom modules here and add them to modules-left/center/right.
// Systemweite Moonarch-Config als Basis laden. // Load system-wide Moonarch config as base.
// Properties die hier definiert werden, ueberschreiben die aus dem Include. // Properties defined here override those from the include.
"include": ["/etc/xdg/waybar/config"] "include": ["/etc/xdg/waybar/config"]
// Beispiel: Modul-Leiste erweitern (muss komplett angegeben werden, da sie die // Example: extend module bar (must be specified completely as it replaces
// systemweite ersetzt): // the system-wide one):
// //
// "modules-right": [ // "modules-right": [
// "mpris", // "mpris",
@ -20,8 +20,8 @@
// "group/indicators" // "group/indicators"
// ], // ],
// Beispiel: HID++ Geräte-Akku anzeigen (z.B. Logitech Tastatur) // Example: show HID++ device battery (e.g. Logitech keyboard)
// moonarch-waybar-hidpp findet den richtigen hidpp_battery_* Eintrag dynamisch // moonarch-waybar-hidpp finds the correct hidpp_battery_* entry dynamically
// //
// "custom/keyboard": { // "custom/keyboard": {
// "exec": "moonarch-waybar-hidpp 'G515 LS TKL'", // "exec": "moonarch-waybar-hidpp 'G515 LS TKL'",

View File

@ -1,12 +1,12 @@
/* ABOUTME: User-Override fuer Waybar-Styling — erweitert die systemweite style.css. */ /* ABOUTME: User override for Waybar styling — extends the system-wide style.css. */
/* ABOUTME: Eigene Styles hier definieren, die systemweite Basis wird per @import geladen. */ /* ABOUTME: Define custom styles here, the system-wide base is loaded via @import. */
@import url("/etc/xdg/waybar/style.css"); @import url("/etc/xdg/waybar/style.css");
/* Eigene Styles unterhalb eintragen. */ /* Add custom styles below. */
/* Selektoren aus der systemweiten Config koennen hier ueberschrieben werden. */ /* Selectors from the system-wide config can be overridden here. */
/* Beispiel: Logitech-Tastatur-Akku einfaerben */ /* Example: color Logitech keyboard battery */
/* /*
#battery-keyboard.warning:not(.charging) { #battery-keyboard.warning:not(.charging) {
color: #e6a200; color: #e6a200;

View File

@ -76,7 +76,7 @@ layout {
} }
} }
// xwayland-satellite wird seit niri 25.08 automatisch verwaltet // xwayland-satellite is managed automatically since niri 25.08
spawn-at-startup "waybar" spawn-at-startup "waybar"
spawn-at-startup "dunst" spawn-at-startup "dunst"
spawn-at-startup "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" spawn-at-startup "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"

View File

@ -1,7 +1,7 @@
# ABOUTME: Liste der AUR-Pakete, die nach der Basisinstallation via paru installiert werden. # ABOUTME: List of AUR packages installed via paru after the base installation.
# ABOUTME: Wird von post-install.sh verwendet. # ABOUTME: Used by post-install.sh.
# AUR Helper (wird zuerst manuell gebaut) # AUR Helper (built manually first)
# paru # paru
# Theming # Theming
@ -18,7 +18,7 @@ wl-color-picker
wlogout wlogout
gtklock-dpms-module gtklock-dpms-module
# Anwendungen # Applications
blueberry blueberry
waterfox-bin waterfox-bin

View File

@ -1,5 +1,5 @@
# ABOUTME: Liste der offiziell installierten Pakete aus den Arch-Repos. # ABOUTME: List of official packages from Arch repos.
# ABOUTME: Wird von archinstall und post-install.sh verwendet. # ABOUTME: Used by archinstall and post-install.sh.
# Base # Base
base base
@ -26,7 +26,7 @@ jq
ripgrep ripgrep
lazygit lazygit
# Netzwerk # Network
networkmanager networkmanager
network-manager-applet network-manager-applet
networkmanager-openvpn networkmanager-openvpn
@ -51,7 +51,7 @@ pavucontrol
niri niri
xwayland-satellite xwayland-satellite
# Desktop-Utilities # Desktop Utilities
waybar waybar
dunst dunst
cliphist cliphist
@ -65,7 +65,7 @@ nwg-look
greetd greetd
polkit-gnome polkit-gnome
# Dateimanager / XDG # File Manager / XDG
gvfs gvfs
gvfs-dnssd gvfs-dnssd
gvfs-mtp gvfs-mtp
@ -79,10 +79,10 @@ qt6-5compat
# Themes & Fonts # Themes & Fonts
ttf-ubuntusans-nerd ttf-ubuntusans-nerd
# Anwendungen # Applications
viewnior viewnior
# Entwicklung # Development
git git
glab glab
go go

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# ABOUTME: Installiert Themes die nicht via Pakete verfügbar sind (Cursor-Theme). # ABOUTME: Installs themes not available via packages (cursor theme).
# ABOUTME: Wird von post-install.sh aufgerufen. # ABOUTME: Called by post-install.sh.
set -euo pipefail set -euo pipefail
@ -14,18 +14,18 @@ log() {
CURSOR_DEST="/usr/share/icons/Sweet-cursors" CURSOR_DEST="/usr/share/icons/Sweet-cursors"
if [[ -d "$CURSOR_DEST" ]]; then if [[ -d "$CURSOR_DEST" ]]; then
log "Sweet-cursors bereits installiert." log "Sweet-cursors already installed."
else else
log "Installiere Sweet-cursors..." log "Installing Sweet-cursors..."
TMPDIR=$(mktemp -d) TMPDIR=$(mktemp -d)
git clone --depth 1 https://github.com/EliverLara/Sweet.git "$TMPDIR/sweet" git clone --depth 1 https://github.com/EliverLara/Sweet.git "$TMPDIR/sweet"
if [[ -d "$TMPDIR/sweet/kde/cursors/Sweet-cursors" ]]; then if [[ -d "$TMPDIR/sweet/kde/cursors/Sweet-cursors" ]]; then
sudo cp -r "$TMPDIR/sweet/kde/cursors/Sweet-cursors" "$CURSOR_DEST" sudo cp -r "$TMPDIR/sweet/kde/cursors/Sweet-cursors" "$CURSOR_DEST"
log "Sweet-cursors nach $CURSOR_DEST installiert." log "Sweet-cursors installed to $CURSOR_DEST."
else else
echo "Cursor-Verzeichnis nicht gefunden im Repository." >&2 echo "Cursor directory not found in repository." >&2
echo "Bitte manuell installieren: https://github.com/EliverLara/Sweet" >&2 echo "Please install manually: https://github.com/EliverLara/Sweet" >&2
fi fi
rm -rf "$TMPDIR" rm -rf "$TMPDIR"

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# ABOUTME: Post-Install-Script für Moonarch — installiert Pakete, Defaults und konfiguriert das System. # ABOUTME: Post-install script for Moonarch — installs packages, defaults and configures the system.
# ABOUTME: Wird nach der archinstall-Basisinstallation als normaler User ausgeführt. # ABOUTME: Run as regular user after the archinstall base installation.
set -euo pipefail set -euo pipefail
@ -10,69 +10,69 @@ OFFICIAL_PACKAGES="$PROJECT_DIR/packages/official.txt"
AUR_PACKAGES="$PROJECT_DIR/packages/aur.txt" AUR_PACKAGES="$PROJECT_DIR/packages/aur.txt"
DEFAULTS_DIR="$PROJECT_DIR/defaults" DEFAULTS_DIR="$PROJECT_DIR/defaults"
# --- Hilfsfunktionen --- # --- Helper functions ---
log() { log() {
echo -e "\e[1;34m[Moonarch]\e[0m $*" echo -e "\e[1;34m[Moonarch]\e[0m $*"
} }
err() { err() {
echo -e "\e[1;31m[Moonarch FEHLER]\e[0m $*" >&2 echo -e "\e[1;31m[Moonarch ERROR]\e[0m $*" >&2
} }
read_packages() { read_packages() {
grep -v '^\s*#' "$1" | grep -v '^\s*$' grep -v '^\s*#' "$1" | grep -v '^\s*$'
} }
# --- Voraussetzungen prüfen --- # --- Prerequisites ---
if [[ $EUID -eq 0 ]]; then if [[ $EUID -eq 0 ]]; then
err "Bitte NICHT als root ausführen. Das Script nutzt sudo wo nötig." err "Do NOT run as root. The script uses sudo where needed."
exit 1 exit 1
fi fi
if ! command -v pacman &>/dev/null; then if ! command -v pacman &>/dev/null; then
err "pacman nicht gefunden — ist das wirklich Arch Linux?" err "pacman not found — is this really Arch Linux?"
exit 1 exit 1
fi fi
# --- Offizielle Pakete installieren --- # --- Install official packages ---
log "Installiere offizielle Pakete..." log "Installing official packages..."
if [[ -f "$OFFICIAL_PACKAGES" ]]; then if [[ -f "$OFFICIAL_PACKAGES" ]]; then
# shellcheck disable=SC2046 # shellcheck disable=SC2046
sudo pacman -S --needed --noconfirm $(read_packages "$OFFICIAL_PACKAGES") sudo pacman -S --needed --noconfirm $(read_packages "$OFFICIAL_PACKAGES")
else else
err "Paketliste nicht gefunden: $OFFICIAL_PACKAGES" err "Package list not found: $OFFICIAL_PACKAGES"
exit 1 exit 1
fi fi
# --- paru installieren (AUR Helper) --- # --- Install paru (AUR Helper) ---
if ! command -v paru &>/dev/null; then if ! command -v paru &>/dev/null; then
log "Installiere paru..." log "Installing paru..."
PARU_TMPDIR=$(mktemp -d) PARU_TMPDIR=$(mktemp -d)
git clone https://aur.archlinux.org/paru.git "$PARU_TMPDIR/paru" git clone https://aur.archlinux.org/paru.git "$PARU_TMPDIR/paru"
(cd "$PARU_TMPDIR/paru" && makepkg -si --noconfirm) (cd "$PARU_TMPDIR/paru" && makepkg -si --noconfirm)
rm -rf "$PARU_TMPDIR" rm -rf "$PARU_TMPDIR"
else else
log "paru bereits installiert." log "paru already installed."
fi fi
# --- AUR-Pakete installieren --- # --- Install AUR packages ---
log "Installiere AUR-Pakete..." log "Installing AUR packages..."
if [[ -f "$AUR_PACKAGES" ]]; then if [[ -f "$AUR_PACKAGES" ]]; then
# shellcheck disable=SC2046 # shellcheck disable=SC2046
paru -S --needed --noconfirm $(read_packages "$AUR_PACKAGES") paru -S --needed --noconfirm $(read_packages "$AUR_PACKAGES")
else else
err "AUR-Paketliste nicht gefunden: $AUR_PACKAGES" err "AUR package list not found: $AUR_PACKAGES"
exit 1 exit 1
fi fi
# --- Moonarch custom paru repo einrichten --- # --- Set up Moonarch custom paru repo ---
log "Richte Moonarch paru-Repo ein..." log "Setting up Moonarch paru repo..."
PARU_CONF="$HOME/.config/paru/paru.conf" PARU_CONF="$HOME/.config/paru/paru.conf"
mkdir -p "$(dirname "$PARU_CONF")" mkdir -p "$(dirname "$PARU_CONF")"
if ! grep -q '\[moonarch\]' "$PARU_CONF" 2>/dev/null; then if ! grep -q '\[moonarch\]' "$PARU_CONF" 2>/dev/null; then
@ -80,102 +80,102 @@ if ! grep -q '\[moonarch\]' "$PARU_CONF" 2>/dev/null; then
[moonarch] [moonarch]
Url = https://gitea.moonarch.de/nevaforget/moonarch-pkgbuilds.git Url = https://gitea.moonarch.de/nevaforget/moonarch-pkgbuilds.git
EOCONF EOCONF
log " + Moonarch-Repo zu paru.conf hinzugefuegt." log " + Moonarch repo added to paru.conf."
else else
log " ~ Moonarch-Repo bereits in paru.conf." log " ~ Moonarch repo already in paru.conf."
fi fi
paru -Sy --pkgbuilds --noconfirm paru -Sy --pkgbuilds --noconfirm
paru -S --needed --noconfirm moonset-git moonlock-git moongreet-git paru -S --needed --noconfirm moonset-git moonlock-git moongreet-git
# --- Themes installieren (Cursor etc.) --- # --- Install themes (cursor etc.) ---
log "Installiere Themes..." log "Installing themes..."
"$SCRIPT_DIR/install-themes.sh" "$SCRIPT_DIR/install-themes.sh"
# --- XDG Defaults installieren --- # --- Install XDG defaults ---
log "Installiere XDG-Defaults nach /etc/xdg/..." log "Installing XDG defaults to /etc/xdg/..."
sudo cp -r "$DEFAULTS_DIR/xdg/"* /etc/xdg/ sudo cp -r "$DEFAULTS_DIR/xdg/"* /etc/xdg/
# Sicherstellen dass Rofi-Scripts ausführbar sind # Ensure Rofi scripts are executable
sudo find /etc/xdg/rofi -name "*.sh" -exec chmod +x {} \; sudo find /etc/xdg/rofi -name "*.sh" -exec chmod +x {} \;
# --- GTK4 Theme-Symlinks für libadwaita-Apps --- # --- GTK4 theme symlinks for libadwaita apps ---
THEME_NAME="Colloid-Catppuccin" THEME_NAME="Colloid-Catppuccin"
THEME_GTK4="/usr/share/themes/$THEME_NAME/gtk-4.0" THEME_GTK4="/usr/share/themes/$THEME_NAME/gtk-4.0"
GTK4_XDG="/etc/xdg/gtk-4.0" GTK4_XDG="/etc/xdg/gtk-4.0"
if [[ -d "$THEME_GTK4" ]]; then if [[ -d "$THEME_GTK4" ]]; then
log "Erstelle systemweite GTK4-Symlinks für $THEME_NAME..." log "Creating system-wide GTK4 symlinks for $THEME_NAME..."
# gtk.css zeigt auf gtk-dark.css, damit libadwaita-Apps das Dark-Theme laden # gtk.css points to gtk-dark.css so libadwaita apps load the dark theme
sudo ln -sf "$THEME_GTK4/gtk-dark.css" "$GTK4_XDG/gtk.css" sudo ln -sf "$THEME_GTK4/gtk-dark.css" "$GTK4_XDG/gtk.css"
sudo ln -sf "$THEME_GTK4/gtk-dark.css" "$GTK4_XDG/gtk-dark.css" sudo ln -sf "$THEME_GTK4/gtk-dark.css" "$GTK4_XDG/gtk-dark.css"
# Assets-Symlink: erst entfernen falls vorhanden (ln -sf auf Verzeichnisse folgt dem Link) # Assets symlink: remove first if exists (ln -sf on directories follows the link)
sudo rm -f "$GTK4_XDG/assets" sudo rm -f "$GTK4_XDG/assets"
sudo ln -s "$THEME_GTK4/assets" "$GTK4_XDG/assets" sudo ln -s "$THEME_GTK4/assets" "$GTK4_XDG/assets"
else else
err "GTK4-Theme nicht gefunden: $THEME_GTK4 — libadwaita-Apps nutzen Fallback-Theme." err "GTK4 theme not found: $THEME_GTK4 — libadwaita apps will use fallback theme."
fi fi
# --- gsettings für GTK-Theme und Dark-Mode --- # --- gsettings for GTK theme and dark mode ---
log "Setze gsettings für GTK-Theme..." log "Setting gsettings for GTK theme..."
gsettings set org.gnome.desktop.interface gtk-theme "$THEME_NAME" gsettings set org.gnome.desktop.interface gtk-theme "$THEME_NAME"
gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
gsettings set org.gnome.desktop.interface icon-theme 'Colloid-Grey-Catppuccin-Dark' gsettings set org.gnome.desktop.interface icon-theme 'Colloid-Grey-Catppuccin-Dark'
gsettings set org.gnome.desktop.interface font-name 'UbuntuSans Nerd Font 11' gsettings set org.gnome.desktop.interface font-name 'UbuntuSans Nerd Font 11'
# --- Helper-Scripts installieren --- # --- Install helper scripts ---
log "Installiere Moonarch Helper-Scripts nach /usr/local/bin/..." log "Installing Moonarch helper scripts to /usr/local/bin/..."
sudo install -m 755 "$DEFAULTS_DIR/bin/moonarch-"* /usr/local/bin/ sudo install -m 755 "$DEFAULTS_DIR/bin/moonarch-"* /usr/local/bin/
# --- Zsh-Konfiguration --- # --- Zsh configuration ---
log "Installiere Zsh-Default-Config..." log "Installing Zsh default config..."
sudo cp "$DEFAULTS_DIR/shell/zshrc" /etc/zsh/zshrc.moonarch sudo cp "$DEFAULTS_DIR/shell/zshrc" /etc/zsh/zshrc.moonarch
# Eintrag in /etc/zsh/zshrc damit Moonarch-Defaults geladen werden, # Entry in /etc/zsh/zshrc to load Moonarch defaults
# sofern der User keine eigene ~/.zshrc hat # unless the user has their own ~/.zshrc
if ! grep -q "zshrc.moonarch" /etc/zsh/zshrc 2>/dev/null; then if ! grep -q "zshrc.moonarch" /etc/zsh/zshrc 2>/dev/null; then
echo '# Moonarch defaults (wird durch ~/.zshrc überschrieben)' | sudo tee -a /etc/zsh/zshrc > /dev/null echo '# Moonarch defaults (overridden by ~/.zshrc)' | sudo tee -a /etc/zsh/zshrc > /dev/null
echo '[[ ! -f "$HOME/.zshrc" ]] && source /etc/zsh/zshrc.moonarch' | sudo tee -a /etc/zsh/zshrc > /dev/null echo '[[ ! -f "$HOME/.zshrc" ]] && source /etc/zsh/zshrc.moonarch' | sudo tee -a /etc/zsh/zshrc > /dev/null
fi fi
# Falls der User noch keine .zshrc hat, Moonarch-Default verlinken # If user has no .zshrc yet, link Moonarch defaults
if [[ ! -f "$HOME/.zshrc" ]]; then if [[ ! -f "$HOME/.zshrc" ]]; then
log "Keine ~/.zshrc gefunden — sourcing Moonarch-Defaults." log "No ~/.zshrc found — sourcing Moonarch defaults."
mkdir -p "$HOME/.zshrc.d" mkdir -p "$HOME/.zshrc.d"
echo "# Moonarch-Defaults laden, eigene Overrides in ~/.zshrc.d/ oder hier unten" > "$HOME/.zshrc" echo "# Load Moonarch defaults, add custom overrides in ~/.zshrc.d/ or below" > "$HOME/.zshrc"
echo "source /etc/zsh/zshrc.moonarch" >> "$HOME/.zshrc" echo "source /etc/zsh/zshrc.moonarch" >> "$HOME/.zshrc"
fi fi
# --- moonlock systemd user service --- # --- moonlock systemd user service ---
log "Konfiguriere moonlock User-Service..." log "Configuring moonlock user service..."
sudo mkdir -p /etc/systemd/user sudo mkdir -p /etc/systemd/user
sudo cp "$DEFAULTS_DIR/etc/systemd/user/moonlock.service" /etc/systemd/user/moonlock.service sudo cp "$DEFAULTS_DIR/etc/systemd/user/moonlock.service" /etc/systemd/user/moonlock.service
# --- greetd / moongreet Konfiguration --- # --- greetd / moongreet configuration ---
log "Konfiguriere greetd + moongreet..." log "Configuring greetd + moongreet..."
sudo mkdir -p /etc/greetd sudo mkdir -p /etc/greetd
sudo cp "$DEFAULTS_DIR/etc/greetd/config.toml" /etc/greetd/config.toml sudo cp "$DEFAULTS_DIR/etc/greetd/config.toml" /etc/greetd/config.toml
sudo mkdir -p /etc/moongreet sudo mkdir -p /etc/moongreet
sudo cp "$DEFAULTS_DIR/etc/moongreet/moongreet.toml" /etc/moongreet/moongreet.toml sudo cp "$DEFAULTS_DIR/etc/moongreet/moongreet.toml" /etc/moongreet/moongreet.toml
# Default-Wallpaper installieren (Greeter, Lockscreen, Desktop) # Install default wallpaper (greeter, lockscreen, desktop)
log "Installiere Default-Wallpaper..." log "Installing default wallpaper..."
sudo mkdir -p /usr/share/moonarch sudo mkdir -p /usr/share/moonarch
sudo cp "$DEFAULTS_DIR/backgrounds/wallpaper.jpg" /usr/share/moonarch/wallpaper.jpg sudo cp "$DEFAULTS_DIR/backgrounds/wallpaper.jpg" /usr/share/moonarch/wallpaper.jpg
# --- Systemd-Services aktivieren --- # --- Enable systemd services ---
log "Aktiviere Services..." log "Enabling services..."
SERVICES=( SERVICES=(
"NetworkManager" "NetworkManager"
"bluetooth" "bluetooth"
@ -191,20 +191,20 @@ for service in "${SERVICES[@]}"; do
sudo systemctl enable "$service" sudo systemctl enable "$service"
log " + $service" log " + $service"
else else
log " ~ $service nicht gefunden, uebersprungen." log " ~ $service not found, skipped."
fi fi
done done
# --- Shell auf zsh setzen --- # --- Set shell to zsh ---
if [[ "$SHELL" != */zsh ]]; then if [[ "$SHELL" != */zsh ]]; then
log "Setze Standard-Shell auf zsh..." log "Setting default shell to zsh..."
chsh -s "$(which zsh)" chsh -s "$(which zsh)"
fi fi
# --- Firewall aktivieren --- # --- Enable firewall ---
log "Konfiguriere UFW..." log "Configuring UFW..."
sudo ufw default deny incoming sudo ufw default deny incoming
sudo ufw default allow outgoing sudo ufw default allow outgoing
sudo ufw --force enable sudo ufw --force enable
@ -212,17 +212,17 @@ sudo ufw --force enable
# --- Docker-Gruppe --- # --- Docker-Gruppe ---
if ! groups | grep -q docker; then if ! groups | grep -q docker; then
log "Fuege User zur docker-Gruppe hinzu..." log "Adding user to docker group..."
sudo usermod -aG docker "$USER" sudo usermod -aG docker "$USER"
fi fi
# --- User-Config-Defaults installieren --- # --- Install user config defaults ---
log "Installiere User-Config-Defaults nach ~/.config/..." log "Installing user config defaults to ~/.config/..."
USER_DEFAULTS_DIR="$DEFAULTS_DIR/user" USER_DEFAULTS_DIR="$DEFAULTS_DIR/user"
if [[ -d "$USER_DEFAULTS_DIR" ]]; then if [[ -d "$USER_DEFAULTS_DIR" ]]; then
# Jedes Unterverzeichnis in defaults/user/ entspricht einem ~/.config/-Verzeichnis. # Each subdirectory in defaults/user/ corresponds to a ~/.config/ directory.
# Dateien werden nur kopiert wenn sie noch nicht existieren (kein Ueberschreiben). # Files are only copied if they don't exist yet (no overwriting).
for src_dir in "$USER_DEFAULTS_DIR"/*/; do for src_dir in "$USER_DEFAULTS_DIR"/*/; do
app_name="$(basename "$src_dir")" app_name="$(basename "$src_dir")"
dest_dir="$HOME/.config/$app_name" dest_dir="$HOME/.config/$app_name"
@ -235,32 +235,32 @@ if [[ -d "$USER_DEFAULTS_DIR" ]]; then
cp "$src_file" "$dest_file" cp "$src_file" "$dest_file"
log " + $app_name/$rel_path" log " + $app_name/$rel_path"
else else
log " ~ $app_name/$rel_path existiert bereits, uebersprungen." log " ~ $app_name/$rel_path already exists, skipped."
fi fi
done done
done done
fi fi
# --- Screenshots-Verzeichnis --- # --- Screenshots directory ---
mkdir -p "$HOME/Pictures/Screenshots" mkdir -p "$HOME/Pictures/Screenshots"
mkdir -p "$HOME/Pictures/Wallpaper" mkdir -p "$HOME/Pictures/Wallpaper"
# --- moonarch-update Symlink --- # --- moonarch-update Symlink ---
log "Erstelle moonarch-update Kommando..." log "Creating moonarch-update command..."
sudo ln -sf "$PROJECT_DIR/scripts/update.sh" /usr/local/bin/moonarch-update sudo ln -sf "$PROJECT_DIR/scripts/update.sh" /usr/local/bin/moonarch-update
# --- Fertig --- # --- Done ---
log "" log ""
log "============================================" log "============================================"
log " Moonarch Installation abgeschlossen!" log " Moonarch installation complete!"
log "============================================" log "============================================"
log "" log ""
log "Naechste Schritte:" log "Next steps:"
log " 1. Reboot" log " 1. Reboot"
log " 2. Wallpaper in ~/Pictures/Wallpaper/ ablegen" log " 2. Place wallpapers in ~/Pictures/Wallpaper/"
log " 3. rustup default stable" log " 3. rustup default stable"
log " 4. User-Overrides in ~/.config/ oder ~/.zshrc.d/" log " 4. User overrides in ~/.config/ or ~/.zshrc.d/"
log "" log ""

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# ABOUTME: Moonarch System-Updater — aktualisiert System, Repo und Defaults. # ABOUTME: Moonarch system updater — updates system, repo and defaults.
# ABOUTME: Sollte regelmäßig ausgeführt werden um das System synchron zu halten. # ABOUTME: Should be run regularly to keep the system in sync.
set -euo pipefail set -euo pipefail
@ -10,14 +10,14 @@ OFFICIAL_PACKAGES="$PROJECT_DIR/packages/official.txt"
AUR_PACKAGES="$PROJECT_DIR/packages/aur.txt" AUR_PACKAGES="$PROJECT_DIR/packages/aur.txt"
DEFAULTS_DIR="$PROJECT_DIR/defaults" DEFAULTS_DIR="$PROJECT_DIR/defaults"
# --- Hilfsfunktionen --- # --- Helper functions ---
log() { log() {
echo -e "\e[1;34m[Moonarch]\e[0m $*" echo -e "\e[1;34m[Moonarch]\e[0m $*"
} }
err() { err() {
echo -e "\e[1;31m[Moonarch FEHLER]\e[0m $*" >&2 echo -e "\e[1;31m[Moonarch ERROR]\e[0m $*" >&2
} }
read_packages() { read_packages() {
@ -25,20 +25,20 @@ read_packages() {
} }
confirm() { confirm() {
read -r -p "$1 [j/N] " response read -r -p "$1 [y/N] " response
[[ "$response" =~ ^[jJyY]$ ]] [[ "$response" =~ ^[yY]$ ]]
} }
# --- Voraussetzungen --- # --- Prerequisites ---
if [[ $EUID -eq 0 ]]; then if [[ $EUID -eq 0 ]]; then
err "Bitte NICHT als root ausfuehren." err "Do NOT run as root."
exit 1 exit 1
fi fi
# --- 1. Moonarch-Repo aktualisieren --- # --- 1. Update Moonarch repo ---
log "=== Moonarch Repo aktualisieren ===" log "=== Update Moonarch repo ==="
cd "$PROJECT_DIR" cd "$PROJECT_DIR"
if git rev-parse --is-inside-work-tree &>/dev/null; then if git rev-parse --is-inside-work-tree &>/dev/null; then
@ -47,75 +47,75 @@ if git rev-parse --is-inside-work-tree &>/dev/null; then
REMOTE=$(git rev-parse @{u} 2>/dev/null || echo "$LOCAL") REMOTE=$(git rev-parse @{u} 2>/dev/null || echo "$LOCAL")
if [[ "$LOCAL" != "$REMOTE" ]]; then if [[ "$LOCAL" != "$REMOTE" ]]; then
log "Updates verfuegbar." log "Updates available."
git --no-pager log --oneline "$LOCAL".."$REMOTE" git --no-pager log --oneline "$LOCAL".."$REMOTE"
echo "" echo ""
if confirm "Repo aktualisieren?"; then if confirm "Update repo?"; then
git pull --ff-only git pull --ff-only
log "Repo aktualisiert." log "Repo updated."
else else
log "Repo-Update uebersprungen." log "Repo update skipped."
fi fi
else else
log "Repo ist aktuell." log "Repo is up to date."
fi fi
else else
log "Kein Git-Repo — Repo-Update uebersprungen." log "Not a git repo — repo update skipped."
fi fi
# --- 2. System-Pakete aktualisieren --- # --- 2. Update system packages ---
log "=== System-Pakete aktualisieren ===" log "=== Update system packages ==="
if confirm "pacman -Syu ausfuehren?"; then if confirm "Run pacman -Syu?"; then
sudo pacman -Syu sudo pacman -Syu
else else
log "System-Update uebersprungen." log "System update skipped."
fi fi
if command -v paru &>/dev/null; then if command -v paru &>/dev/null; then
if confirm "AUR-Pakete aktualisieren (paru -Sua)?"; then if confirm "Update AUR packages (paru -Sua)?"; then
paru -Sua paru -Sua
else else
log "AUR-Update uebersprungen." log "AUR update skipped."
fi fi
fi fi
# --- 3. Fehlende Pakete nachinstallieren --- # --- 3. Install missing packages ---
log "=== Paketlisten abgleichen ===" log "=== Reconcile package lists ==="
if [[ -f "$OFFICIAL_PACKAGES" ]]; then if [[ -f "$OFFICIAL_PACKAGES" ]]; then
MISSING_OFFICIAL=$(comm -23 <(read_packages "$OFFICIAL_PACKAGES" | sort) <(pacman -Qqe | sort) || true) MISSING_OFFICIAL=$(comm -23 <(read_packages "$OFFICIAL_PACKAGES" | sort) <(pacman -Qqe | sort) || true)
if [[ -n "$MISSING_OFFICIAL" ]]; then if [[ -n "$MISSING_OFFICIAL" ]]; then
log "Fehlende offizielle Pakete:" log "Missing official packages:"
echo "$MISSING_OFFICIAL" echo "$MISSING_OFFICIAL"
if confirm "Installieren?"; then if confirm "Install?"; then
# shellcheck disable=SC2086 # shellcheck disable=SC2086
sudo pacman -S --needed --noconfirm $MISSING_OFFICIAL sudo pacman -S --needed --noconfirm $MISSING_OFFICIAL
fi fi
else else
log "Alle offiziellen Pakete installiert." log "All official packages installed."
fi fi
fi fi
if [[ -f "$AUR_PACKAGES" ]] && command -v paru &>/dev/null; then if [[ -f "$AUR_PACKAGES" ]] && command -v paru &>/dev/null; then
MISSING_AUR=$(comm -23 <(read_packages "$AUR_PACKAGES" | sort) <(pacman -Qqe | sort) || true) MISSING_AUR=$(comm -23 <(read_packages "$AUR_PACKAGES" | sort) <(pacman -Qqe | sort) || true)
if [[ -n "$MISSING_AUR" ]]; then if [[ -n "$MISSING_AUR" ]]; then
log "Fehlende AUR-Pakete:" log "Missing AUR packages:"
echo "$MISSING_AUR" echo "$MISSING_AUR"
if confirm "Installieren?"; then if confirm "Install?"; then
# shellcheck disable=SC2086 # shellcheck disable=SC2086
paru -S --needed --noconfirm $MISSING_AUR paru -S --needed --noconfirm $MISSING_AUR
fi fi
else else
log "Alle AUR-Pakete installiert." log "All AUR packages installed."
fi fi
fi fi
# --- 4. Defaults aktualisieren --- # --- 4. Update defaults ---
log "=== Defaults aktualisieren ===" log "=== Update defaults ==="
# XDG Defaults # XDG Defaults
CHANGED_XDG=false CHANGED_XDG=false
@ -124,15 +124,15 @@ if ! diff -rq "$DEFAULTS_DIR/xdg/" /etc/xdg/ --exclude='*.pyc' &>/dev/null 2>&1;
fi fi
if $CHANGED_XDG; then if $CHANGED_XDG; then
log "XDG-Defaults haben sich geaendert." log "XDG defaults have changed."
diff -rq "$DEFAULTS_DIR/xdg/" /etc/xdg/ --exclude='*.pyc' 2>/dev/null | head -20 || true diff -rq "$DEFAULTS_DIR/xdg/" /etc/xdg/ --exclude='*.pyc' 2>/dev/null | head -20 || true
echo "" echo ""
if confirm "XDG-Defaults nach /etc/xdg/ deployen?"; then if confirm "Deploy XDG defaults to /etc/xdg/?"; then
sudo cp -r "$DEFAULTS_DIR/xdg/"* /etc/xdg/ sudo cp -r "$DEFAULTS_DIR/xdg/"* /etc/xdg/
log "XDG-Defaults aktualisiert." log "XDG defaults updated."
fi fi
else else
log "XDG-Defaults sind aktuell." log "XDG defaults are up to date."
fi fi
# Binaries # Binaries
@ -146,51 +146,51 @@ for bin in "$DEFAULTS_DIR/bin/moonarch-"*; do
done done
if $CHANGED_BIN; then if $CHANGED_BIN; then
log "Moonarch-Binaries haben sich geaendert." log "Moonarch binaries have changed."
for bin in "$DEFAULTS_DIR/bin/moonarch-"*; do for bin in "$DEFAULTS_DIR/bin/moonarch-"*; do
name=$(basename "$bin") name=$(basename "$bin")
if ! cmp -s "$bin" "/usr/local/bin/$name" 2>/dev/null; then if ! cmp -s "$bin" "/usr/local/bin/$name" 2>/dev/null; then
log " ~ $name" log " ~ $name"
fi fi
done done
if confirm "Binaries nach /usr/local/bin/ deployen?"; then if confirm "Deploy binaries to /usr/local/bin/?"; then
sudo install -m 755 "$DEFAULTS_DIR/bin/moonarch-"* /usr/local/bin/ sudo install -m 755 "$DEFAULTS_DIR/bin/moonarch-"* /usr/local/bin/
log "Binaries aktualisiert." log "Binaries updated."
fi fi
else else
log "Binaries sind aktuell." log "Binaries are up to date."
fi fi
# Zsh # Zsh
if ! cmp -s "$DEFAULTS_DIR/shell/zshrc" /etc/zsh/zshrc.moonarch 2>/dev/null; then if ! cmp -s "$DEFAULTS_DIR/shell/zshrc" /etc/zsh/zshrc.moonarch 2>/dev/null; then
log "Zsh-Defaults haben sich geaendert." log "Zsh defaults have changed."
if confirm "Zsh-Defaults aktualisieren?"; then if confirm "Update Zsh defaults?"; then
sudo cp "$DEFAULTS_DIR/shell/zshrc" /etc/zsh/zshrc.moonarch sudo cp "$DEFAULTS_DIR/shell/zshrc" /etc/zsh/zshrc.moonarch
log "Zsh-Defaults aktualisiert." log "Zsh defaults updated."
fi fi
else else
log "Zsh-Defaults sind aktuell." log "Zsh defaults are up to date."
fi fi
# --- 5. Verwaiste Pakete --- # --- 5. Orphaned packages ---
log "=== Verwaiste Pakete ===" log "=== Orphaned packages ==="
ORPHANS=$(pacman -Qdtq 2>/dev/null || true) ORPHANS=$(pacman -Qdtq 2>/dev/null || true)
if [[ -n "$ORPHANS" ]]; then if [[ -n "$ORPHANS" ]]; then
log "Verwaiste Pakete gefunden:" log "Orphaned packages found:"
echo "$ORPHANS" echo "$ORPHANS"
if confirm "Entfernen?"; then if confirm "Remove?"; then
# shellcheck disable=SC2086 # shellcheck disable=SC2086
sudo pacman -Rsn --noconfirm $ORPHANS sudo pacman -Rsn --noconfirm $ORPHANS
fi fi
else else
log "Keine verwaisten Pakete." log "No orphaned packages."
fi fi
# --- Fertig --- # --- Done ---
log "" log ""
log "============================================" log "============================================"
log " Moonarch Update abgeschlossen!" log " Moonarch update complete!"
log "============================================" log "============================================"