From e20761ce2cbce8d45bfa128d39ebc615b3e36f4f Mon Sep 17 00:00:00 2001 From: David Luevano Alvarado <55825613+luevano@users.noreply.github.com> Date: Tue, 8 Dec 2020 02:07:43 -0700 Subject: Fix config when not using DM and tidy up things --- .config/x11/xinitrc | 6 +++++- .config/x11/xprofile | 15 +++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) (limited to '.config/x11') diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 0c6736f..2df7747 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -4,4 +4,8 @@ # but since display managers use ~/.xprofile instead, # .xprofile is sourced to be compatible with both. -[ -f $HOME/.xprofile ] && . $HOME/.xprofile +if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile" ]; then + . "${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile" +else + . "$HOME/.xprofile" +fi diff --git a/.config/x11/xprofile b/.config/x11/xprofile index 728e4cc..bb8f0ce 100644 --- a/.config/x11/xprofile +++ b/.config/x11/xprofile @@ -3,12 +3,15 @@ # This is run when a display manager logs in. # Used as source for ~/.xinitrc. -nm-applet & # Network Manager. -picom & # Transparency and stuff. -dunst & # Notifications. -udiskie & # Drive mounting. -flameshot & # Screenshots. -pasystray & # Pulse Audio tray icon. +xrdb ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources & +nm-applet & +picom & +dunst & +udiskie & +flameshot & +# When not using a DM use this command. +# start-pulseaudio-x11 & +pasystray & # At the end, start the WM. # exec i3 -- cgit v1.2.3-54-g00ecf