cleanup xinit
This commit is contained in:
parent
d1370e3612
commit
744528c247
|
@ -13,3 +13,5 @@ if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile" ]; then
|
|||
else
|
||||
. "$HOME/.xprofile"
|
||||
fi
|
||||
|
||||
dwm
|
||||
|
|
|
@ -2,38 +2,27 @@
|
|||
xrandr --dpi 109 --fb 4480x1633 \
|
||||
--output DP-2 --mode 2560x1440 --pos 1920x0 \
|
||||
--output HDMI-0 --mode 1920x1080 --pos 0x553
|
||||
setbg & # set the background with the `setbg` script
|
||||
xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources & xrdbpid=$!
|
||||
setbg &
|
||||
xrdb "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources" & xrdbpid=$!
|
||||
remaps &
|
||||
|
||||
autostart="checkup mpd dunst unclutter pipewire dwmblocks"
|
||||
for program in $autostart; do
|
||||
pidof -s "$program" || "$program" &
|
||||
done >/dev/null 2>&1
|
||||
|
||||
pidof -s "picom" || picom --experimental-backends &
|
||||
|
||||
# Ensure that xrdb has finished running before moving on to start the WM/DE.
|
||||
[ -n "$xrdbpid" ] && wait "$xrdbpid"
|
||||
|
||||
# Start gpg-agent if not already running
|
||||
if ! pgrep -x -u "${USER}" gpg-agent 1> /dev/null 2>&1; then
|
||||
gpg-connect-agent /bye 1> /dev/null 2>&1
|
||||
fi
|
||||
|
||||
# Set SSH to use gpg-agent (see 'man gpg-agent', section EXAMPLES)
|
||||
unset SSH_AGENT_PID
|
||||
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
|
||||
# export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
|
||||
SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
|
||||
export SSH_AUTH_SOCK
|
||||
fi
|
||||
|
||||
# Set GPG TTY as stated in 'man gpg-agent'
|
||||
GPG_TTY="$(tty)"
|
||||
export GPG_TTY
|
||||
|
||||
# Refresh gpg-agent tty
|
||||
gpg-connect-agent updatestartuptty /bye > /dev/null
|
||||
|
||||
export XSECURELOCK_AUTH_BACKGROUND_COLOR="#24283b"
|
||||
|
@ -49,9 +38,5 @@ export XSECURELOCK_COMPOSITE_OBSCURER=0
|
|||
xset s 300
|
||||
xss-lock -- xsecurelock &
|
||||
|
||||
# Set GPU settings
|
||||
# gwe --hide-window &
|
||||
|
||||
# Start Console TDM
|
||||
exec dwm
|
||||
|
||||
# Ensure that xrdb has finished running before moving on to start the WM/DE.
|
||||
[ -n "$xrdbpid" ] && wait "$xrdbpid"
|
||||
|
|
Loading…
Reference in New Issue