jpm
/
.dotfiles
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to new configuration/spool directories

This commit is contained in:
John Mertz 2022-04-19 00:43:58 -04:00
parent 1677aaeb3b
commit 136436502e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bash/bash_login
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Load aliases # Load aliases
source ${HOME}/.config/bash/bash_aliases source ${HOME}/.dotfiles/bash/bash_aliases
# Configure static SSH Agent # Configure static SSH Agent
export SSH_AUTH_SOCK=~/.ssh/ssh-agent.sock export SSH_AUTH_SOCK=~/.ssh/ssh-agent.sock
@ -11,7 +11,7 @@ fi
ssh-agent -a "$SSH_AUTH_SOCK" >/dev/null ssh-agent -a "$SSH_AUTH_SOCK" >/dev/null
# Static/predictable Sway socket # Static/predictable Sway socket
export SWAYSOCK="/home/jpm/.config/sway-ipc.sock" export SWAYSOCK="/home/jpm/.spool/sway-ipc.sock"
# Standardize language on en_US because of the ubiquity # Standardize language on en_US because of the ubiquity
export LANG="en_US.UTF-8" export LANG="en_US.UTF-8"
@ -30,6 +30,6 @@ export QT_QPA_PLATFORM="wayland-egl;wayland;xcb"
export DCONF=".config/dconf/user" export DCONF=".config/dconf/user"
# Suggest session start command if last session is not known # Suggest session start command if last session is not known
if [ ! -e /home/jpm/.config/last_login_gui ]; then if [ ! -e /home/jpm/.spool/last_login_gui ]; then
echo "Use 'startsway' or 'starti3' to launch a GUI" echo "Use 'startsway' or 'starti3' to launch a GUI"
fi fi

14
bash/bashrc
View File

@ -13,8 +13,8 @@ export SSH_AUTH_SOCK=~/.ssh/ssh-agent.sock
# Automatically launch GUI on tty1 after login # Automatically launch GUI on tty1 after login
if [ "$(tty)" == '/dev/tty1' ]; then if [ "$(tty)" == '/dev/tty1' ]; then
. /home/jpm/.bash_login . /home/jpm/.bash_login
LAST_GUI=`cat /home/jpm/.config/last_login_gui` LAST_GUI=`cat /home/jpm/.spool/last_login_gui`
if [ -f "/home/jpm/.config/last_login_gui" ]; then if [ -f "/home/jpm/.spool/last_login_gui" ]; then
/home/jpm/scripts/${LAST_GUI}/start${LAST_GUI}.sh /home/jpm/scripts/${LAST_GUI}/start${LAST_GUI}.sh
fi fi
fi fi
@ -47,7 +47,7 @@ fi
# Bell when prompt is returned to mark as urgent # Bell when prompt is returned to mark as urgent
PROMPT_COMMAND='printf "\a"; history -a' PROMPT_COMMAND='printf "\a"; history -a'
# Reconfigure prompt after each return # Reconfigure prompt after each return
PROMPT_COMMAND="$PROMPT_COMMAND; source /home/jpm/.config/bash/prompt.sh" PROMPT_COMMAND="$PROMPT_COMMAND; source /home/jpm/.dotfiles/bash/prompt.sh"
# Enable color support if possible # Enable color support if possible
if [ -x /usr/bin/dircolors ]; then if [ -x /usr/bin/dircolors ]; then
@ -62,8 +62,8 @@ if [ -x /usr/bin/dircolors ]; then
fi fi
# Load aliases # Load aliases
if [ -f ~/.config/bash/bash_aliases ]; then if [ -f ~/.dotfiles/bash/bash_aliases ]; then
. ~/.config/bash/bash_aliases . ~/.dotfiles/bash/bash_aliases
fi fi
# Add snaps and flatpaks to path # Add snaps and flatpaks to path
@ -76,7 +76,7 @@ PERL_MB_OPT="--install_base \"/home/jpm/perl5\""; export PERL_MB_OPT;
PERL_MM_OPT="INSTALL_BASE=/home/jpm/perl5"; export PERL_MM_OPT; PERL_MM_OPT="INSTALL_BASE=/home/jpm/perl5"; export PERL_MM_OPT;
# Configure PATH # Configure PATH
source "$HOME/.config/bash/path" source "$HOME/.dotfiles/bash/path"
# Standardize language # Standardize language
export LANG="en_US.UTF-8" export LANG="en_US.UTF-8"
@ -98,5 +98,5 @@ export MOZ_WEBRENDER="1"
export XDG_SESSION_TYPE="wayland" export XDG_SESSION_TYPE="wayland"
export XDG_CURRENT_DESKTOP="sway" export XDG_CURRENT_DESKTOP="sway"
export XDG_CONFIG_HOME=/"home/jpm/.config" export XDG_CONFIG_HOME=/"home/jpm/.config"
export SWAYSOCK="/home/jpm/.config/sway-ipc.sock" export SWAYSOCK="/home/jpm/.spool/sway-ipc.sock"
export CHROME_EXECUTABLE="/usr/bin/chromium" export CHROME_EXECUTABLE="/usr/bin/chromium"