Load user .profile after setting up default values
This allow the user .profile to switch case depending on the default values. It is mandatory by example to setup custom wvkbd or svkbd, depending on the wm we use. Signed-off-by: Stacy Harper <contact@stacyharper.net> Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>
This commit is contained in:
parent
1ca8672473
commit
c014c6bb92
2 changed files with 5 additions and 9 deletions
|
@ -5,14 +5,14 @@ envvars() {
|
|||
# shellcheck disable=SC1091
|
||||
[ -f /etc/profile ] && . /etc/profile
|
||||
export BEMENU_OPTS='--fn "Monospace 11"'
|
||||
# shellcheck source=/dev/null
|
||||
[ -f "$HOME"/.profile ] && . "$HOME"/.profile
|
||||
export MOZ_ENABLE_WAYLAND=1
|
||||
command -v "$TERMCMD" || export TERMCMD="foot"
|
||||
command -v "$BROWSER" || export BROWSER=firefox
|
||||
command -v "$EDITOR" || export EDITOR=vis
|
||||
command -v "$SHELL" || export SHELL=/bin/sh
|
||||
command -v "$KEYBOARD" || defaultkeyboard
|
||||
command -v "$KEYBOARD" || export KEYBOARD=wvkbd-mobintl
|
||||
# shellcheck source=/dev/null
|
||||
[ -f "$HOME"/.profile ] && . "$HOME"/.profile
|
||||
[ -z "$MPV_HOME" ] && export MPV_HOME=/usr/share/sxmo/mpv
|
||||
[ -z "$MOZ_USE_XINPUT2" ] && export MOZ_USE_XINPUT2=1
|
||||
[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME=~/.config
|
||||
|
@ -44,10 +44,6 @@ defaults() {
|
|||
[ -e "$HOME"/.Xresources ] && xrdb -merge "$HOME"/.Xresources
|
||||
}
|
||||
|
||||
defaultkeyboard() {
|
||||
export KEYBOARD=wvkbd
|
||||
}
|
||||
|
||||
defaultconfig() {
|
||||
if [ ! -r "$2" ]; then
|
||||
mkdir -p "$(dirname "$2")"
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
envvars() {
|
||||
# shellcheck disable=SC1091
|
||||
[ -f /etc/profile ] && . /etc/profile
|
||||
# shellcheck source=/dev/null
|
||||
[ -f "$HOME"/.profile ] && . "$HOME"/.profile
|
||||
command -v "$TERMCMD" || export TERMCMD="st -e"
|
||||
command -v "$BROWSER" || export BROWSER=surf
|
||||
command -v "$EDITOR" || export EDITOR=vis
|
||||
command -v "$SHELL" || export SHELL=/bin/sh
|
||||
command -v "$KEYBOARD" || defaultkeyboard
|
||||
# shellcheck source=/dev/null
|
||||
[ -f "$HOME"/.profile ] && . "$HOME"/.profile
|
||||
[ -z "$MPV_HOME" ] && export MPV_HOME=/usr/share/sxmo/mpv
|
||||
[ -z "$MOZ_USE_XINPUT2" ] && export MOZ_USE_XINPUT2=1
|
||||
[ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME=~/.config
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue