Misc. updates

docs/scripts/after/run_onchange_after_61-plymouth-settings.sh.tmpl.md

@@ -7,6 +7,7 @@ githubLocation: https://github.com/megabyte-labs/install.doctor/blob/master/home
 scriptLocation: https://github.com/megabyte-labs/install.doctor/raw/master/home/.chezmoiscripts/universal/run_onchange_after_61-plymouth-settings.sh.tmpl
 repoLocation: home/.chezmoiscripts/universal/run_onchange_after_61-plymouth-settings.sh.tmpl
 ---
+
 # Plymouth Theme / Configuration
 
 Configures Plymouth to use a custom theme
@@ -15,8 +16,6 @@ Configures Plymouth to use a custom theme
 
 This script installs Plymouth and then configures it to use our custom Betelgeuse theme.
 
-
-
 ## Source Code
 
 ```
@@ -31,8 +30,8 @@ This script installs Plymouth and then configures it to use our custom Betelgeus
 {{ includeTemplate "universal/logg" }}
 
 ### Ensure Plymouth system packages are installed
-if command -v install-software > /dev/null; then
+if command -v install-program > /dev/null; then
-    install-software plymouth
+    install-program plymouth
 fi
 
 ### Create /etc/plymouth/plymouthd.conf

docs/scripts/after/run_onchange_after_94-bash-it.sh.tmpl.md

@@ -7,6 +7,7 @@ githubLocation: https://github.com/megabyte-labs/install.doctor/blob/master/home
 scriptLocation: https://github.com/megabyte-labs/install.doctor/raw/master/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl
 repoLocation: home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl
 ---
+
 # Bash It!
 
 Ensures Bash is configured to use Bash It!
@@ -16,8 +17,6 @@ Ensures Bash is configured to use Bash It!
 This script ensures Bash is configured to use Bash It! It ensures dependencies are installed, installs completions,
 and enables Bash It! plugins. The completions and plugins are hardcoded in this script.
 
-
-
 ## Source Code
 
 ```
@@ -34,7 +33,7 @@ and enables Bash It! plugins. The completions and plugins are hardcoded in this
 
 ### Ensure Powerline is installed
 if ! command -v powerline > /dev/null; then
-    install-software powerline
+    install-program powerline
 fi
 
 ### Bash-it completions / plugins

home/.chezmoidata.yaml

@@ -1512,9 +1512,9 @@ softwareGroups:
     - pkg: orbstack
       note: Faster / better alternative to Docker Desktop on macOS. Deprecated because it does not support Docker Extensions and is only for macOS.
     - pkg: pip
-      note: The `pip` installation is handled by the `install-software` program bundled with Install Doctor.
+      note: The `pip` installation is handled by the `install-program` program bundled with Install Doctor.
     - pkg: pipx
-      note: The `pipx` installation is handled by the `install-software` program bundled with Install Doctor.
+      note: The `pipx` installation is handled by the `install-program` program bundled with Install Doctor.
     - pkg: profilecreator
       note: macOS app that allows creating profiles. Crashes on macOS with enterprise managed settings due to read-only file access.
     - pkg: pyenv

home/.chezmoiscripts/universal/run_onchange_after_61-plymouth-settings.sh.tmpl

@@ -9,8 +9,8 @@
 {{ includeTemplate "universal/logg" }}
 
 ### Ensure Plymouth system packages are installed
-if command -v install-software > /dev/null; then
+if command -v install-program > /dev/null; then
-    install-software plymouth
+    install-program plymouth
 fi
 
 ### Create /etc/plymouth/plymouthd.conf

home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl

@@ -11,8 +11,8 @@
 
 ### Ensure Powerline is installed
 if ! command -v powerline > /dev/null; then
-    logg info 'Installing powerline via install-software'
+    logg info 'Installing powerline via install-program'
-    install-software powerline > /dev/null
+    install-program powerline > /dev/null
 fi
 
 ### Include Bash It

home/Library/LaunchDaemons/rclone.user.plist.tmpl

@@ -16,8 +16,8 @@
 	<key>RunAtLoad</key>
 	<true/>
     <key>StandardErrorPath</key>
-	<string>/Users/{{ .user.username }}/.local/share/rclone/error.log</string>
+	<string>/Users/{{ .user.username }}/.local/share/rclone/user-daemon.error.log</string>
 	<key>StandardOutPath</key>
-	<string>/Users/{{ .user.username }}/.local/share/rclone/debug.log</string>
+	<string>/Users/{{ .user.username }}/.local/share/rclone/user-daemon.debug.log</string>
 </dict>
 </plist>

home/dot_config/shell/exports.sh.tmpl

@@ -47,6 +47,7 @@ export PATH="$HOME/.local/bin/firejail:$PATH"
 export PATH="$HOME/.local/bin/flatpak:$PATH"
 export PATH="$HOME/.local/bin/gpt:$PATH"
 export PATH="$HOME/.local/bin/mackup:$PATH"
+export PATH="$HOME/.local/bin/pipx:$PATH"
 export SSH_KEY_PATH="$HOME/.ssh/id_rsa"
 
 ### Homebrew
@@ -330,6 +331,9 @@ export PARALLEL_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/parallel"
 ### Pass
 export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/pass"
 
+### PIPX
+export PIPX_BIN_DIR="$HOME/.local/bin/pipx"
+
 ### Poetry
 export POETRY_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/poetry"
 export PATH="$POETRY_HOME/bin:$PATH"

home/dot_local/bin/executable_install-program

@@ -94,8 +94,8 @@ function runCommand(spinnerTitle, command) {
   execSync(command, {
     stdio: 'inherit',
     shell: true,
-    // Timeout of 30m
+    // Timeout of 140m
-    timeout: 1000 * 60 * 30
+    timeout: 1000 * 60 * 140
   })
 }
 

home/dot_local/bin/pipx/README.md

@@ -0,0 +1,3 @@
+# PIPX Bin Directory
+
+This folder contains the executable files that accompany packages that were installed by PIPX. This directory is configured to work with PIPX via the `PIPX_BIN_DIR` variable defined in `~/.config/shell/exports.sh`.

home/dot_local/bin/symlink_install-software.tmpl

@@ -1,3 +0,0 @@
-{{- if true -}}
-{{ .host.home }}/.local/bin/install-program
-{{- end -}}

software.yml

@@ -3348,6 +3348,7 @@ softwarePackages:
     _bin: xpra
     _github: https://github.com/Xpra-org/xpra
     _name: xpra
+    _when:cask: '! test -d "/Applications/Xpra.app" && ! test -d "$HOME/Applications/Xpra.app"'
     cask: xpra
     choco: xpra
     exe: https://xpra.org/dists/windows/Xpra-x86_64_Setup.exe