diff --git a/.bash_login b/.bash_login index 9d029c1..babcc11 100644 --- a/.bash_login +++ b/.bash_login @@ -20,5 +20,56 @@ if [ -f "$HOME/.config/localconfig.env" ]; then . "$HOME/.config/localconfig.env" fi -# # shellcheck source=./.bashrc +# Load bash +# shellcheck source=./.bashrc source ./.bashrc + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ] ; then + PATH="$HOME/bin:$PATH" +fi + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/.local/bin" ] ; then + PATH="$HOME/.local/bin:$PATH" +fi + +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 +source "$HOME/.env" +source "$HOME/.config/aliases" +export POSIX_PROFILE_SOURCED=true + +# how about detecting local configs +if [ -f "$HOME/.config/localconfig.env" ]; then + . "$HOME/.config/localconfig.env" +fi + +########################################################################################## +# Code snippets from https://git.sr.ht/~sircmpwn/dotfiles/tree/db5945a4/item/.env +########################################################################################## +if ls --version 2>&1 | grep -i gnu >/dev/null +then + alias ls='ls --color=auto ' +elif ls --version 2>&1 | grep -i busybox >/dev/null +then + alias ls='ls --color=auto ' +fi + +alias recent='ls -ltch' + +# Add optmizations for multicore builds +if [ $(uname) = "Linux" ] +then + nproc=$(grep '^processor' /proc/cpuinfo | wc -l) + if [ $nproc -gt 4 ] + then + # Reserve two cores + nproc=$((nproc - 2)) + fi + export MAKEFLAGS="-j$nproc" + export SAMUFLAGS="-j$nproc" +fi +########################################################################################## diff --git a/.config/yadm/encrypt b/.config/yadm/encrypt index c5806df..48730ef 100644 --- a/.config/yadm/encrypt +++ b/.config/yadm/encrypt @@ -1,6 +1,5 @@ -.abuild/releases@andreijiroh.eu.org.rsa -.abuild/releases@recaptime.eu.org.rsa -.abuild/ci-builder-ajhalili2006@infra.recaptime.eu.org.rsa.pub .config/gh/hosts.yml .config/glab-cli/config.yml -.ssh/personal-2023 \ No newline at end of file +.ssh/personal-2023 +.ssh/google_compute_engine +.ssh/launchpad \ No newline at end of file diff --git a/.profile b/.profile index 09c6c6e..b0b2d20 100644 --- a/.profile +++ b/.profile @@ -9,6 +9,14 @@ # for ssh logins, install and configure the libpam-umask package. #umask 022 +# if running bash (probably as seen in Debian) +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi + # set PATH so it includes user's private bin if it exists if [ -d "$HOME/bin" ] ; then PATH="$HOME/bin:$PATH" @@ -58,6 +66,3 @@ then export SAMUFLAGS="-j$nproc" fi ########################################################################################## - -if [[ $FF_BYOBU_ON_LOGIN != "" ]]; then -fi