lytedev/dotfiles
Archived
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

tons of stuff for lightdm integration

Browse source
This commit is contained in:
Daniel Flanagan 2017-02-03 22:03:44 -06:00
parent f0c007b56f
commit 1b419139a9
8 changed files with 68 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
env/wm/bspwmrc vendored
View file

@ -1,12 +1,17 @@
#!/usr/bin/env sh #!/usr/bin/env sh
source "$DOTFILES_PATH/variables.bash" source "$HOME/.dotfiles/variables.bash"
if [ -e "$BSPWM_STATE" ] ; then if [ -e "$BSPWM_STATE" ] ; then
bspc wm -l "$BSPWM_STATE" bspc wm -l "$BSPWM_STATE"
rm "$BSPWM_STATE" rm "$BSPWM_STATE"
fi fi
# start the bar if we want it
if [ "$BAR_ON_XINIT" -eq 1 ]; then
"$BAR_PATH/start.bash" &
fi
source "$DOTFILES_PATH/env/wm/bspwm_config" source "$DOTFILES_PATH/env/wm/bspwm_config"
source "$DOTFILES_PATH/scripts/get_color.sh" source "$DOTFILES_PATH/scripts/get_color.sh"
source "$DOTFILES_PATH/scripts/get_x_fonts.sh" source "$DOTFILES_PATH/scripts/get_x_fonts.sh"

3
env/wm/sxhkdrc vendored
View file

@ -170,7 +170,8 @@ super + space
# lock the desktop # lock the desktop
super + ctrl + shift + l super + ctrl + shift + l
$SHELL -c '$DOTFILES_PATH/env/x/screensaver/lock.sh' dm-tool lock
# $SHELL -c '$DOTFILES_PATH/env/x/screensaver/lock.sh'
# spawn gui file explorer # spawn gui file explorer
super + e super + e

3
env/x/xinitrc vendored
View file

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
echo "xstartup: XINIT" >> "$HOME/.xstartup_log"
if [ -f "$HOME/.xprofile" ]; then if [ -f "$HOME/.xprofile" ]; then
source "$HOME/.xprofile" source "$HOME/.xprofile"
fi fi
@ -18,5 +20,4 @@ unclutter &
compton & compton &
exec "$DOTFILES_PATH/env/wm/wmstart" exec "$DOTFILES_PATH/env/wm/wmstart"
# exec budgie-desktop

26
env/x/xloadresources vendored
View file

@ -1,18 +1,20 @@
#!/usr/bin/env bash #!/usr/bin/env bash
userresources=$HOME/.Xresources userresources="$HOME/.Xresources"
usercolors=$HOME/.Xresources.colors usercolors="$HOME/.Xresources.colors"
userenv=$HOME/.Xresources.env userenv="$HOME/.Xresources.env"
usermodmap=$HOME/.Xmodmap usermodmap="$HOME/.Xmodmap"
sysresources=/etc/X11/xinit/.Xresources sysresources="/etc/X11/xinit/.Xresources"
sysmodmap=/etc/X11/xinit/.Xmodmap sysmodmap="/etc/X11/xinit/.Xmodmap"
if [ -f $sysresources ]; then echo "xstartup: resources $userresources $userenv" >> "$HOME/.xstartup_log"
xrdb -merge $sysresources >/dev/null 2>&1
if [ -f "$sysresources" ]; then
xrdb -merge "$sysresources" >/dev/null 2>&1
fi fi
if [ -f $sysmodmap ]; then if [ -f "$sysmodmap" ]; then
xmodmap $sysmodmap >/dev/null 2>&1 xmodmap "$sysmodmap" >/dev/null 2>&1
fi fi
if [ -f "$userresources" ]; then if [ -f "$userresources" ]; then
@ -31,8 +33,8 @@ if [ -f "$usermodmap" ]; then
xmodmap "$usermodmap" >/dev/null 2>&1 xmodmap "$usermodmap" >/dev/null 2>&1
fi fi
if [ -d /etc/X11/xinit/xinitrc.d ] ; then if [ -d "/etc/X11/xinit/xinitrc.d" ] ; then
for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do for f in "/etc/X11/xinit/xinitrc.d/?*.sh" ; do
[ -x "$f" ] && . "$f" [ -x "$f" ] && . "$f"
done done
unset f unset f

23
env/x/xprofile vendored
View file

@ -1,19 +1,29 @@
#!/bin/sh #!/bin/sh
if [ -f ~/.fehbg ]; then source "$HOME/.dotfiles/variables.bash"
~/.fehbg &
echo '' > "$HOME/.xstartup_log"
echo "xstartup: $DOTFILES_PATH" >> "$HOME/.xstartup_log"
if [ -f "$HOME/.fehbg" ]; then
"$HOME/.fehbg" &
fi fi
if [ -f "$DOTFILES_PATH/env/x/xloadresources" ]; then
source "$DOTFILES_PATH/env/x/xloadresources" source "$DOTFILES_PATH/env/x/xloadresources"
fi
if [ -f "$DOTFILES_PATH/variables.bash" ]; then
source "$DOTFILES_PATH/variables.bash" source "$DOTFILES_PATH/variables.bash"
fi
# keyrepeat settings # keyrepeat settings
xset r rate 250 80 & xset r rate 250 80 &
# no screen blanking # no screen blanking
xset -dpms & # xset -dpms &
xset s noblank & # xset s noblank &
xset s off & # xset s off &
if [ -d "/usr/lib/nvidia" ]; then if [ -d "/usr/lib/nvidia" ]; then
export LD_LIBRARY_PATH=/usr/lib/nvidia export LD_LIBRARY_PATH=/usr/lib/nvidia
@ -22,3 +32,6 @@ fi
if [ -f "$HOME/.xprofile.env" ]; then if [ -f "$HOME/.xprofile.env" ]; then
source "$HOME/.xprofile.env" source "$HOME/.xprofile.env"
fi fi
unclutter &
compton &

10
env/x/xresources vendored
View file

@ -17,10 +17,10 @@
!#define primaryfont xft:Monaco-11 !#define primaryfont xft:Monaco-11
!#define primaryletterspace -1 !#define primaryletterspace -1
*font: primaryfont *font: xft:xos4 Terminus-10
*faceName: primaryfont *faceName: xft:xos4 Terminus-10
*boldFont: primaryfont *boldFont: xft:xos4 Terminus-10
*letterSpace: primaryletterspace *letterSpace: 0
*scrollBar: false *scrollBar: false
*cursorUnderline: true *cursorUnderline: true
*cursorBlink: true *cursorBlink: true
@ -29,8 +29,6 @@
*utf8: 2 *utf8: 2
*scaleHeight: 1 *scaleHeight: 1
emacs.font: emacspfont
*depth: 32 *depth: 32
URxvt.internalBorder: 24 URxvt.internalBorder: 24

4
scripts/get_x_fonts.sh
View file

@ -5,8 +5,8 @@ if [ -a "$HOME/.Xresources.env" ]; then
XRES_FILE="$HOME/.Xresources.env" XRES_FILE="$HOME/.Xresources.env"
fi fi
PRIMARY_FONT_XRESOURCES=$(grep "^#define primaryfont xft:" "$XRES_FILE" | grep -v "/\*" | head -n 1) PRIMARY_FONT_XRESOURCES=$(grep "^\*font: xft:" "$XRES_FILE" | grep -v "/\*" | head -n 1)
export PRIMARY_FONT_FAMILY_WITH_SIZE=${PRIMARY_FONT_XRESOURCES:24} export PRIMARY_FONT_FAMILY_WITH_SIZE=${PRIMARY_FONT_XRESOURCES:11}
export PRIMARY_FONT_FAMILY=$(echo $PRIMARY_FONT_FAMILY_WITH_SIZE | sed 's/\-.*//') export PRIMARY_FONT_FAMILY=$(echo $PRIMARY_FONT_FAMILY_WITH_SIZE | sed 's/\-.*//')
export PRIMARY_FONT_SIZE=$(echo $PRIMARY_FONT_FAMILY_WITH_SIZE | sed 's/.*\-//') export PRIMARY_FONT_SIZE=$(echo $PRIMARY_FONT_FAMILY_WITH_SIZE | sed 's/.*\-//')

11
xsession-launch.bash Executable file
View file

@ -0,0 +1,11 @@
#!/usr/bin/env bash
DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)
source "$DIR/variables.bash"
export DOTFILES_PATH="$DOTFILES_PATH"
# source "$DOTFILES_PATH/env/x/xloadresources"
bspwm