diff --git a/i38.sh b/i38.sh index 0862bf0..883e0b0 100755 --- a/i38.sh +++ b/i38.sh @@ -404,7 +404,7 @@ update_scripts() { write_waytray_config() { # Only create config if waytray binaries are detected if ! command -v waytray-daemon &> /dev/null || ! command -v waytray &> /dev/null ; then - return 1 + return 0 fi local waytrayConfigDir="${XDG_CONFIG_HOME:-$HOME/.config}/waytray" @@ -586,7 +586,7 @@ fi export fileBrowser="$(command -v $fileBrowser)" # IRC client unset programList -for i in albikirc Albikirc access-irc stormirc ; do +for i in albikirc Albikirc access-irc ; do if command -v ${i/#-/} &> /dev/null ; then if [ -n "$programList" ]; then programList="$programList $i" @@ -629,15 +629,14 @@ if [[ -d "${i3Path}" ]]; then yesno "This will replace your existing configuration at ${i3Path}. Do you want to continue?" || exit 0 fi +# Configure waytray if available +write_waytray_config # Create the i3 configuration directory. mkdir -p "${i3Path}" # Move scripts into place cp -rv scripts/ "${i3Path}/" | dialog --backtitle "I38" --progressbox "Moving scripts into place and writing config..." -1 -1 -# Configure waytray if available -write_waytray_config - cat << EOF > ${i3Path}/config # Generated by I38 (${0##*/}) https://git.stormux.org/storm/I38 # $(date '+%A, %B %d, %Y at %I:%M%p') @@ -856,7 +855,10 @@ fi) # Simple notes system bound to n bindsym n exec --no-startup-id ${i3Path}/scripts/notes.py, mode "default" - + + # Password manager bound to m + bindsym m exec --no-startup-id ${i3Path}/scripts/passmanager.py, mode "default" + $(if command -v blueman-manager &> /dev/null ; then echo "# Bluetooth bound to b" echo "bindsym b exec --no-startup-id blueman-manager, mode \"default\""