fix: polybar interface-type auto-detect, remove hardcoded interface code

Author: draphy

configs/fish/conf.d/fnm.fish

@@ -2,5 +2,8 @@
 set FNM_PATH "$HOME/.local/share/fnm"
 if [ -d "$FNM_PATH" ]
     set PATH "$FNM_PATH" $PATH
-    fnm env --use-on-cd --shell fish | source
+    # Only initialize if fnm binary exists
+    if command -q fnm
+        fnm env --use-on-cd --shell fish | source
+    end
 end

configs/polybar/config.ini

@@ -139,8 +139,8 @@ label = %percentage_used%% %used%/%total%
 
 [module/network-wifi]
 type = internal/network
-; WiFi interface (auto-configured by install script)
-interface = wlan0
+; Auto-detect wireless interface (polybar 3.6+)
+interface-type = wireless
 interval = 3.0
 
 ; Connected state - shows signal strength icon and network name
@@ -165,8 +165,8 @@ click-right = nm-applet
 
 [module/network-eth]
 type = internal/network
-; Ethernet interface (auto-configured by install script)
-interface = eth0
+; Auto-detect wired interface (polybar 3.6+)
+interface-type = wired
 interval = 3.0
 
 ; Connected state - shows wired icon and label

configs/xprofile

@@ -21,18 +21,4 @@ if command -v dbus-update-activation-environment >/dev/null 2>&1; then
     dbus-update-activation-environment --systemd DISPLAY XAUTHORITY SSH_AUTH_SOCK XDG_CURRENT_DESKTOP 2>/dev/null || true
 fi
 
-# Auto-detect network interfaces for polybar (handles USB adapters changing ports)
-# Each module auto-hides when disconnected, so both can be configured
-if [ -f "$HOME/.config/polybar/config.ini" ] && [ -w "$HOME/.config/polybar/config.ini" ]; then
-    # Detect WiFi interface (prefer active/UP one)
-    WIFI_IFACE=$(ip link show 2>/dev/null | grep -E "^[0-9]+: wl" | head -1 | awk -F: '{print $2}' | tr -d ' ')
-    if [ -n "$WIFI_IFACE" ] && echo "$WIFI_IFACE" | grep -qE '^[a-zA-Z0-9_-]+$'; then
-        sed -i "/^\[module\/network-wifi\]/,/^\[module\// s/^interface = .*/interface = $WIFI_IFACE/" "$HOME/.config/polybar/config.ini" 2>/dev/null || true
-    fi
-
-    # Detect Ethernet interface
-    ETH_IFACE=$(ip link show 2>/dev/null | grep -E "^[0-9]+: (enp|eth)" | head -1 | awk -F: '{print $2}' | tr -d ' ')
-    if [ -n "$ETH_IFACE" ] && echo "$ETH_IFACE" | grep -qE '^[a-zA-Z0-9_-]+$'; then
-        sed -i "/^\[module\/network-eth\]/,/^\[module\// s/^interface = .*/interface = $ETH_IFACE/" "$HOME/.config/polybar/config.ini" 2>/dev/null || true
-    fi
-fi
+# Network interfaces auto-detected by polybar (interface-type = wireless/wired)

install.sh

@@ -56,8 +56,6 @@ LOCK_FILE="/tmp/draphyOS-install-$UID.lock"
 LOG_FILE="/tmp/draphyOS-install.log"
 
 # Hardware detection results (populated by configure_hardware, written by create_marker)
-DETECTED_WIFI_IFACE=""
-DETECTED_ETH_IFACE=""
 IS_VM_MODE="false"
 
 # Failed items tracking (displayed at end of installation)
@@ -578,6 +576,7 @@ EOF
                 rm -f /tmp/ueberzugpp.repo
                 print_step "ueberzugpp repo added"
             else
+                rm -f /tmp/ueberzugpp.repo
                 print_warning "Failed to add ueberzugpp repo"
                 FAILED_ITEMS+=("ueberzugpp-repo")
             fi
@@ -590,6 +589,7 @@ EOF
                     rm -f /tmp/ueberzugpp.repo
                     print_step "ueberzugpp repo added (Fedora 41 fallback)"
                 else
+                    rm -f /tmp/ueberzugpp.repo
                     print_warning "Failed to add ueberzugpp repo (fallback)"
                     FAILED_ITEMS+=("ueberzugpp-repo")
                 fi
@@ -1493,82 +1493,9 @@ configure_hardware() {
         fi
     fi
 
-    # Detect network interfaces (both WiFi and Ethernet)
-    # Polybar has separate modules for each - they auto-hide when disconnected
-    local WIFI_IFACE=""
-    local ETH_IFACE=""
-
-    # Detect WiFi interface (prefer active one from default route)
-    local DEFAULT_IFACE
-    DEFAULT_IFACE=$(ip route show default 2>/dev/null | awk '/default/ {print $5}' | head -1)
-
-    if [[ "$DEFAULT_IFACE" == wl* ]]; then
-        WIFI_IFACE="$DEFAULT_IFACE"
-    else
-        # Fallback: find any WiFi interface
-        WIFI_IFACE=$(ip link show 2>/dev/null | grep -E "^[0-9]+: wl" | head -1 | awk -F: '{print $2}' | tr -d ' ')
-    fi
-
-    # Detect Ethernet interface
-    if [[ "$DEFAULT_IFACE" != wl* ]] && [ -n "$DEFAULT_IFACE" ]; then
-        ETH_IFACE="$DEFAULT_IFACE"
-    else
-        # Fallback: find any Ethernet interface
-        ETH_IFACE=$(ip link show 2>/dev/null | grep -E "^[0-9]+: (enp|eth)" | head -1 | awk -F: '{print $2}' | tr -d ' ')
-    fi
-
-    # Configure WiFi module
-    if [ -n "$WIFI_IFACE" ]; then
-        print_step "WiFi interface detected: $WIFI_IFACE"
-        # Update interface in network-wifi module section only (escape special chars for sed)
-        local wifi_escaped
-        wifi_escaped=$(printf '%s\n' "$WIFI_IFACE" | sed 's/[&/\]/\\&/g')
-        if sed -i "/^\[module\/network-wifi\]/,/^\[module\// s/^interface = .*/interface = ${wifi_escaped}/" "$polybar_config" 2>/dev/null; then
-            # Verify WiFi interface was set
-            if ! grep -q "interface = $WIFI_IFACE" "$polybar_config" 2>/dev/null; then
-                print_warning "WiFi interface config may not have been written correctly"
-                FAILED_ITEMS+=("hardware-wifi-verify")
-                ((hw_failures++))
-            fi
-        else
-            print_warning "Failed to configure WiFi interface in polybar"
-            FAILED_ITEMS+=("hardware-wifi")
-            ((hw_failures++))
-        fi
-        # Store for writing to marker file later (marker created in create_marker)
-        DETECTED_WIFI_IFACE="$WIFI_IFACE"
-    else
-        print_step "No WiFi interface detected (module will be hidden)"
-    fi
-
-    # Configure Ethernet module
-    if [ -n "$ETH_IFACE" ]; then
-        print_step "Ethernet interface detected: $ETH_IFACE"
-        # Update interface in network-eth module section only (escape special chars for sed)
-        local eth_escaped
-        eth_escaped=$(printf '%s\n' "$ETH_IFACE" | sed 's/[&/\]/\\&/g')
-        if sed -i "/^\[module\/network-eth\]/,/^\[module\// s/^interface = .*/interface = ${eth_escaped}/" "$polybar_config" 2>/dev/null; then
-            # Verify Ethernet interface was set
-            if ! grep -q "interface = $ETH_IFACE" "$polybar_config" 2>/dev/null; then
-                print_warning "Ethernet interface config may not have been written correctly"
-                FAILED_ITEMS+=("hardware-eth-verify")
-                ((hw_failures++))
-            fi
-        else
-            print_warning "Failed to configure Ethernet interface in polybar"
-            FAILED_ITEMS+=("hardware-eth")
-            ((hw_failures++))
-        fi
-        # Store for writing to marker file later (marker created in create_marker)
-        DETECTED_ETH_IFACE="$ETH_IFACE"
-    else
-        print_step "No Ethernet interface detected (module will be hidden)"
-    fi
-
-    if [ -z "$WIFI_IFACE" ] && [ -z "$ETH_IFACE" ]; then
-        print_warning "No network interfaces detected. Please configure polybar manually."
-        FAILED_ITEMS+=("hardware-no-network")
-    fi
+    # Network interfaces auto-detected by polybar (interface-type = wireless/wired)
+    # No manual configuration needed - polybar 3.6+ handles this automatically
+    print_step "Network interfaces: auto-detected by polybar"
 
     if [ $hw_failures -gt 0 ]; then
         print_warning "Hardware configured with $hw_failures issue(s)"
@@ -3005,13 +2932,7 @@ create_marker() {
         print_step "Detected: Fedora ${variant_id:-unknown}"
     fi
 
-    # Write hardware detection results (populated by configure_hardware and configure_vm)
-    if [ -n "$DETECTED_WIFI_IFACE" ]; then
-        echo "WIFI_IFACE=$DETECTED_WIFI_IFACE" >> "$MARKER_FILE"
-    fi
-    if [ -n "$DETECTED_ETH_IFACE" ]; then
-        echo "ETH_IFACE=$DETECTED_ETH_IFACE" >> "$MARKER_FILE"
-    fi
+    # Write hardware detection results (populated by configure_vm)
     if [ "$IS_VM_MODE" = "true" ]; then
         echo "VM_MODE=true" >> "$MARKER_FILE"
     fi

uninstall.sh

@@ -1022,15 +1022,7 @@ main() {
     if [ -f "$MARKER_FILE" ] && grep -q "VM_MODE=true" "$MARKER_FILE" 2>/dev/null; then
         echo "  - VM-optimized picom settings"
     fi
-    # Check for network interface configuration
-    if [ -f "$MARKER_FILE" ]; then
-        local wifi_iface eth_iface
-        wifi_iface=$(grep "WIFI_IFACE=" "$MARKER_FILE" 2>/dev/null | cut -d= -f2)
-        eth_iface=$(grep "ETH_IFACE=" "$MARKER_FILE" 2>/dev/null | cut -d= -f2)
-        if [ -n "$wifi_iface" ] || [ -n "$eth_iface" ]; then
-            echo "  - Network config: ${wifi_iface:+WiFi: $wifi_iface} ${eth_iface:+Eth: $eth_iface}"
-        fi
-    fi
+    # Network interfaces auto-detected by polybar (no config to remove)
     echo ""
     echo "You will be asked about:"
     echo "  - fnm (Node.js version manager)"