From 6ead87706d64ec63e8d5f239c83d3769de7efa0f Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Sat, 26 Oct 2019 00:02:26 -0400
Subject: [PATCH] fish: put per-computer configs in actual per-computer configs

---
 applications/fish                         | 32 +++++------------------
 computers/Alisons-Mac-mini.local/fish/env |  5 ++++
 computers/cain/fish/env                   |  1 +
 computers/cain/vconf                      |  1 +
 computers/netbsd/fish/env                 | 15 +++++++++++
 computers/rain/fish/env                   |  4 +++
 6 files changed, 32 insertions(+), 26 deletions(-)
 create mode 100644 computers/Alisons-Mac-mini.local/fish/env
 create mode 120000 computers/cain/fish/env
 create mode 120000 computers/cain/vconf
 create mode 100644 computers/netbsd/fish/env
 create mode 100644 computers/rain/fish/env

diff --git a/applications/fish b/applications/fish
index fd9c325..01cb32c 100644
--- a/applications/fish
+++ b/applications/fish
@@ -12,39 +12,14 @@ end
 # - _agw_dir_src = non-volatile source code storage
 switch (uname)
 	case Linux
-		set -gx CC clang
-		set -gx CXX clang++
-		set -gx GOPATH ~/go
-		set -gx RIPGREP_CONFIG_PATH ~/.config/ripgreprc
 		set -Ux _agw_dir_bin ~/bin
 		set -Ux _agw_dir_rc ~/rc
 		set -Ux _agw_dir_src ~/src
 	case Darwin
-		set -gx CMAKE_PREFIX_PATH /usr/local/opt/qt/
-		set -gx CPPFLAGS "-I/usr/local/opt/ruby/include"
-		set -gx DISTCC_HOSTS "192.168.1.2,cpp"
-		set -gx LDFLAGS "-L/usr/local/opt/ruby/lib"
-		set -gx fish_user_paths "/usr/local/opt/ruby/bin" $fish_user_paths
 		set -Ux _agw_dir_bin ~/Binaries
 		set -Ux _agw_dir_rc ~/Sources/scripts
 		set -Ux _agw_dir_src ~/Sources
 	case NetBSD
-		# Yes, these are *actually* needed.
-		set -gx CC cc
-		set -gx CXX c++
-		set -gx PATH $HOME/bin \
-		             /usr/pkg/gcc8/bin \
-		             /sbin \
-		             /usr/sbin \
-		             /bin \
-		             /usr/bin \
-		             /usr/pkg/sbin \
-		             /usr/pkg/bin \
-		             /usr/X11R7/bin \
-		             /usr/games \
-		             /usr/local/bin \
-		             /usr/local/sbin
-		set -gx PKG_PATH "http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/"(uname -p)"/"(uname -r|cut -f '1 2' -d.|cut -f 1 -d_)"/All"
 		set -Ux _agw_dir_bin ~/bin
 		set -Ux _agw_dir_rc ~/rc
 		set -Ux _agw_dir_src ~/src
@@ -52,6 +27,7 @@ switch (uname)
 		echo (set_color red)"This platform is not configured!"
 end
 
+# per-computer configs go here
 set -Ux _agw_dir_local $_agw_dir_rc/computers/(hostname)
 
 # execute scripts
@@ -59,7 +35,11 @@ if test -f ~/.cargo/env
 	source ~/.cargo/env
 end
 
-for f in (find $_agw_dir_rc/fish -type f)
+for f in (test -d $_agw_dir_local/fish &&
+          find $_agw_dir_local/fish -type f |
+          env LC_ALL=C sort) \
+         (find $_agw_dir_rc/fish -type f |
+          env LC_ALL=C sort)
 	source $f
 end
 
diff --git a/computers/Alisons-Mac-mini.local/fish/env b/computers/Alisons-Mac-mini.local/fish/env
new file mode 100644
index 0000000..15da926
--- /dev/null
+++ b/computers/Alisons-Mac-mini.local/fish/env
@@ -0,0 +1,5 @@
+set -gx CMAKE_PREFIX_PATH /usr/local/opt/qt/
+set -gx CPPFLAGS "-I/usr/local/opt/ruby/include"
+set -gx DISTCC_HOSTS "192.168.1.2,cpp"
+set -gx LDFLAGS "-L/usr/local/opt/ruby/lib"
+set -gx fish_user_paths "/usr/local/opt/ruby/bin" $fish_user_paths
diff --git a/computers/cain/fish/env b/computers/cain/fish/env
new file mode 120000
index 0000000..a5f5d72
--- /dev/null
+++ b/computers/cain/fish/env
@@ -0,0 +1 @@
+../../rain/fish/env
\ No newline at end of file
diff --git a/computers/cain/vconf b/computers/cain/vconf
new file mode 120000
index 0000000..5a46caf
--- /dev/null
+++ b/computers/cain/vconf
@@ -0,0 +1 @@
+../rain/vconf
\ No newline at end of file
diff --git a/computers/netbsd/fish/env b/computers/netbsd/fish/env
new file mode 100644
index 0000000..a2b6be0
--- /dev/null
+++ b/computers/netbsd/fish/env
@@ -0,0 +1,15 @@
+set -gx CC cc
+set -gx CXX c++
+set -gx PATH "$_agw_dir_bin" \
+             /usr/pkg/gcc8/bin \
+             /sbin \
+             /usr/sbin \
+             /bin \
+             /usr/bin \
+             /usr/pkg/sbin \
+             /usr/pkg/bin \
+             /usr/X11R7/bin \
+             /usr/games \
+             /usr/local/bin \
+             /usr/local/sbin
+set -gx PKG_PATH "http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/"(uname -p)"/"(uname -r|cut -f '1 2' -d.|cut -f 1 -d_)"/All"
diff --git a/computers/rain/fish/env b/computers/rain/fish/env
new file mode 100644
index 0000000..4e5d950
--- /dev/null
+++ b/computers/rain/fish/env
@@ -0,0 +1,4 @@
+set -gx CC clang
+set -gx CXX clang++
+set -gx GOPATH ~/go
+set -gx RIPGREP_CONFIG_PATH ~/.config/ripgreprc