diff options
Diffstat (limited to 'x')
| -rw-r--r-- | x/.xinitrc | 54 | ||||
| -rw-r--r-- | x/.xinitrc-not-docked | 50 |
2 files changed, 95 insertions, 9 deletions
@@ -1,25 +1,62 @@ +#!/bin/sh # executed by startx # for use when dingo is DOCKED -cd ~ & +# load xinitrc.d stuff + +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 + +# open picom compositor +picom -CG -I 0.1 -O 0.1 -o 0.0 --backend xrender --vsync --menu-opacity 1.0 & # set up monitors -fixscreen & +#fixscreen +sh ~/.screenlayout/screenlayout.sh & # set default audio device to be dock audio jack -pacmd set-default-sink 1 +pacmd set-default-sink alsa_output.usb-0c76_USB_PnP_Audio_Device-00.analog-stereo & # add weather, date and time to xsetroot sh ~/bin/xsetloop-docked.sh & # set up wallpapers -#wallpapers & +wallpapers & # start notifications daemon notification-daemon & # apply Xresources -xrdb -merge ~/.Xresources +xrdb -merge ~/.Xresources # make cursor disappear after a couple of seconds unclutter --idle 4 -root & @@ -27,5 +64,10 @@ unclutter --idle 4 -root & # enable numlock numlockx & +# turn off wifi, force ethernet +nmcli radio wifi off & + # start dwm -redshift -O3500; xset r rate 300 50; exec dwm +xset r rate 300 50 & +#exec /home/bryson/bin/startdwm +exec dwm diff --git a/x/.xinitrc-not-docked b/x/.xinitrc-not-docked index ca365f4..f01940b 100644 --- a/x/.xinitrc-not-docked +++ b/x/.xinitrc-not-docked @@ -1,16 +1,54 @@ # executed by startx-not-docked # for use when dingo is NOT docked -cd ~ +# load xinitrc.d stuff + +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 + +# start picom compositor +picom -CG -I 0.1 -O 0.1 -o 0.0 --backend xrender --menu-opacity 1.0 & + # add network, battery, date and time to xsetroot sh ~/bin/xsetloop-not-docked.sh & # set default audio device to be laptop speakers -pacmd set-default-sink 1 +pacmd set-default-sink alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink & + +pacmd set-sink-volume alsa_output.pci-0000_03_00.6.HiFi__hw_Generic_1__sink 0 & # set up wallpaper -#nitrogen --head=0 --set-zoom-fill ~/Pictures/Wallpapers/'10-6-Server.jpg' & +nitrogen --head=0 --set-zoom-fill ~/Pictures/Wallpapers/yosemite-edit.jpg & # start notifications daemon notification-daemon & @@ -21,5 +59,11 @@ xrdb -merge ~/.Xresources # make cursor disappear after a couple of seconds unclutter --idle 4 -root & +# turn tearfree on +xrandr --output eDP --auto --set TearFree on & + +# make sure wifi is back on +nmcli radio wifi on & + # start dwm redshift -O3500; xset r rate 300 50; exec dwm |