fixes

2025-11-10 16:32:18 +01:00
parent ea55b1524b
commit 4bd89a3468
9 changed files with 106 additions and 20 deletions
--- a/v2/debian-chadwm.sh
+++ b/v2/debian-chadwm.sh
@@ -27,12 +27,12 @@ say_bold()     { printf "%b%s%b\n" "$BOLD" "$*" "$RESET"; }
 ##########################
 # Use exported variables from main detection script
 ##########################
-OS="${DETECTED_OS}"
-DDE="${DETECTED_DE}"
+OS="${DETECTED_OS:-debian}"
+DDE="${DETECTED_DE:-}"
 DE="${SELECTED_DE:-none}"
 TWM="${SELECTED_TWM:-none}"
 INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
-
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

 echo
 say_cyan "Starting Debian Chadwm setup..."
--- a/v2/debian-full.sh
+++ b/v2/debian-full.sh
@@ -24,8 +24,15 @@ say_cyan()     { printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; }
 say_gray()     { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
 say_bold()     { printf "%b%s%b\n" "$BOLD" "$*" "$RESET"; }

-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+##########################
+# Use exported variables from main detection script
+##########################
 OS="${DETECTED_OS:-debian}"
+DDE="${DETECTED_DE:-}"
+DE="${SELECTED_DE:-none}"
+TWM="${SELECTED_TWM:-none}"
+INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

 ##########################
 # Helper functions
@@ -52,5 +59,58 @@ sudo sed -i 's/^managed=.*/managed=true/' /etc/NetworkManager/NetworkManager.con
    echo -e "[ifupdown]\nmanaged=true" | sudo tee -a /etc/NetworkManager/NetworkManager.conf
 sudo systemctl restart NetworkManager

+# set fonts
+# Wait for xfconf to be available (only needed if running inside the same session)
+if command -v xfconf-query >/dev/null 2>&1; then
+    # Interface font (UI)
+    xfconf-query -c xsettings -p /Gtk/FontName -s "RobotoMono Nerd Font Regular 10"
+    # Monospace font (terminals, editors)
+    xfconf-query -c xsettings -p /Gtk/MonospaceFontName -s "RobotoMono Nerd Font Mono Regular 10"
+
+    say_green "XFCE fonts updated successfully!"
+else
+    say_yellow "xfconf-query not found — skipping XFCE font config (will apply at first login)."
+fi
+
+########################################
+# Set Chromium as default browser
+########################################
+say_cyan "Setting Chromium as the default browser..."
+
+# Update system default (for x-www-browser)
+sudo update-alternatives --set x-www-browser /usr/bin/chromium || \
+sudo update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/chromium 200
+
+# XFCE uses mimeapps.list to determine defaults for URLs
+mkdir -p ~/.config
+cat > ~/.config/mimeapps.list <<'EOF'
+[Default Applications]
+text/html=chromium.desktop
+x-scheme-handler/http=chromium.desktop
+x-scheme-handler/https=chromium.desktop
+x-scheme-handler/about=chromium.desktop
+x-scheme-handler/unknown=chromium.desktop
+EOF
+
+########################################
+# Set Alacritty as default terminal
+########################################
+say_cyan "Setting Alacritty as default terminal emulator..."
+
+# System-wide xfce helper
+mkdir -p ~/.config/xfce4/helpers
+cat > ~/.config/xfce4/helpers.rc <<'EOF'
+TerminalEmulator=alacritty
+WebBrowser=chromium
+EOF
+
+# Also set using xfconf if available
+if command -v xfconf-query >/dev/null 2>&1; then
+    xfconf-query -c xfce4-session -p /sessions/Failsafe/Client0_Command -t string -s "alacritty" --create || true
+    xfconf-query -c xfce4-session -p /sessions/Failsafe/Client1_Command -t string -s "chromium" --create || true
+fi
+
+say_green "Chromium set as default browser and Alacritty set as default terminal."
+
 # End of script
 say_green "Full setup completed."
--- a/v2/debian-gnome.sh
+++ b/v2/debian-gnome.sh
@@ -24,12 +24,15 @@ say_cyan()     { printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; }
 say_gray()     { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
 say_bold()     { printf "%b%s%b\n" "$BOLD" "$*" "$RESET"; }

-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+##########################
+# Use exported variables from main detection script
+##########################
 OS="${DETECTED_OS:-debian}"
 DDE="${DETECTED_DE:-}"
 DE="${SELECTED_DE:-none}"
 TWM="${SELECTED_TWM:-none}"
 INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

 ##########################
 # Helper functions
--- a/v2/debian-hyprland.sh
+++ b/v2/debian-hyprland.sh
@@ -24,8 +24,15 @@ say_cyan()     { printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; }
 say_gray()     { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
 say_bold()     { printf "%b%s%b\n" "$BOLD" "$*" "$RESET"; }

-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+##########################
+# Use exported variables from main detection script
+##########################
 OS="${DETECTED_OS:-debian}"
+DDE="${DETECTED_DE}"
+DE="${SELECTED_DE:-none}"
+TWM="${SELECTED_TWM:-none}"
+INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

 ##########################
 # Helper functions
--- a/v2/debian-minimal.sh
+++ b/v2/debian-minimal.sh
@@ -24,9 +24,15 @@ say_cyan()     { printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; }
 say_gray()     { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
 say_bold()     { printf "%b%s%b\n" "$BOLD" "$*" "$RESET"; }

-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+##########################
+# Use exported variables from main detection script
+##########################
 OS="${DETECTED_OS:-debian}"
+DDE="${DETECTED_DE}"
 DE="${SELECTED_DE:-none}"
+TWM="${SELECTED_TWM:-none}"
+INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

 ##########################
 # Helper functions
--- a/v2/debian-plasma.sh
+++ b/v2/debian-plasma.sh
@@ -25,14 +25,14 @@ say_gray()     { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
 say_bold()     { printf "%b%s%b\n" "$BOLD" "$*" "$RESET"; }

 ##########################
-# Variables
+# Use exported variables from main detection script
 ##########################
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 OS="${DETECTED_OS:-debian}"
-DDE="${DETECTED_DE:-}"
+DDE="${DETECTED_DE}"
 DE="${SELECTED_DE:-none}"
 TWM="${SELECTED_TWM:-none}"
 INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

 ##########################
 # Helper functions
--- a/v2/debian-server.sh
+++ b/v2/debian-server.sh
@@ -24,8 +24,15 @@ say_cyan()     { printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; }
 say_gray()     { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
 say_bold()     { printf "%b%s%b\n" "$BOLD" "$*" "$RESET"; }

-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+##########################
+# Use exported variables from main detection script
+##########################
 OS="${DETECTED_OS:-debian}"
+DDE="${DETECTED_DE}"
+DE="${SELECTED_DE:-none}"
+TWM="${SELECTED_TWM:-none}"
+INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

 ##########################
 # Helper functions
--- a/v2/debian-workstation.sh
+++ b/v2/debian-workstation.sh
@@ -24,8 +24,15 @@ say_cyan()     { printf "%b%s%b\n" "$CYAN" "$*" "$RESET"; }
 say_gray()     { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
 say_bold()     { printf "%b%s%b\n" "$BOLD" "$*" "$RESET"; }

-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+##########################
+# Use exported variables from main detection script
+##########################
 OS="${DETECTED_OS:-debian}"
+DDE="${DETECTED_DE}"
+DE="${SELECTED_DE:-none}"
+TWM="${SELECTED_TWM:-none}"
+INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

 ##########################
 # Helper functions
--- a/v2/debian-xfce.sh
+++ b/v2/debian-xfce.sh
@@ -25,13 +25,14 @@ say_gray()     { printf "%b%s%b\n" "$GRAY" "$*" "$RESET"; }
 say_bold()     { printf "%b%s%b\n" "$BOLD" "$*" "$RESET"; }

 ##########################
-# Paths and variables
+# Use exported variables from main detection script
 ##########################
-OS="${DETECTED_OS:-debian}"
-DDE="${DETECTED_DE:-}"
+OS="${DETECTED_OS}"
+DDE="${DETECTED_DE}"
 DE="${SELECTED_DE:-none}"
 TWM="${SELECTED_TWM:-none}"
 INSTALL_LEVEL="${INSTALL_LEVEL:-minimal}"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

 ##########################
 # Helper functions
@@ -100,10 +101,5 @@ else
    fi
 fi

-# Force SDDM to use X11 session
-sudo mkdir -p /etc/sddm.conf.d
-echo -e "[Autologin]\nSession=xfce.desktop" | sudo tee /etc/sddm.conf.d/10-xfce.conf >/dev/null
-echo -e "[General]\nSession=xfce.desktop" | sudo tee /etc/sddm.conf.d/10-xfce-session.conf >/dev/null
-
 # End of script
 say_green -e "XFCE / SDDM setup completed."