Sway support removed. Moved I38 specific scripts out of the branch covered by dex.
This commit is contained in:
Storm Dragon committed
1 parent
45eb3ae4fc
commit
3a9c2ab6f1
13 files changed
+147
-449
No files matched your search
@@ -11,8 +11,6 @@
|
||||
# PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
# Flag for sway configurations
|
||||
usingSway=1 # Not by default.
|
||||
i3Path="${XDG_CONFIG_HOME:-$HOME/.config}/i3"
|
||||
i3msg="i3-msg"
|
||||
configFile="${PWD}/I38_preferences.conf"
|
||||
@@ -527,7 +525,6 @@ EOF
|
||||
# Array of command line arguments
|
||||
declare -A command=(
|
||||
[h]="This help screen."
|
||||
[s]="Create sway configuration instead of i3."
|
||||
[u]="Copy over the latest version of scripts."
|
||||
[x]="Generate ~/.xinitrc and ~/.xprofile."
|
||||
[X]="Generate ~/.xprofile only."
|
||||
@@ -539,12 +536,6 @@ args="${args//[[:space:]]/}"
|
||||
while getopts "${args}" i ; do
|
||||
case "$i" in
|
||||
h) help;;
|
||||
s)
|
||||
swaySystemIncludesPath="/etc/sway/config.d"
|
||||
usingSway=0
|
||||
i3msg="swaymsg"
|
||||
i3Path="${XDG_CONFIG_HOME:-$HOME/.config}/sway"
|
||||
;;
|
||||
u) update_scripts;;
|
||||
x) write_xinitrc ;&
|
||||
X) write_xprofile ;;
|
||||
@@ -879,15 +870,6 @@ cat << EOF > "${i3Path}/config"
|
||||
# $(date '+%A, %B %d, %Y at %I:%M%p')
|
||||
EOF
|
||||
|
||||
# If we are using Sway, we need to load in the system configuration
|
||||
# Usually, this is for system specific dBus things that the distro knows how to manage; we should trust their judgment with that
|
||||
if [[ $usingSway ]] && [[ -d "${swaySystemIncludesPath}" ]]; then
|
||||
cat << EOF >> "${i3Path}/config"
|
||||
# Include your distribution Sway configuration files.
|
||||
include ${swaySystemIncludesPath}/*
|
||||
EOF
|
||||
fi
|
||||
|
||||
cat << EOF >> "${i3Path}/config"
|
||||
# i3 config file (v4)
|
||||
#
|
||||
@@ -1211,16 +1193,10 @@ bindsym Shift+c exec $(command -v cthulhu) --replace, mode "default"
|
||||
bindsym Shift+o exec $(command -v orca) --replace, mode "default"
|
||||
# Toggle screen reader
|
||||
bindsym Shift+t exec ${i3Path}/scripts/toggle_screenreader.sh, mode "default"
|
||||
$(if [[ $usingSway -eq 0 ]]; then
|
||||
echo "# reload the configuration file"
|
||||
echo "bindsym Control+semicolon exec bash -c '$i3msg -t command reload && spd-say -P important -Cw \"I38 Configuration reloaded.\"', mode \"default\""
|
||||
|
||||
else
|
||||
echo "# reload the configuration file"
|
||||
echo "bindsym Control+semicolon exec bash -c '$i3msg -t run_command reload && spd-say -P important -Cw \"I38 Configuration reloaded.\"', mode \"default\""
|
||||
echo "# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)"
|
||||
echo "bindsym Control+Shift+semicolon exec $i3msg -t run_command restart && spd-say -P important -Cw \"I3 restarted.\", mode \"default\""
|
||||
fi)
|
||||
# reload the configuration file
|
||||
bindsym Control+semicolon exec bash -c '$i3msg -t run_command reload && spd-say -P important -Cw "I38 Configuration reloaded."', mode "default"
|
||||
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
|
||||
bindsym Control+Shift+semicolon exec $i3msg -t run_command restart && spd-say -P important -Cw "I3 restarted.", mode "default"
|
||||
# Run dialog with exclamation
|
||||
bindsym Shift+exclam exec ${i3Path}/scripts/run_dialog.sh, mode "default"
|
||||
# exit i3 (logs you out of your X session)
|
||||
@@ -1239,50 +1215,28 @@ fi
|
||||
cat << EOF >> "${i3Path}/config"
|
||||
# Auto start section
|
||||
$(if [[ $sounds -eq 0 ]]; then
|
||||
if [[ $usingSway -eq 0 ]]; then
|
||||
echo "exec --no-startup-id ${i3Path}/scripts/sound.py"
|
||||
else
|
||||
echo "exec_always --no-startup-id ${i3Path}/scripts/sound.py"
|
||||
fi
|
||||
echo "exec_always --no-startup-id ${i3Path}/scripts/sound.py"
|
||||
fi
|
||||
# Steam game focus handler (i3 only) - focuses games when they open behind Big Picture
|
||||
if [[ $usingSway -ne 0 ]] && command -v steam &> /dev/null; then
|
||||
# Steam game focus handler - focuses games when they open behind Big Picture
|
||||
if command -v steam &> /dev/null; then
|
||||
echo "exec --no-startup-id ${i3Path}/scripts/steam_games.py"
|
||||
fi
|
||||
# i3 watchdog - monitors i3 responsiveness and auto-recovers from freezes
|
||||
if [[ $usingSway -ne 0 ]]; then
|
||||
echo "exec_always --no-startup-id ${i3Path}/scripts/i3_watchdog.sh"
|
||||
fi
|
||||
# xbrlapi is X11-only, skip on Sway/Wayland
|
||||
if [[ $brlapi -eq 0 ]] && [[ $usingSway -ne 0 ]]; then
|
||||
echo "exec_always --no-startup-id ${i3Path}/scripts/i3_watchdog.sh"
|
||||
if [[ $brlapi -eq 0 ]]; then
|
||||
echo 'exec --no-startup-id xbrlapi --quiet'
|
||||
fi
|
||||
if [[ $udiskie -eq 0 ]]; then
|
||||
echo 'exec --no-startup-id udiskie'
|
||||
fi
|
||||
# Notification daemon
|
||||
if [[ $usingSway -eq 0 ]]; then
|
||||
# Sway: prefer Wayland-native notification daemons
|
||||
if command -v mako &> /dev/null; then
|
||||
echo 'exec_always --no-startup-id mako'
|
||||
elif [[ -x "/usr/lib/xfce4/notifyd/xfce4-notifyd" ]]; then
|
||||
# Fallback to X11 variant via XWayland
|
||||
echo 'exec_always --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd'
|
||||
elif [[ -x "/usr/lib/notification-daemon-1.0/notification-daemon" ]]; then
|
||||
echo 'exec_always --no-startup-id /usr/lib/notification-daemon-1.0/notification-daemon -r'
|
||||
elif [[ -x "/usr/libexec/notification-daemon" ]]; then
|
||||
echo 'exec_always --no-startup-id /usr/libexec/notification-daemon -r'
|
||||
fi
|
||||
else
|
||||
# i3: use X11 notification daemons
|
||||
if [[ -x "/usr/lib/xfce4/notifyd/xfce4-notifyd" ]]; then
|
||||
echo 'exec_always --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd'
|
||||
elif [[ -x "/usr/lib/notification-daemon-1.0/notification-daemon" ]]; then
|
||||
echo 'exec_always --no-startup-id /usr/lib/notification-daemon-1.0/notification-daemon -r'
|
||||
elif [[ -x "/usr/libexec/notification-daemon" ]]; then
|
||||
# Work around for weird Void Linux stuff
|
||||
echo 'exec_always --no-startup-id /usr/libexec/notification-daemon -r'
|
||||
fi
|
||||
if [[ -x "/usr/lib/xfce4/notifyd/xfce4-notifyd" ]]; then
|
||||
echo 'exec_always --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd'
|
||||
elif [[ -x "/usr/lib/notification-daemon-1.0/notification-daemon" ]]; then
|
||||
echo 'exec_always --no-startup-id /usr/lib/notification-daemon-1.0/notification-daemon -r'
|
||||
elif [[ -x "/usr/libexec/notification-daemon" ]]; then
|
||||
# Work around for weird Void Linux stuff
|
||||
echo 'exec_always --no-startup-id /usr/libexec/notification-daemon -r'
|
||||
fi
|
||||
if command -v remind &> /dev/null && command -v notify-send &> /dev/null ; then
|
||||
echo "exec_always --no-startup-id ${i3Path}/scripts/launch_remind.sh"
|
||||
@@ -1291,39 +1245,25 @@ fi
|
||||
if [[ $batteryAlert -eq 0 ]]; then
|
||||
echo "exec_always --no-startup-id ${i3Path}/scripts/battery_alert.sh"
|
||||
fi
|
||||
if [[ $usingSway -ne 0 ]] && [[ -n "$screenlockPinHash" ]] && [[ "${screenlockAutolockSeconds:-0}" -gt 0 ]] && command -v xprintidle &> /dev/null; then
|
||||
if [[ -n "$screenlockPinHash" ]] && [[ "${screenlockAutolockSeconds:-0}" -gt 0 ]] && command -v xprintidle &> /dev/null; then
|
||||
echo "exec_always --no-startup-id ${i3Path}/scripts/screenlock_autolock.sh ${screenlockAutolockSeconds}"
|
||||
fi
|
||||
# WayTray system tray daemon
|
||||
if command -v waytray-daemon &> /dev/null ; then
|
||||
echo 'exec_always --no-startup-id bash -c "pgrep -x waytray-daemon > /dev/null || waytray-daemon"'
|
||||
fi
|
||||
echo "exec_always --no-startup-id ${i3Path}/scripts/i38-clipboard.py --daemon"
|
||||
echo "exec_always --no-startup-id ${i3Path}/scripts/desktop.sh"
|
||||
if [[ $dex -eq 0 ]]; then
|
||||
echo '# Start XDG autostart .desktop files using dex. See also'
|
||||
echo '# https://wiki.archlinux.org/index.php/XDG_Autostart'
|
||||
if [[ $usingSway -eq 0 ]]; then
|
||||
echo 'exec --no-startup-id dex --autostart --environment sway'
|
||||
else
|
||||
echo 'exec --no-startup-id dex --autostart --environment i3'
|
||||
fi
|
||||
echo 'exec --no-startup-id dex --autostart --environment i3'
|
||||
else
|
||||
echo '# Startup applications'
|
||||
# x11bell is X11-only, skip on Sway/Wayland
|
||||
if command -v x11bell &> /dev/null && [[ $usingSway -ne 0 ]]; then
|
||||
if command -v x11bell &> /dev/null; then
|
||||
echo 'exec --no-startup-id x11bell play -nqV0 synth .1 sq norm -12'
|
||||
fi
|
||||
# Clipboard manager
|
||||
if [[ $usingSway -eq 0 ]]; then
|
||||
# Sway: use Wayland clipboard manager
|
||||
if command -v wl-paste &> /dev/null && command -v clipman &> /dev/null; then
|
||||
echo 'exec wl-paste -t text --watch clipman store'
|
||||
fi
|
||||
else
|
||||
# i3: use I38's accessible clipboard history daemon
|
||||
echo "exec_always --no-startup-id ${i3Path}/scripts/i38-clipboard.py --daemon"
|
||||
fi
|
||||
echo "exec $screenReader"
|
||||
echo "exec_always --no-startup-id ${i3Path}/scripts/desktop.sh"
|
||||
fi)
|
||||
|
||||
# First run help documentation
|
||||
|
||||
Reference in new issue
Block a user