From 52f5c21dd9d61e7af3e240fd066e0a347bc17da0 Mon Sep 17 00:00:00 2001
From: Paul Walker <paul@blacksun.org.uk>
Date: Tue, 27 Apr 2021 18:24:16 +0100
Subject: [PATCH] bash: tidying up

---
 bashrc                                          | 11 -----------
 bashrc.d/cargo.bash                             |  4 ++++
 bashrc.d/local/MacBook-Air.blacksun.org.uk.bash |  5 +++++
 3 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 bashrc.d/cargo.bash
 create mode 100644 bashrc.d/local/MacBook-Air.blacksun.org.uk.bash

diff --git a/bashrc b/bashrc
index 746e2db..166572a 100644
--- a/bashrc
+++ b/bashrc
@@ -145,13 +145,6 @@ fi
     # echo "Note - Dropbox isn't running!"
 # fi
 
-[ -f ~/.fzf.bash ] && source ~/.fzf.bash
-
-# Not version controlled, it's system specific.
-if [ -r $HOME/.cargo/env ] ; then
-  source $HOME/.cargo/env
-fi
-
 # Load any supplementary scripts
 if [ -d "$HOME"/.bashrc.d ] ; then
     for config in "$HOME"/.bashrc.d/*.bash ; do
@@ -162,7 +155,3 @@ fi
 if [ -f ${HOME}/.bashrc.d/local/${HOSTNAME}.bash ] ; then
     source ${HOME}/.bashrc.d/local/${HOSTNAME}.bash
 fi
-
-# tabtab source for packages
-# uninstall by removing these lines
-[ -f ~/.config/tabtab/__tabtab.bash ] && . ~/.config/tabtab/__tabtab.bash || true
diff --git a/bashrc.d/cargo.bash b/bashrc.d/cargo.bash
new file mode 100644
index 0000000..52e3cb9
--- /dev/null
+++ b/bashrc.d/cargo.bash
@@ -0,0 +1,4 @@
+# tabtab source for packages
+# uninstall by removing these lines
+[ -f ~/.config/tabtab/__tabtab.bash ] && . ~/.config/tabtab/__tabtab.bash || true
+[ -f "$HOME/.cargo/env" ] && source "$HOME/.cargo/env" || true
diff --git a/bashrc.d/local/MacBook-Air.blacksun.org.uk.bash b/bashrc.d/local/MacBook-Air.blacksun.org.uk.bash
new file mode 100644
index 0000000..3befae9
--- /dev/null
+++ b/bashrc.d/local/MacBook-Air.blacksun.org.uk.bash
@@ -0,0 +1,5 @@
+# Set up NNTP variables
+`netrc news.xcski.com NNTP`
+
+export PGDATA="/Users/$USER/Library/Application Support/Postgres/var-10"
+alias clearpgpid="rm $PGDATA/postmaster.pid"