panacea: use common file for common settings

5 files changed, 25 insertions, 18 deletions

diff --git a/device/panacea_nebula_post b/device/panacea_nebula_post
new file mode 100644
index 0000000..059da9b
--- /dev/null
+++ b/device/panacea_nebula_post
@@ -0,0 +1,6 @@
+#!/bin/zsh
+
+# Portable Panacea (~nebula)
+# See panacea_nebula_pre for info.
+
+source "$(realpath "$0" | xargs dirname)/panacea_post"
diff --git a/device/panacea_nebula_pre b/device/panacea_nebula_pre
new file mode 100644
index 0000000..17803d1
--- /dev/null
+++ b/device/panacea_nebula_pre
@@ -0,0 +1,15 @@
+#!/bin/zsh
+
+# Portable Panacea (~nebula)
+# panacea.local
+#
+# This is a MacBook Pro 14,10 (M2 Pro, 2023).
+# Acquired in 2023.
+#
+# This is our primary portable development device. It's used
+# for a large portion of our overall programming, even at home.
+# These settings apply to our shared personal user account,
+# ~nebula, which is kept logged into basically everything we
+# use online (including Apple ID).
+
+source "$(realpath "$0" | xargs dirname)/panacea_pre"
diff --git a/device/panacea_portedly_pre b/device/panacea_portedly_pre
index 25000fe..dcbccf5 100755
--- a/device/panacea_portedly_pre
+++ b/device/panacea_portedly_pre
@@ -12,16 +12,7 @@
 # which is kept separate from our personal one (~nebula) and
 # is not logged into Apple ID, etc.
 
-export DEVICE_HAS_GPG
+source "$(realpath "$0" | xargs dirname)/panacea_pre"
 
 export DEVICE_HAS_HOMEBREW
 export DEVICE_HOMEBREW_INSTALLATION="$HOME/brew"
-
-export DEVICE_HAS_NVM
-export DEVICE_NVM_INSTALLATION="$HOME/.nvm"
-
-# export DEVICE_HAS_PYENV
-# export DEVICE_PYENV_CONFIGURATION=""
-
-export DEVICE_HAS_SUBLIME_TEXT
-export DEVICE_SUBLIME_TEXT_INSTALLATION="/Applications/Sublime Text.app"
diff --git a/device/panacea_post b/device/panacea_post
index 943e80e..d280fd4 100644
--- a/device/panacea_post
+++ b/device/panacea_post
@@ -1,4 +1,4 @@
 #!/bin/zsh
 
-# Portable Panacea (~nebula)
+# Portable Panacea
 # See panacea_pre for info.
diff --git a/device/panacea_pre b/device/panacea_pre
index 7f6959b..45bd702 100644
--- a/device/panacea_pre
+++ b/device/panacea_pre
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Portable Panacea (~nebula)
+# Portable Panacea
 # panacea.local
 #
 # This is a MacBook Pro 14,10 (M2 Pro, 2023).
@@ -8,9 +8,7 @@
 #
 # This is our primary portable development device. It's used
 # for a large portion of our overall programming, even at home.
-# These settings apply to our shared personal user account,
-# ~nebula, which is kept logged into basically everything we
-# use online (including Apple ID).
+# These settings are common across accounts on this device.
 
 export DEVICE_HAS_GPG
 
@@ -20,8 +18,5 @@ export DEVICE_HOMEBREW_INSTALLATION="/opt/homebrew"
 export DEVICE_HAS_NVM
 export DEVICE_NVM_INSTALLATION="$HOME/.nvm"
 
-# export DEVICE_HAS_PYENV
-# export DEVICE_PYENV_CONFIGURATION=""
-
 export DEVICE_HAS_SUBLIME_TEXT
 export DEVICE_SUBLIME_TEXT_INSTALLATION="/Applications/Sublime Text.app"