mirror of
https://mau.dev/andreijiroh-dev/dotfiles.git
synced 2024-11-10 00:59:38 +00:00
chore(global): do some quick stash apply
after a rebase against main branch
Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.xyz>
This commit is contained in:
parent
2ae4ca415e
commit
7197da69d7
3 changed files with 12 additions and 13 deletions
20
.bash_login
20
.bash_login
|
@ -1,20 +1,17 @@
|
||||||
#!/usr/bin/env bash
|
#!/data/data/com.termux/files/usr/bin/env bash
|
||||||
# # shellcheck disable=SC2046,SC1091,SC2155
|
# shellcheck disable=SC2046,SC1091,SC2155
|
||||||
|
|
||||||
# Stage 0: Source dotenv stuff from homedir
|
# This is a minimal bash login scrupt for loading local
|
||||||
|
# configs as well as hooking in byobu on login.
|
||||||
|
|
||||||
|
# source local vars
|
||||||
|
# TODO: Hook up with dotenvx for decrypting encrypted secrets
|
||||||
source "$HOME/.env"
|
source "$HOME/.env"
|
||||||
if [[ -f "$HOME/.env.local" ]]; then
|
if [[ -f "$HOME/.env.local" ]]; then
|
||||||
source "$HOME/.env.local"
|
source "$HOME/.env.local"
|
||||||
export LOCAL_DOTENV_LOADED=true
|
export LOCAL_DOTENV_LOADED=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $TERMUX ]]; then
|
|
||||||
export SSH_AGENT_=todo
|
|
||||||
elif command -v keychain >> /dev/null; then
|
|
||||||
export KEYCHAIN_PATH=$(command -v keychain)
|
|
||||||
eval $(keychain --agents gpg,ssh --eval)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# how about detecting local configs
|
# how about detecting local configs
|
||||||
if [ -f "$HOME/.config/localconfig.env" ]; then
|
if [ -f "$HOME/.config/localconfig.env" ]; then
|
||||||
. "$HOME/.config/localconfig.env"
|
. "$HOME/.config/localconfig.env"
|
||||||
|
@ -74,3 +71,6 @@ then
|
||||||
fi
|
fi
|
||||||
##########################################################################################
|
##########################################################################################
|
||||||
|
|
||||||
|
if [[ $FF_BYOBU_ON_LOGIN == "true" || $LC_BYOBU == "1" ]]; then
|
||||||
|
_byobu_sourced=1 . /data/data/com.termux/files/usr/bin/byobu-launch 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# ~/.bash_logout: executed by bash(1) when login shell exits.
|
# ~/.bash_logout: executed by bash(1) when login shell exits.
|
||||||
|
|
||||||
# when leaving the console clear the screen to increase privacy
|
# when leaving the console clear the screen to increase privacy
|
||||||
|
|
||||||
if [ "$SHLVL" = 1 ]; then
|
if [ "$SHLVL" = 1 ]; then
|
||||||
[ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
|
command -v clear_console && clear_console -q
|
||||||
fi
|
fi
|
||||||
|
|
2
.profile
2
.profile
|
@ -67,6 +67,6 @@ then
|
||||||
fi
|
fi
|
||||||
##########################################################################################
|
##########################################################################################
|
||||||
|
|
||||||
if [[ $LC_BYOBU == "1" ]]; then
|
if [[ $FF_BYOBU_ON_LOGIN == "true" || $LC_BYOBU == "1" ]]; then
|
||||||
_byobu_sourced=1 . /data/data/com.termux/files/usr/bin/byobu-launch 2>/dev/null || true
|
_byobu_sourced=1 . /data/data/com.termux/files/usr/bin/byobu-launch 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue