From: Amin Bandali Date: Sat, 28 Feb 2015 21:13:42 +0000 (-0500) Subject: rename xinitrc to xprofile X-Git-Url: https://git.shemshak.org/~bandali/configs/commitdiff_plain/73cd9ce5c908965080b7fd0e7197e8739e8df3f8?ds=sidebyside;hp=05806b3f1b894b04ca8d724493f3b83d4db07ecf rename xinitrc to xprofile since I'm now using lightdm instead of slim --- diff --git a/x/.xinitrc b/x/.xinitrc deleted file mode 100755 index 57f848a..0000000 --- a/x/.xinitrc +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# ~/.xinitrc -# -# Executed by startx (run your window manager from here) - -if [ -d /etc/X11/xinit/xinitrc.d ]; then - for f in /etc/X11/xinit/xinitrc.d/*; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -# Enable this for non-reparenting window managers -export _JAVA_AWT_WM_NONREPARENTING=1 - -xrdb -merge ~/.Xresources -xsetroot -cursor_name left_ptr & # set the cursor icon -sh ~/.fehbg & -xset +fp /usr/share/fonts/local -xset +fp ~/.fonts -xset fp rehash -xset b off -#xrdb -merge ~/.theme/base16-thewildhunt.dark.xresources -compton & -xbacklight -set 50 -synclient TapButton2=3 -synclient TapButton3=2 -synclient HorizTwoFingerScroll=1 -synclient VertScrollDelta=-237 -synclient HorizScrollDelta=-237 -setxkbmap -option caps:swapescape - -# MPD daemon start (if no other instance exists) -[ -z $(pidof mpd) ] && mpd & - -# screen powersave -xset +dpms -xset dpms 0 0 300 -xautolock -time 5 -locker i3lock-wrapper & - -# exec gnome-session -# exec startkde -#exec startxfce4 -# ...or the Window Manager of your choice -source ~/.profile -sxhkd & -panel & - -DEFAULTSESSION=bspwm -case "$1" in - i3) exec i3;; - bspwm) exec bspwm;; - *) exec $DEFAULTSESSION ;; -esac diff --git a/x/.xprofile b/x/.xprofile new file mode 100755 index 0000000..e4734db --- /dev/null +++ b/x/.xprofile @@ -0,0 +1,70 @@ +#!/bin/sh +# +# ~/.xinitrc +# +# Executed by startx (run your window manager from here) + +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for f in /etc/X11/xinit/xinitrc.d/*; do + [ -x "$f" ] && . "$f" + done + unset f +fi + +# workaround for some java apps, when running a non-reparenting window manager +export _JAVA_AWT_WM_NONREPARENTING=1 + +xrdb -merge ~/.Xresources + +# set the cursor icon +xsetroot -cursor_name left_ptr & + +# set the wallpaper +sh ~/.fehbg & + +# font stuff +xset +fp /usr/share/fonts/local +xset +fp ~/.fonts +xset fp rehash +xset b off + +# the compositor +compton & + +# xbacklight -set 50 + +# synaptics (touchpad) configs +synclient TapButton2=3 +synclient TapButton3=2 +synclient HorizTwoFingerScroll=1 +synclient VertScrollDelta=-237 +synclient HorizScrollDelta=-237 + +# swap caps lock and esc +setxkbmap -option caps:swapescape + +# MPD daemon start (if no other instance exists) +[ -z $(pidof mpd) ] && mpd & + +# screen powersave +xset +dpms +xset dpms 0 0 300 + +# lock the screen using lightdm after 5 minutes +xautolock -time 5 -locker "dm-tool lock" & + + +# exec gnome-session +# exec startkde +# exec startxfce4 +# ...or the Window Manager of your choice +# source ~/.profile +# sxhkd & +# panel & + +# DEFAULTSESSION=bspwm +# case "$1" in +# i3) exec i3;; +# bspwm) exec bspwm;; +# *) exec $DEFAULTSESSION ;; +# esac