diff options
| -rwxr-xr-x | .config/autostart/autostart.sh | 6 | ||||
| -rw-r--r-- | .xinitrc | 52 |
2 files changed, 5 insertions, 53 deletions
diff --git a/.config/autostart/autostart.sh b/.config/autostart/autostart.sh index 87ee293..de8e84d 100755 --- a/.config/autostart/autostart.sh +++ b/.config/autostart/autostart.sh @@ -10,7 +10,7 @@ start-picom() { set-wallpaper() { if [ $HOSTNAME == zeus ]; then - feh --bg-scale ~/wallpapers/cyberpunk-red.png + xwallpaper --focus ~/wallpapers/library-fantasy-tree.jpg --screen 0 else feh --bg-scale ~/wallpapers/library-fantasy-tree.jpg fi @@ -18,8 +18,8 @@ set-wallpaper() { get-started() { ( - start-picom - set-wallpaper + start-picom & + set-wallpaper & ## set keyboard setxkbmap us -option ctrl:swapcaps & ) @@ -1,52 +1,4 @@ #!/bin/sh -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - - - - - - - - xrdb -merge $sysresources - -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f "$userresources" ]; then - - - - - - - - xrdb -merge "$userresources" - -fi - -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# start some nice programs - -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -/usr/local/bin/stumpwm - +/usr/bin/qtile start +~/.config/autostart/autostart.sh |