From d08176943cbdb3d232388632d61992083cbafb26 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Thu, 9 Oct 2025 15:15:46 -0500 Subject: [PATCH] home/common | add nix stuff to .bashrc --- home/common/files/bash/bashrc | 38 +++++++++++------------------------ 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/home/common/files/bash/bashrc b/home/common/files/bash/bashrc index 6d43264..ac390ed 100755 --- a/home/common/files/bash/bashrc +++ b/home/common/files/bash/bashrc @@ -18,32 +18,21 @@ # set some global stuff first -# colors -GREEN='' -YELLOW='' -RED='' NONE='' PATH="${HOME}/bin:/run/wrappers/bin:${HOME}/.nix-profile/bin:/etc/profiles/per-user/${USER}/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:${HOME}/go/bin:${HOME}/.local/bin:${HOME}/.cargo/bin:${HOME}/.local/share/gem/ruby/latest/bin" GOPATH="${HOME}/go" -export NONE GREEN YELLOW RED export PATH export GOPATH +export NIXPKGS_ALLOW_UNFREE=1 +export NIXPKGS_ALLOW_INSECURE=1 -if [ -f ${HOME}/.nix-profile/etc/profile.d/hm-session-vars.sh ] -then +if [ -f ${HOME}/.nix-profile/etc/profile.d/hm-session-vars.sh ]; then . ${HOME}/.nix-profile/etc/profile.d/hm-session-vars.sh fi HOSTNAME_SHORT=$(hostnamectl | awk -F: '$1=/Static hostname/{print $2}' | sed 's/^ //') -while [ "${HOSTNAME_SHORT}" == "localhost" ] -do - echo "${RED}@${GREEN}-,---${NONE}" - sleep 1 - HOSTNAME_SHORT=$(hostnamectl | awk -F: '$1=/Static hostname/{print $2}' | sed 's/^ //') -done export HOSTNAME_SHORT - # set coredump size to 0 ulimit -c 0 @@ -65,8 +54,7 @@ test -d "${HOME}/bin/${HOSTNAME_SHORT}" && PATH="${PATH}:${HOME}/bin/${HOSTNAME_ ######### ######### ##################################### -if [ "${PS1}" ]; -then +if [ "${PS1}" ]; then unset i set -o noclobber set -o notify @@ -85,10 +73,10 @@ then USER=$LOGNAME fi HISTNAME=$LOGNAME - if [ $EUID == 0 ];then HISTNAME=root;fi - HISTFILE="${HOME}/.bash_history.${HISTNAME}.${HOSTNAME_SHORT}.$(tty|cut -c10-)" + if [ $EUID == 0 ]; then HISTNAME=root; fi + HISTFILE="${HOME}/.bash_history.${HISTNAME}.${HOSTNAME_SHORT}.$(tty | cut -c10-)" export HISTFILE - test -f "${HOME}/.bash_ssh" && source "${HOME}/.bash_ssh" + test -f "${HOME}/.bash_ssh" && source "${HOME}/.bash_ssh" PAGER=less LESS="-Rs" @@ -101,14 +89,12 @@ then unset COMPHOSTS export COMPHOSTS=() - unset pathmunge # set up man path MANPATH="${MANPATH}:${HOME}/man:${HOME}/share/man" export MANPATH - - test -f $(ls -1 /nix/store/*bash-completion-*/etc/profile.d/bash_completion.sh | tail -n1) && \ + test -f $(ls -1 /nix/store/*bash-completion-*/etc/profile.d/bash_completion.sh | tail -n1) && source $(ls -1 /nix/store/*bash-completion-*/etc/profile.d/bash_completion.sh | tail -n1) export LOCKPRG=${HOME}/bin/myLock @@ -116,13 +102,13 @@ then export HISTIGNORE='pwd:exit:clear:history' [ ! -v ${BASH_COMPLETION_VERSINFO} -a -d ${HOME}/.bash_completion.d ] && for i in $(\ls -1 ${HOME}/.bash_completion.d/*.sh); do source $i; done - export PROMPT_COMMAND='history -a' # Always append history files + export PROMPT_COMMAND='history -a' # Always append history files PS1='\u@\h:\w> ' - test -f "${HOME}/.bash_aliases" && . ${HOME}/.bash_aliases - test -f "${HOME}/.bash_local" && . ${HOME}/.bash_local + test -f "${HOME}/.bash_aliases" && . ${HOME}/.bash_aliases + test -f "${HOME}/.bash_local" && . ${HOME}/.bash_local file=$(\ls -1d /nix/store/*-$(\ls -1d /nix/store/*-liquidprompt-* | grep -v drv | awk -F- '{printf("%s-%s\n",$2,$3)}' | tail -n1) | tail -n1) - test -f ${file}/bin/liquidprompt && . ${file}/bin/liquidprompt + test -f ${file}/bin/liquidprompt && . ${file}/bin/liquidprompt # BEGIN_KITTY_SHELL_INTEGRATION if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi