dotfiles

shared miscellaneous configuration files between my systems
git clone git://git.eonn.xyz/dotfiles.git
Log | Files | Refs

commit b79164cf1dba3bed466e65b81aaea1f42adbef5b
parent 71b3304f0cd1b910c4b993e4ebea86101a57ea61
Author: Ian Ressa <ian@eonn.xyz>
Date:   Thu,  8 Sep 2022 22:35:53 -0400

re-add xorg_start to bash_profile and fix indentation

Diffstat:
M.bash_profile | 18+++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.bash_profile b/.bash_profile @@ -1,3 +1,10 @@ +xorg_start(){ + SYSTEM_PROFILE="/run/current-system/profile" + exec $SYSTEM_PROFILE/bin/xinit -- $SYSTEM_PROFILE/bin/Xorg :0 vt1 -keeptty \ + -configdir $SYSTEM_PROFILE/share/X11/xorg.conf.d \ + -modulepath $SYSTEM_PROFILE/lib/xorg/modules +} + SYSTEM_PROFILE="/run/current-system/profile" GUIX_PROFILE="/home/ian/.guix-profile" . "$GUIX_PROFILE"/etc/profile @@ -9,10 +16,10 @@ GUIX_EXTRA_PROFILES="/home/ian/.guix-extra-profiles" for i in $GUIX_EXTRA_PROFILES/*; do profile=$i/$(basename "$i") if [ -f "$profile"/etc/profile ]; then - GUIX_PROFILE="$profile" - . "$GUIX_PROFILE"/etc/profile - XDG_DATA_DIRS="$XDG_DATA_DIRS":"$GUIX_PROFILE"/share - XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS":"$GUIX_PROFILE"/etc + GUIX_PROFILE="$profile" + . "$GUIX_PROFILE"/etc/profile + XDG_DATA_DIRS="$XDG_DATA_DIRS":"$GUIX_PROFILE"/share + XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS":"$GUIX_PROFILE"/etc fi unset profile done @@ -33,5 +40,6 @@ EMACS_PROFILE="$GUIX_EXTRA_PROFILES"/emacs/emacs export EMACSLOADPATH="$EMACSLOADPATH":"$EMACS_PROFILE"/share/emacs/site-lisp if shopt -q login_shell; then - [[ -f ~/.bashrc ]] && source ~/.bashrc + [[ -f ~/.bashrc ]] && source ~/.bashrc + [[ -t 0 && $(tty) == /dev/tty1 && ! $DISPLAY ]] && xorg_start fi