summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Vink <ivi@vinkies.net>2025-02-18 12:57:01 +0000
committerMike Vink <ivi@vinkies.net>2025-02-18 12:57:01 +0000
commitb7dfb97ef0687d5cbe1521e49d2ca940e5344e42 (patch)
tree4ddabf0e463b3bd5a4fd56611b4e9bc146e681e5
parente558c876cb57b912dc437fedad3790bf50b7f8bd (diff)
update
-rw-r--r--.config/shell/profile2
-rw-r--r--.profile10
2 files changed, 11 insertions, 1 deletions
diff --git a/.config/shell/profile b/.config/shell/profile
index 8c746ed..81d72da 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -4,7 +4,7 @@ export PATH="$PATH:$HOME/go/bin:/usr/local/go/bin"
export PATH="$HOME/.local/bin:$PATH"
alias g="git "
-alias s="git status --short --ahead-behind"
+alias s="{ git status --short ; git log --oneline @{push}.. ; }"
alias d="docker "
alias k="kubectl "
alias t="terraform "
diff --git a/.profile b/.profile
index 4d33e71..5183e33 100644
--- a/.profile
+++ b/.profile
@@ -1,5 +1,15 @@
export ENV=$HOME/.kshrc
[ -f "$HOME/.config/shell/profile" ] && . "$HOME/.config/shell/profile"
+
+if [ -d $HOME/.config/shell/profile.d ]; then
+ for i in $HOME/.config/shell/profile.d/*.sh; do
+ if [ -r $i ]; then
+ . $i
+ fi
+ done
+ unset i
+fi
+
if [ -z $DISPLAY ] && [ $(tty) = /dev/tty1 ]; then
startx
fi