aliases splitted into files

.bash_aliases

@@ -26,57 +26,5 @@ alias dot='git -C ~/.dotfiles/ --work-tree=$HOME'
 alias dkill='docker stop $(docker ps -q)'
 
 # git
-
-# add
-alias gap='git add . --patch'
-
-# fetch
-alias gf='git fetch'
-alias gfa='git fetch --all'
-
-# push
-alias gpl='git pull'
-alias gplr='git pull --rebase'
-
-# push
-alias gp='git push -u origin "$(git branch --show-current)"'
-alias gpf='git push -u origin "$(git branch --show-current)" --force-with-lease'
-
-# branch
-alias gbl='git branch -l'
-alias gbd='git branch -D'
-alias gb='git branch'
-
-# checkout
-alias gc='git checkout'
-alias gcb='git checkout -b'
-alias gcp='git checkout -p'
-
-# status
-alias gs='git status'
-
-# commit
-alias gcm='git commit'
-alias gcma='git commit --amend'
-alias gcmane='git commit --amend --no-edit'
-
-# rebase
-alias gr='git rebase --commiter-date-is-author-date'
-alias grc='git rebase --continue'
-alias gra='git rebase --abort'
-alias grm='git fetch && git rebase origin/$(git branch --list | grep -E "main|master" | tr -d " ")'
-
-# reset
-alias grp='git reset -p'
-
-# log
-alias grl='git reflog'
-alias gl="git log --color --date=iso --format=fuller"
-
-# diff
-alias gd="git diff"
-alias gds="git diff --staged"
-
-# show all git aliases
-alias gal='cat $HOME/.bash_aliases | grep "alias g"'
-
+source ~/.bash_aliases_git
+source ~/.bash_aliases_tf

.bash_aliases_git

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# add
+alias gap='git add . --patch'
+
+# fetch
+alias gf='git fetch'
+alias gfa='git fetch --all'
+
+# push
+alias gpl='git pull'
+alias gplr='git pull --rebase'
+
+# push
+alias gp='git push -u origin "$(git branch --show-current)"'
+alias gpf='git push -u origin "$(git branch --show-current)" --force-with-lease'
+
+# branch
+alias gbl='git branch -l'
+alias gbd='git branch -D'
+alias gb='git branch'
+
+# checkout
+alias gc='git checkout'
+alias gcb='git checkout -b'
+alias gcp='git checkout -p'
+
+# status
+alias gs='git status'
+
+# commit
+alias gcm='git commit'
+alias gcma='git commit --amend'
+alias gcmane='git commit --amend --no-edit'
+
+# rebase
+alias gr='git rebase --commiter-date-is-author-date'
+alias grc='git rebase --continue'
+alias gra='git rebase --abort'
+alias grm='git fetch && git rebase origin/$(git branch --list | grep -E "main|master" | tr -d " ")'
+
+# reset
+alias grp='git reset -p'
+
+# log
+alias grl='git reflog'
+alias gl="git log --color --date=iso --format=fuller"
+
+# diff
+alias gd="git diff"
+alias gds="git diff --staged"
+
+# show all git aliases
+alias gal='cat $HOME/.bash_aliases | grep "alias g"'

.bash_aliases_tf

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+alias tp='terraform init --upgrade && terraform plan -out=../../plan'
+alias ta='terraform apply "../../plan"'

.bash_params

@@ -20,7 +20,9 @@ export WALLPAPER_FILE=$HOME/.local/wallpaper.png
 export TERM=xterm
 export TERMINAL=alacritty
 export LANG=pl_PL.UTF-8
+export LANGUAGE=pl_PL.UTF-8
 export LC_ALL=pl_PL.UTF-8
+export LC_COLLATE=pl_PL.UTF-8
 export EDITOR='nvim'
 export DEFAULT_OUTPUT="DP-4"
 
@@ -65,3 +67,4 @@ sources=(
 paths=$(echo ${sources[*]} | tr ' ' :)
 
 export PATH=$PATH:$paths
+source /usr/share/git/git-prompt.sh