From 111af8894e6e00e242d5e949b530a53b18b6a3ad Mon Sep 17 00:00:00 2001
From: Paul Walker <paul@blacksun.org.uk>
Date: Sat, 14 Jan 2023 23:31:33 +0000
Subject: [PATCH] bash: have a big tidy up

---
 bashrc | 69 ++--------------------------------------------------------
 1 file changed, 2 insertions(+), 67 deletions(-)

diff --git a/bashrc b/bashrc
index 4120010..b7bbf87 100644
--- a/bashrc
+++ b/bashrc
@@ -53,34 +53,6 @@ if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
     debian_chroot=$(cat /etc/debian_chroot)
 fi
 
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
 # If this is an xterm set the title to user@host:dir
 case "$TERM" in
 xterm*|rxvt*)
@@ -94,11 +66,11 @@ export PROMPT_DIRTRIM=3
 addpath $HOME/bin
 addpath $HOME/opt/bin end
 
-export IPLAYER_OUTDIR="$HOME/downloads/iplayer"
+export IPLAYER_OUTDIR="$HOME/Downloads/iplayer/"
 
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
-    eval "`dircolors -b`"
+    eval "`dircolors -b ~/.dircolors`"
 fi
 
 # enable programmable completion features (you don't need to enable
@@ -108,37 +80,6 @@ if [ -f /etc/bash_completion ]; then
     . /etc/bash_completion
 fi
 
-# SSH_AGENT_FILE=$HOME/ssh.sh
-# if [ -f $SSH_AGENT_FILE ] ; then
-#     FILE_PID=$(grep SSH_AGENT_PID $SSH_AGENT_FILE | sed -e 's/^.*=//' | sed -e 's/;.*$//')
-#     RUNNING_PID=$(pgrep -U $USER ssh-agent)
-#     if [ "$RUNNING_PID" == "" ] ; then
-#         # No agent running
-#         echo Starting ssh-agent, you need to load keys though.
-#         ssh-agent > $SSH_AGENT_FILE
-#         . $SSH_AGENT_FILE
-#     elif [ "$RUNNING_PID" != "$FILE_PID" ] ; then
-#         echo Mismatch - file has $FILE_PID, system has $RUNNING_PID
-#         echo 'File is out of date; you might need to kill things and start again.'
-#     else
-#         # PIDs match, let\'s use the file
-#         . $SSH_AGENT_FILE 1>/dev/null
-#         KEYCOUNT=$(ssh-add -l | grep -v "The agent has no identities" | wc -l)
-#         echo Using ssh-agent $RUNNING_PID, $KEYCOUNT keys loaded
-#     fi
-# else
-#     # Assume no agent running
-#     echo Starting ssh-agent, you need to load keys though.
-#     ssh-agent > $SSH_AGENT_FILE
-#     . $SSH_AGENT_FILE
-# fi
-
-
-if [ "$HOME2" != "" ] ; then
-    echo "Switched root, merging $HOME2/.Xauthority"
-    xauth merge $HOME2/.Xauthority
-fi
-
 # Load any supplementary scripts
 if [ -d "$HOME"/.bashrc.d ] ; then
     for config in "$HOME"/.bashrc.d/*.bash ; do
@@ -151,11 +92,5 @@ if [ -f ${HOME}/.bashrc.d/local/${HOSTNAME}.bash ] ; then
     source ${HOME}/.bashrc.d/local/${HOSTNAME}.bash
 fi
 
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
-export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
-
 # Fig post block. Keep at the bottom of this file.
 [[ -f "$HOME/.fig/shell/bashrc.post.bash" ]] && builtin source "$HOME/.fig/shell/bashrc.post.bash"