jpm
/
scripts
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove merge cruft

This commit is contained in:
John Mertz 2022-11-04 23:06:08 -04:00
parent 3904c2b208
commit 447fcb9b5d
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sway/startsway.sh
View File

@ -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