From 521b9ff221b49064e993279a19ce4221d6e0ee0a Mon Sep 17 00:00:00 2001 From: Timmy Keller Date: Mon, 23 Aug 2021 17:34:26 -0500 Subject: Changes over vacation to Ga/Sc & first day of college --- zsh/zprofile.base | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'zsh/zprofile.base') diff --git a/zsh/zprofile.base b/zsh/zprofile.base index b872ba3..93088df 100644 --- a/zsh/zprofile.base +++ b/zsh/zprofile.base @@ -1,11 +1,13 @@ #!/bin/zsh # Path -export PATH="/home/timmy/scripts/launch:$PATH" -export PATH="/home/timmy/scripts/x11:$PATH" -export PATH="/home/timmy/scripts/misc:$PATH" -export PATH="/home/timmy/scripts/keyboard:$PATH" -export PATH="/home/timmy/scripts/sync:$PATH" +scriptspath="/home/timmy/.local/bin" +export PATH="$scriptspath/launch:$PATH" +export PATH="$scriptspath/x11:$PATH" +export PATH="$scriptspath/misc:$PATH" +export PATH="$scriptspath/keyboard:$PATH" +export PATH="$scriptspath/sync:$PATH" +export PATH="$scriptspath/programs:$PATH" # Default programs: export EDITOR="vim" @@ -20,8 +22,7 @@ export XAUTHORITY="$XDG_CONFIG_HOME/x11/Xauthority" export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" export INPUTRC="$XDG_CONFIG_HOME/zsh/inputrc" export NOTMUCH_COFIG="$XDG_CONFIG_HOME/notmuch/config" -#export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config" -export MBSYNCRC="${XDG_CONFIG_HOME:-$HOME/.config}/mbsync/config" +export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config" export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # Move .zshrc export XDG_DATA_HOME="$HOME/.local/share" @@ -30,7 +31,8 @@ export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store" export LESSHISTFILE="-" +# Theming export QT_QPA_PLATFORMTHEME="qt5ct" -# Autostart x11 after login -if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then startx $XDG_CONFIG_HOME/x11/xinitrc; fi +# Autostart X after login +if [[ -z $DISPLAY ]] && [[ "$USER" != "root" ]] && [[ $(tty) = /dev/tty1 ]]; then startx $XDG_CONFIG_HOME/x11/xinitrc; fi -- cgit v1.2.3