From 495a8babd2efc182d31dac7a46ca08276d4cd248 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:58:51 -0400 Subject: [PATCH] Misc. updates --- .../run_onchange_after_61-plymouth-settings.sh.tmpl.md | 7 +++---- .../scripts/after/run_onchange_after_94-bash-it.sh.tmpl.md | 5 ++--- home/.chezmoidata.yaml | 4 ++-- .../run_onchange_after_61-plymouth-settings.sh.tmpl | 4 ++-- .../universal/run_onchange_after_94-bash-it.sh.tmpl | 4 ++-- home/Library/LaunchDaemons/rclone.user.plist.tmpl | 4 ++-- home/dot_config/shell/exports.sh.tmpl | 4 ++++ home/dot_local/bin/executable_install-program | 4 ++-- home/dot_local/bin/pipx/README.md | 3 +++ home/dot_local/bin/symlink_install-software.tmpl | 3 --- software.yml | 1 + 11 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 home/dot_local/bin/pipx/README.md delete mode 100644 home/dot_local/bin/symlink_install-software.tmpl diff --git a/docs/scripts/after/run_onchange_after_61-plymouth-settings.sh.tmpl.md b/docs/scripts/after/run_onchange_after_61-plymouth-settings.sh.tmpl.md index b9049091..68ab7903 100644 --- a/docs/scripts/after/run_onchange_after_61-plymouth-settings.sh.tmpl.md +++ b/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 - install-software plymouth +if command -v install-program > /dev/null; then + install-program plymouth fi ### Create /etc/plymouth/plymouthd.conf diff --git a/docs/scripts/after/run_onchange_after_94-bash-it.sh.tmpl.md b/docs/scripts/after/run_onchange_after_94-bash-it.sh.tmpl.md index e401c4b6..afb23089 100644 --- a/docs/scripts/after/run_onchange_after_94-bash-it.sh.tmpl.md +++ b/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 diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml index 8d66b6b1..e4ddde05 100644 --- a/home/.chezmoidata.yaml +++ b/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 diff --git a/home/.chezmoiscripts/universal/run_onchange_after_61-plymouth-settings.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_61-plymouth-settings.sh.tmpl index 06f17f47..f6c8ed6b 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_61-plymouth-settings.sh.tmpl +++ b/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 - install-software plymouth +if command -v install-program > /dev/null; then + install-program plymouth fi ### Create /etc/plymouth/plymouthd.conf diff --git a/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl index be5ad6e8..7bbd9ecc 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl +++ b/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' - install-software powerline > /dev/null + logg info 'Installing powerline via install-program' + install-program powerline > /dev/null fi ### Include Bash It diff --git a/home/Library/LaunchDaemons/rclone.user.plist.tmpl b/home/Library/LaunchDaemons/rclone.user.plist.tmpl index 130751ad..7b6bbad1 100644 --- a/home/Library/LaunchDaemons/rclone.user.plist.tmpl +++ b/home/Library/LaunchDaemons/rclone.user.plist.tmpl @@ -16,8 +16,8 @@ RunAtLoad StandardErrorPath - /Users/{{ .user.username }}/.local/share/rclone/error.log + /Users/{{ .user.username }}/.local/share/rclone/user-daemon.error.log StandardOutPath - /Users/{{ .user.username }}/.local/share/rclone/debug.log + /Users/{{ .user.username }}/.local/share/rclone/user-daemon.debug.log \ No newline at end of file diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl index 20ef5dfc..ddf79e7c 100644 --- a/home/dot_config/shell/exports.sh.tmpl +++ b/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" diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program index 1f064bb5..21d977bf 100644 --- a/home/dot_local/bin/executable_install-program +++ b/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: 1000 * 60 * 30 + // Timeout of 140m + timeout: 1000 * 60 * 140 }) } diff --git a/home/dot_local/bin/pipx/README.md b/home/dot_local/bin/pipx/README.md new file mode 100644 index 00000000..3f5fc856 --- /dev/null +++ b/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`. diff --git a/home/dot_local/bin/symlink_install-software.tmpl b/home/dot_local/bin/symlink_install-software.tmpl deleted file mode 100644 index 082bd865..00000000 --- a/home/dot_local/bin/symlink_install-software.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -{{- if true -}} -{{ .host.home }}/.local/bin/install-program -{{- end -}} diff --git a/software.yml b/software.yml index c5dcd83a..b75cd65a 100644 --- a/software.yml +++ b/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