diff --git a/home/common/files/bash/bashrc b/home/common/files/bash/bashrc
index fda71f8..862f969 100755
--- a/home/common/files/bash/bashrc
+++ b/home/common/files/bash/bashrc
@@ -93,18 +93,10 @@ then
   LESS="-Rs"
   EXINIT="set wrapmargin=8 sh=$SHELL sw=4 report=2 tabstop=8"
   export EXINIT EDITOR PAGER LESS
-  EDITOR=lvim
-  if [ -x /usr/bin/vim ] 
-  then
-    EDITOR=vim
-    alias vi=/usr/bin/vim
-  elif [ -x /usr/local/bin/vim ] 
-  then
-    EDITOR=vim
-    alias vi=/usr/local/bin/vim
-  elif [ $(which nvim 2>&1 >> /dev/null) ]
+  if [ "${EDITOR}" == "nano" ] && [ -x /etc/profiles/per-user/${USER}/bin/nvim ]
   then
     EDITOR=nvim
+    alias vi=nvim
   fi
   export EDITOR
   unset COMPHOSTS
@@ -123,11 +115,6 @@ then
   export LOCKPRG=${HOME}/bin/myLock
   export HISTCONTROL=ignoreboth
   export HISTIGNORE='pwd:exit:clear:history'
-
-
-  [ -f /etc/profile.d/bash-completion.sh ] && source /etc/profile.d/bash-completion.sh
-  [ -f /usr/local/share/bash-completion/bash_completion.sh ] && source/usr/local/share/bash-completion/bash_completion.sh
-  [ -f /usr/share/bash-completion/bash_completion ] && source /usr/share/bash-completion/bash_completion
   [ ! -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
@@ -138,18 +125,6 @@ then
   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
 
-  # git completion
-  if [ ! -v BASH_COMPLETION_VERSINFO -a -f /usr/local/share/git-completion/git-completion.bash ]; then
-    source /usr/local/share/git-completion/git-completion.bash
-  fi
-
-  export NVM_DIR="/usr/local/share/nvm"
-  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-  [ ! -v BASH_COMPLETION_VERSINFO -a -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-  export SASL_PATH=/usr/local/lib/sasl2
-  #complete -C "${GOPATH}/bin/bitcomplete" bit
-  test -f "${HOME}/.bash_${HOSTNAME_SHORT}"  && . ${HOME}/.bash_$HOSTNAME_SHORT
-
   # 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