Merge branch 'master' of git.stormux.org:storm/I38

This commit is contained in:
Storm Dragon 2024-10-23 05:44:07 -04:00
commit d393677f00
2 changed files with 9 additions and 4 deletions

6
i38.sh
View File

@ -651,9 +651,13 @@ fi
cat << EOF >> ${i3Path}/config cat << EOF >> ${i3Path}/config
# Auto start section # Auto start section
$(if [[ $sounds -eq 0 ]]; then $(if [[ $sounzzds -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" echo "exec_always --no-startup-id ${i3Path}/scripts/sound.py"
fi fi
fi
if [[ $loginSound -eq 0 ]]; then if [[ $loginSound -eq 0 ]]; then
echo 'exec --no-startup-id canberra-gtk-play -i desktop-login' echo 'exec --no-startup-id canberra-gtk-play -i desktop-login'
fi fi

View File

@ -29,8 +29,9 @@ def read_desktop_files(paths):
userApplicationsPath = Path.home() / '.local/share/applications' userApplicationsPath = Path.home() / '.local/share/applications'
systemApplicationsPath = Path('/usr/share/applications') systemApplicationsPath = Path('/usr/share/applications')
userFlatpakApplicationsPath = Path.home() / '.local/share/flatpak/exports/share/applications'
desktopEntries = read_desktop_files([userApplicationsPath, systemApplicationsPath]) systemFlatpakApplicationsPath = Path('/var/lib/flatpak/exports/share/applications')
desktopEntries = read_desktop_files([userApplicationsPath, systemApplicationsPath, userFlatpakApplicationsPath, systemFlatpakApplicationsPath])
# Combine some of the categories # Combine some of the categories
categoryMap = { categoryMap = {