colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sxmo: fix sxmo_init ordering so my hooks are loaded and scale set properly

Browse Source
This commit is contained in:
Colin
2023-09-23 11:20:20 +00:00
parent ba638c1533
commit f8448d7d2f
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hosts/modules/gui/sxmo/default.nix
View File

@@ -228,12 +228,15 @@ in
# - placing default configs in ~ for sxmo-launched services (sxmo_migrate.sh) # - placing default configs in ~ for sxmo-launched services (sxmo_migrate.sh)
# - binding vol/power buttons (sxmo_swayinitconf.sh) # - binding vol/power buttons (sxmo_swayinitconf.sh)
# - launching sxmo_hook_start.sh # - launching sxmo_hook_start.sh
source ${package}/etc/profile.d/sxmo_init.sh #
# XXX: upstream sources `profile` later (after sxmo_migrate) # the commands here are similar to upstream sxmo_winit.sh, but not identical and the ordering may be different
# but _sxmo_load_environments uses `SXMO_DEVICE_NAME`,
# and i ship that via the profile, so order it such # profile may contain SXMO_DEVICE_NAME which is used by _sxmo_load_environment so load it early
source "$XDG_CONFIG_HOME/sxmo/profile" source "$XDG_CONFIG_HOME/sxmo/profile"
_sxmo_load_environments # sourcing upstream sxmo_init.sh triggers _sxmo_load_environment
# which ensures SXMO_* environment variables are set
source ${package}/etc/profile.d/sxmo_init.sh
# _sxmo_prepare_dirs ensures ~/.cache/sxmo & other XDG dirs exist with correct perms & owner
_sxmo_prepare_dirs _sxmo_prepare_dirs
# migrate tells sxmo to provide the following default files: # migrate tells sxmo to provide the following default files:
# - ~/.config/sxmo/profile # - ~/.config/sxmo/profile
@@ -245,6 +248,14 @@ in
# - ~/.config/wob/wob.ini # - ~/.config/wob/wob.ini
# - ~/.config/sxmo/conky.conf # - ~/.config/sxmo/conky.conf
sxmo_migrate.sh sync sxmo_migrate.sh sync
# various things may have happened above that require me to re-load the profile here:
# - _sxmo_load_environment sources a deviceprofile.sh file, which may override my profile settings.
# very obvious if you set a non-default SXMO_SWAY_SCALE.
# - sxmo_migrate.sh may have provided a default profile, if i failed to
source "$XDG_CONFIG_HOME/sxmo/profile"
# place my non-specialized hooks at higher precedence than the default device-hooks
# alternative would be to move my hooks to ~/.config/sxmo/hooks/<device-name>.
export PATH="$XDG_CONFIG_HOME/sxmo/hooks:$PATH"
# kill anything leftover from the previous sxmo run. this way we can (try to) be reentrant # kill anything leftover from the previous sxmo run. this way we can (try to) be reentrant
echo "sxmo_init: killing stale daemons (if active)" echo "sxmo_init: killing stale daemons (if active)"
@@ -254,9 +265,10 @@ in
pkill superd pkill superd
# configure vol/power-button input mapping (upstream SXMO has this in sway config) # configure vol/power-button input mapping (upstream SXMO has this in sway config)
echo "sxmo_init: configuring sway bindings with:" echo "sxmo_init: configuring sway bindings/displays with:"
echo "SXMO_POWER_BUTTON: $SXMO_POWER_BUTTON" echo "SXMO_POWER_BUTTON: $SXMO_POWER_BUTTON"
echo "SXMO_VOLUME_BUTTON: $SXMO_VOLUME_BUTTON" echo "SXMO_VOLUME_BUTTON: $SXMO_VOLUME_BUTTON"
echo "SXMO_SWAY_SCALE: $SXMO_SWAY_SCALE"
sxmo_swayinitconf.sh sxmo_swayinitconf.sh
echo "sxmo_init: invoking sxmo_hook_start.sh with:" echo "sxmo_init: invoking sxmo_hook_start.sh with:"