X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=.bashrc;h=470a1a469b9463d036b5d12685c762650aed837f;hb=06a56540b041accaaff795ad57664e368cb07a10;hp=e4a6fdadb92c9c0e4049565278b99c7136f528ed;hpb=fde3746c622eb042ce1fd051cdfea2f9a247cd53;p=distro-setup

diff --git a/.bashrc b/.bashrc
index e4a6fda..470a1a4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -29,7 +29,7 @@ HISTCONTROL=ignoredups
 # This works in addition to HISTCONTROL to do more flexible things
 # it could also do the same things as HISTCONTROL and thus replace it,
 # but meh. dunno why, but just " *" does glob expansion, so use [ ] to avoid it.
-HISTIGNORE='pass *:[ ]*:otp *:oathtool *:histrm *'
+HISTIGNORE='pass *:otp *:oathtool *:histrm *'
 
 
 
@@ -43,6 +43,7 @@ if [[ $LC_USEBASHRC != t && ( $SSH_CONNECTION || $TERM == linux ) ]];  then
   # so if we want it we don't have to restart our ssh connection.
   brc() {
     export LC_USEBASHRC=t
+    # shellcheck disable=SC1090 # obviously, no need to follow a sourcing of this file
     source ~/.bashrc
   }
   return 0
@@ -51,9 +52,8 @@ else
   ###### Begin sourcing of files #####
 
   # The distinction between login and non-login shells is super lame
-  # and pretty random. get rid of that distinction. The var check is
-  # just a random variable i set there and no where else.
-  if ! shopt -q login_shell && [[ ! $PITHOSFLY_SAVE_DIR ]]; then
+  # and pretty random. get rid of that distinction.
+  if ! shopt -q login_shell; then
     if [[ -r /etc/profile ]]; then
       source /etc/profile
     fi
@@ -98,6 +98,6 @@ return 0
 # kitty puts this here on startup, i need to build with some option to
 # avoid it, whatever.
 
-# 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
-# END_KITTY_SHELL_INTEGRATION
+## 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
+## END_KITTY_SHELL_INTEGRATION