diff options
Diffstat (limited to 'xorg/.xinitrc')
| -rwxr-xr-x | xorg/.xinitrc | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/xorg/.xinitrc b/xorg/.xinitrc index b6a1168..8bbd85b 100755 --- a/xorg/.xinitrc +++ b/xorg/.xinitrc @@ -1,24 +1,42 @@ #!/bin/bash setxkbmap de -feh --bg-fill $HOME/.config/wallpaper +. "$HOME/.screenlayout/home.sh" +feh --bg-fill "$HOME/.config/wallpaper" -# This was needed on my system with the non-lts kernel (some keys were mismatched) -# [[ -f ~/.Xmodmap ]] && xmodmap $HOME/.Xmodmap -[[ -f ~/.Xresources ]] && xrdb -merge -I$HOME ~/.Xresources -[[ -f $HOME/.cache/wal/colors.Xresources ]] && xrdb -merge -I$HOME $HOME/.cache/wal/colors.Xresources +env_file="$HOME/.config/env" +modmap_file="$HOME/.Xmodmap" +resources_file="$HOME/.Xresources" -[[ -f $HOME/.config/env ]] && source $HOME/.config/env +[[ -f "$env_file" ]] && . "$env_file" +[[ -f "$modmap_file" ]] && xmodmap "$modmap_file" +[[ -f "$resources_file" ]] && xrdb -merge -I"$HOME" "$resources_file" + +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 + +mkdir -p "$HOME"/.local/share/keyrings +eval $(/usr/bin/gnome-keyring-daemon --start) && export SSH_AUTH_SOCK updates check & -sxhkd -c "$HOME/.config/sxhkd/mediarc" & unclutter -idle 1 & brightness load & +clipmenud & +fcitx5 -d & slstatus & dunst & +picom & + +[ ! -s "$HOME/.config/mpd/pid" ] && mpd & -exec dwm +exec dwm # 2> "$HOME/dwm.log" +# exec leftwm +# exec awesome wal -R |