diff --git a/x/.xinitrc b/x/.xinitrc index f14bb309..5195c34b 100644 --- a/x/.xinitrc +++ b/x/.xinitrc @@ -5,11 +5,13 @@ export QT_QPA_PLATFORMTHEME=qt5ct export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Djdk.gtk.version=3 -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' export _JAVA_AWT_WM_NONREPARENTING=1 -# Use gnome keyring -killall gnome-keyring-d 2> /dev/null -export `gnome-keyring-daemon -d` -eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh) -export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg) +if type -p gnome-keyring-daemon > /dev/null; then + # Use gnome keyring + killall gnome-keyring-d 2> /dev/null + export `gnome-keyring-daemon -d` + eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh) + export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg) +fi dbus-update-activation-environment --systemd DISPLAY export CORPUSER="jonathan.hodgson" @@ -19,13 +21,13 @@ setxkbmap -layout gb,gb -variant "colemak," -option grp:shifts_toggle xset r rate 200 70 xinput --list | grep -E 'ErgoDox EZ ErgoDox EZ\s+id' | grep -oE 'id=[0-9]+' | cut -d'=' -f2 | xargs -r setxkbmap -layout gb -device -exec /usr/bin/compton --config "$HOME/.config/picom/picom.conf" & +type -p compton > /dev/null && exec /usr/bin/compton --config "$HOME/.config/picom/picom.conf" & #setbackground & #/usr/bin/nitrogen --restore & /usr/bin/systemctl --user start background.service -/usr/lib/kdeconnectd & -/usr/bin/pactl load-module module-switch-on-connect & -/usr/bin/unclutter & +[ -f /usr/lib/kdeconnectd ] && /usr/lib/kdeconnectd & +[ -f /usr/bin/pactl ] && /usr/bin/pactl load-module module-switch-on-connect & +[ -f /usr/bin/unclutter ] && /usr/bin/unclutter & #greenclip daemon & #exec xrdb .Xresources #xbindkeys