Update shellrc files as well as global git config

Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.eu.org>

.bash_login

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-export HOST_SPECIFIC_BASHRC_PATH="$HOME/.config/$HOSTNAME.bashrc"
-
 # Stage 0: Source dotenv stuff from homedir
 source "$HOME/.env"
 if [[ -f "$HOME/.env.local" ]]; then
@@ -9,12 +7,16 @@ if [[ -f "$HOME/.env.local" ]]; then
   LOCAL_DOTENV_LOADED=true
 fi
 
-# Stage 1: Source the ~/.profile
+if [[ $TERMUX ]]; then
-source "$HOME/.profile"
+  export SSH_AGENT_=todo
+elif command -v keychain >> /dev/null; then
+  export KEYCHAIN_PATh=$(command -v keychain)
+  eval $(keychain --agents gpg,ssh --eval)
+fi
 
-# Added by Toolbox App
+# how about detecting local configs
-export PATH="$PATH:/home/ajhalili2006/.local/share/JetBrains/Toolbox/scripts"
+if [ -f "$HOME/.config/localconfig.env" ]; then
+  . "$HOME/.config/localconfig.env"
+fi
 
 _byobu_sourced=1 . /usr/bin/byobu-launch 2>/dev/null || true
-
-if [ -e "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then . "$HOME/.nix-profile/etc/profile.d/nix.sh"; fi # added by Nix installer

.bashrc

@@ -60,6 +60,7 @@ if [[ -d "$HOME/.bashbox" ]]; then
 fi
 
 # handle hostname generation for importing host-specific configs
+# TODO: Handle detection when we don't have WSL_* variables on tmux shell sessions
 if [[ $WSL_DISTRO_NAME ]] && [[ $WSL_INTEROP ]]; then
   HOSTNAME_BASH="${HOSTNAME}-wsl-${WSL_DISTRO_NAME}"
   export WSL=1 # similar to CODESPACES and GITPOD_WORKSPACE_ID vars

.config/aliases

@@ -6,21 +6,25 @@
 # basic git commands
 alias clone="git clone"
 alias stats="git status"
+
 ## shortcuts to creating commits
 alias commit="git commit --signoff --gpg-sign"
 alias commit-nogpg="git commit --signoff --no-gpg-sign"
 alias new-checkpoint="commit"
 alias new-checkpoint-nogpg="commit-nogpg"
+
 ## shortcuts to creating tags
 alias tag-checkpoint="git tag --gpg-sign"
 alias tag-checkpoint-nogpg="git tag --no-gpg-sign"
 alias new-tag="tag-checkpoint"
 alias new-tag-nogpg="tag-checkpoint-nogpg"
+
 ## shortcuts to managing yiff stash
 alias stash="git stash push --keep-index"
 alias pop-stash="git stash pop"
 alias apply-stash="git stash apply"
 alias yeet-stash="git stash drop"
+
 ## staging stuff
 alias stage="git add"
 alias unstage="git restore --staged"
@@ -70,3 +74,7 @@ alias guild-test="echo successfully imported owo"
 
 # shortcuts for rdp stuff
 alias bshq-cursed='rdesktop --user cursed-remote-user -r audio:local -x lan -r clipboard:PRIMARYCLIPBOARD -n guildedguy bullshit.hq'
+
+# manage submodules
+alias module="git submodule"
+alias update-module="git submodule update --remote --merge"

.config/bash/tools/nixpkgs.bashrc

@@ -3,3 +3,7 @@
 if [[ -d "$HOME/.nix-profile/etc/profile.d/nix.sh" ]] && [[ $FF_DISABLE_NIXPKGS != "true" ]]; then
   source "${HOME}/.nix-profile/etc/profile.d/nix.sh"
 fi
+
+if command -v devbox >> /dev/null; then
+  eval "$(devbox global shellenv)"
+fi

.gitconfig

@@ -6,7 +6,7 @@
 
 [commit]
   gpgSign = true
-	template = /home/ajhalili2006/.config/git/commit-message-templates/default
+	template = ~/.config/git/commit-message-templates/default
 [tag]
   gpgSign = true
 	forceSignAnnotated = true
@@ -98,3 +98,8 @@
   path = ~/.config/git/recaptime-dev.include.gitconfig
 #[includeIf "gitdir/i:~projects/"]
 #  path = ~/.config/git/ajhalili2006.include.gitconfig
+[trailer "sign"]
+	key = "Signed-off-by: "
+	ifmissing = add
+	ifexists = doNothing
+	command = echo \"$(git config user.name) <$(git config user.email)>\"

.profile

@@ -3,11 +3,11 @@
 if [ -n "$BASH_VERSION" ]; then
     # include .bashrc if it exists
     if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
+	    . "$HOME/.bashrc"
     fi
 fi
 
-export PATH="/usr/local/bin${PATH:+:}$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts:$HOME/.local/bin" # ~vern specifics and more
+export PATH="/usr/local/bin:$HOME/.local/bin:$HOME/bin${PATH:+:}$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts" # ~vern specifics and more
 mesg n 2> /dev/null || true
 
 # then import the rest
@@ -20,10 +20,4 @@ if [ -f "$HOME/.config/localconfig.env" ]; then
   . "$HOME/.config/localconfig.env"
 fi
 
-# Import asdf to shell
-#export ASDF_DIR="$HOME/.asdf"
-#. "$HOME/.asdf/asdf.sh"
-
-eval "$(devbox global shellenv)"
-
 _byobu_sourced=1 . /usr/bin/byobu-launch 2>/dev/null || true