When using Sway, include the default distribution files for configuration.

Useful for things such as importing the proper dBus environment.
This commit is contained in:
Hunter Jozwiak 2024-09-20 09:40:54 -04:00 committed by Storm Dragon
parent 3769428fdf
commit faf7ca45e0

15
i38.sh
View File

@ -11,7 +11,8 @@
# PARTICULAR PURPOSE. See the GNU General Public License for more details. # 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/>. # 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" i3Path="${XDG_CONFIG_HOME:-$HOME/.config}/i3"
i3msg="i3-msg" i3msg="i3-msg"
sensibleTerminal="i3-sensible-terminal" sensibleTerminal="i3-sensible-terminal"
@ -258,6 +259,8 @@ while getopts "${args}" i ; do
case "$i" in case "$i" in
h) help;; h) help;;
s) s)
swaySystemIncludesPath="/etc/sway/config.d"
usingSway=0
i3msg="swaymsg" i3msg="swaymsg"
i3Path="${XDG_CONFIG_HOME:-$HOME/.config}/sway" i3Path="${XDG_CONFIG_HOME:-$HOME/.config}/sway"
sensibleTerminal="sway --sensible-terminal" sensibleTerminal="sway --sensible-terminal"
@ -402,8 +405,18 @@ cp -rv scripts/ "${i3Path}/" | dialog --backtitle "I38" --progressbox "Moving sc
cat << EOF > ${i3Path}/config cat << EOF > ${i3Path}/config
# Generated by I38 (${0##*/}) https://git.stormux.org/storm/I38 # Generated by I38 (${0##*/}) https://git.stormux.org/storm/I38
# $(date '+%A, %B %d, %Y at %I:%M%p') # $(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) # i3 config file (v4)
# #
# Please see https://i3wm.org/docs/userguide.html for a complete reference! # Please see https://i3wm.org/docs/userguide.html for a complete reference!