Merge branch 'user/okmans/start-sway/ssh-agent' into 'master'
Pass the env variable SSH_AUTH_SOCK to all processes in the session See merge request tile-os/tileos-settings-sway!5
This commit is contained in:
commit
ca95164088
1 changed files with 7 additions and 2 deletions
|
@ -47,9 +47,14 @@ if [ -d "${XDG_CONFIG_HOME:-$HOME/.config}/environment.d" ]; then
|
||||||
set +o allexport
|
set +o allexport
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Run Sway under ssh-agent
|
||||||
|
run_sway() {
|
||||||
|
exec systemd-cat -- /usr/bin/ssh-agent /usr/bin/sway $@
|
||||||
|
}
|
||||||
|
|
||||||
# Check if Nvidia driver installed, start Sway and send output to the journal
|
# Check if Nvidia driver installed, start Sway and send output to the journal
|
||||||
if [ -d /sys/module/nvidia ] && [ ! -d /sys/module/amdgpu ] && [ ! -d /sys/module/i915 ]; then
|
if [ -d /sys/module/nvidia ] && [ ! -d /sys/module/amdgpu ] && [ ! -d /sys/module/i915 ]; then
|
||||||
exec systemd-cat -- /usr/bin/sway --unsupported-gpu $@
|
run_sway --unsupported-gpu $@
|
||||||
else
|
else
|
||||||
exec systemd-cat -- /usr/bin/sway $@
|
run_sway
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue