From 447fcb9b5d2777770f719cbd6f6373b2617afde6 Mon Sep 17 00:00:00 2001 From: John Mertz Date: Fri, 4 Nov 2022 23:06:08 -0400 Subject: [PATCH] Remove merge cruft --- sway/startsway.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sway/startsway.sh b/sway/startsway.sh index 216282c..11fc075 100755 --- a/sway/startsway.sh +++ b/sway/startsway.sh @@ -1,7 +1,6 @@ #!/bin/bash rm $HOME/.swaylog echo sway > $HOME/.spool/last_login_gui -<<<<<<< HEAD export SSH_AUTH_SOCK=~/.ssh/ssh-agent.sock export SWAYSOCK="$HOME/.spool/sway-ipc.sock" export QT_QPA_PLATFORM="wayland-egl;wayland;xcb" @@ -22,10 +21,7 @@ export "$( gnome-keyring-daemon --start )" #WLR_RENDERER=vulkan sway --debug 2>> $HOME/.swaylog >> $HOME/.swaylog WLR_RENDERER=gles2 sway --debug 2>> $HOME/.swaylog >> $HOME/.swaylog; export SWAYSOCK=`sway --get-socketpath` -======= -export SWAYSOCK="$HOME/.spool/sway-ipc.sock" #WLR_RENDERER=vulkan sway --debug 2>> $HOME/.swaylog >> $HOME/.swaylog -WLR_RENDERER=gles2 $HOME/build/sway/build/sway/sway --debug 2>> $HOME/.swaylog >> $HOME/.swaylog +#WLR_RENDERER=gles2 $HOME/build/sway/build/sway/sway --debug 2>> $HOME/.swaylog >> $HOME/.swaylog export SWAYSOCK=`sway --get-socketpath` systemctl --user stop wallpapers.service ->>>>>>> master