From fb18fcfaa9be09dffd473b8bd1c44cdb886db1a5 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Tue, 3 Apr 2018 12:54:48 -0400
Subject: Move home bins to ~/.local/bin

Also replaced ~/.cargo/bin with a symlink to ~/.local/bin to avoid
having to have that in $path as well.
---
 bin/Makefile        |  5 +++--
 home/.bin/sup       |  8 --------
 home/.bin/tup       |  7 -------
 home/.bin/up        | 12 ------------
 home/.local/bin/sup |  8 ++++++++
 home/.local/bin/tup |  7 +++++++
 home/.local/bin/up  | 12 ++++++++++++
 home/.zshrc         |  2 +-
 8 files changed, 31 insertions(+), 30 deletions(-)
 delete mode 100755 home/.bin/sup
 delete mode 100755 home/.bin/tup
 delete mode 100755 home/.bin/up
 create mode 100755 home/.local/bin/sup
 create mode 100755 home/.local/bin/tup
 create mode 100755 home/.local/bin/up

diff --git a/bin/Makefile b/bin/Makefile
index e7c2712a..bbcc8c4b 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -41,7 +41,8 @@ clean:
 	rm -f tags *.o gfx/*.o $(ALL_BINS)
 
 link:
-	ln -s -f $(ALL_BINS:%=$(PWD)/%) ~/.bin
+	mkdir -p ~/.local/bin
+	ln -s -f $(ALL_BINS:%=$(PWD)/%) ~/.local/bin
 
 unlink:
-	rm -f $(ALL_BINS:%=~/.bin/%)
+	rm -f $(ALL_BINS:%=~/.local/bin/%)
diff --git a/home/.bin/sup b/home/.bin/sup
deleted file mode 100755
index 22f2b85e..00000000
--- a/home/.bin/sup
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env zsh
-set -o errexit -o nounset -o pipefail
-
-dir=$(mktemp -d)
-screencapture -i "$dir/capture.png"
-pngo "$dir/capture.png"
-up "$dir/capture.png"
-rm -r "$dir"
diff --git a/home/.bin/tup b/home/.bin/tup
deleted file mode 100755
index 29af9b0a..00000000
--- a/home/.bin/tup
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env zsh
-set -o errexit -o nounset -o pipefail
-
-dir=$(mktemp -d)
-cat > "$dir/input.txt"
-up "$dir/input.txt"
-rm -r "$dir"
diff --git a/home/.bin/up b/home/.bin/up
deleted file mode 100755
index 43b1929b..00000000
--- a/home/.bin/up
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env zsh
-set -o errexit -o nounset -o pipefail
-
-ts=$(date +%s)
-rand=$(openssl rand -hex 4)
-ext=${1##*.}
-url=$(printf 'temp.causal.agency/%x%s.%s' "$ts" "$rand" "$ext")
-
-scp -q "$1" "temp.causal.agency:/usr/local/www/$url"
-
-echo "https://$url"
-type pbcopy > /dev/null && echo -n "https://$url" | pbcopy
diff --git a/home/.local/bin/sup b/home/.local/bin/sup
new file mode 100755
index 00000000..22f2b85e
--- /dev/null
+++ b/home/.local/bin/sup
@@ -0,0 +1,8 @@
+#!/usr/bin/env zsh
+set -o errexit -o nounset -o pipefail
+
+dir=$(mktemp -d)
+screencapture -i "$dir/capture.png"
+pngo "$dir/capture.png"
+up "$dir/capture.png"
+rm -r "$dir"
diff --git a/home/.local/bin/tup b/home/.local/bin/tup
new file mode 100755
index 00000000..29af9b0a
--- /dev/null
+++ b/home/.local/bin/tup
@@ -0,0 +1,7 @@
+#!/usr/bin/env zsh
+set -o errexit -o nounset -o pipefail
+
+dir=$(mktemp -d)
+cat > "$dir/input.txt"
+up "$dir/input.txt"
+rm -r "$dir"
diff --git a/home/.local/bin/up b/home/.local/bin/up
new file mode 100755
index 00000000..43b1929b
--- /dev/null
+++ b/home/.local/bin/up
@@ -0,0 +1,12 @@
+#!/usr/bin/env zsh
+set -o errexit -o nounset -o pipefail
+
+ts=$(date +%s)
+rand=$(openssl rand -hex 4)
+ext=${1##*.}
+url=$(printf 'temp.causal.agency/%x%s.%s' "$ts" "$rand" "$ext")
+
+scp -q "$1" "temp.causal.agency:/usr/local/www/$url"
+
+echo "https://$url"
+type pbcopy > /dev/null && echo -n "https://$url" | pbcopy
diff --git a/home/.zshrc b/home/.zshrc
index e0ddcf5e..3c1f51dc 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -10,7 +10,7 @@ bindkey -v
 KEYTIMEOUT=1
 
 OLDPATH=$PATH
-path=({,/usr/local,/usr}/{s,}bin ~/.bin ~/.cargo/bin)
+path=({,/usr/local,/usr,~/.local}/{s,}bin)
 
 export PAGER=less MANPAGER=less EDITOR=vim GIT_EDITOR=vim
 type nvim > /dev/null \
-- 
cgit 1.4.1