From 20161308fff66c77373da8fee465528fc2c0291d Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Mon, 5 Jun 2023 03:26:37 +0000 Subject: [PATCH] Latest --- home/.chezmoiexternal.toml.tmpl | 8 ++++ ...nchange_after_26-vscode-extensions.sh.tmpl | 4 +- ...ge_after_41-vagrant-vmware-utility.sh.tmpl | 2 +- .../private_com.cloudflare.warp.plist.tmpl | 4 +- home/dot_bashrc | 4 ++ home/dot_config/task/Taskfile.yml | 37 +++++++++++++++++++ home/dot_local/bin/executable_install-program | 13 ++++--- .../share/firefox/defaults/pref/autoconfig.js | 5 ++- 8 files changed, 64 insertions(+), 13 deletions(-) diff --git a/home/.chezmoiexternal.toml.tmpl b/home/.chezmoiexternal.toml.tmpl index a52bde82..5b9c6ba7 100644 --- a/home/.chezmoiexternal.toml.tmpl +++ b/home/.chezmoiexternal.toml.tmpl @@ -173,6 +173,14 @@ url = "https://github.com/rundeck-plugins/ansible-plugin/releases/download/v3.2.2/ansible-plugin-3.2.2.jar" refreshPeriod = "{{ $refreshPeriod }}" +### Chef Bento +[".local/src/bento"] + type = "git-repo" + url = "https://github.com/installdoc/bento.git" + refreshPeriod = "{{ $refreshPeriod }}" + clone.args = ["--depth", "1"] + pull.args = ["--ff-only"] + ### Git Fuzzy [".local/src/git-fuzzy"] type = "git-repo" diff --git a/home/.chezmoiscripts/universal/run_onchange_after_26-vscode-extensions.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_26-vscode-extensions.sh.tmpl index fc026f7b..3ec3af36 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_26-vscode-extensions.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_26-vscode-extensions.sh.tmpl @@ -50,7 +50,7 @@ if command -v code > /dev/null; then fi done else - logg warn '`code` executable not available' + logg info '`code` executable not available - skipping plugin install process for it' fi # @description Check for the presence of the `codium` command in the `PATH` and install extensions for VSCodium if it is present @@ -66,7 +66,7 @@ if command -v codium > /dev/null; then fi done else - logg warn '`codium` executable not available' + logg info '`codium` executable not available - skipping plugin install process for it' fi {{ end -}} diff --git a/home/.chezmoiscripts/universal/run_onchange_after_41-vagrant-vmware-utility.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_41-vagrant-vmware-utility.sh.tmpl index fe3cfee4..22bcd0a1 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_41-vagrant-vmware-utility.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_41-vagrant-vmware-utility.sh.tmpl @@ -20,7 +20,7 @@ {{ includeTemplate "universal/logg" }} # @description Only run logic if both Vagrant and VMWare are installed -if command -v vagrant > /dev/null && command -v vmware > /dev/null; then +if command -v vagrant > /dev/null && command -v vmware-id > /dev/null; then # @description Vagrant VMWare Utility configuration if command -v vagrant-vmware-utility > /dev/null; then if [ -f /usr/local/bin/certificates/vagrant-utility.key ]; then diff --git a/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl b/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl index 0ffbfa8a..461a2b69 100644 --- a/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl +++ b/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl @@ -15,8 +15,8 @@ support_url https://megabyte.space auth_client_id - {{- if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_ID")) -}}{{- includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_ID" | decrypt -}}{{- else -}}{{- env "CLOUDFLARE_TEAMS_CLIENT_ID" -}}{{- end -}} + {{- if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_ID")) -}}{{- includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_ID" | decrypt | trim -}}{{- else -}}{{- env "CLOUDFLARE_TEAMS_CLIENT_ID" -}}{{- end -}} auth_client_secret - {{- if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_SECRET")) -}}{{- includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_SECRET" | decrypt -}}{{- else -}}{{- env "CLOUDFLARE_TEAMS_CLIENT_SECRET" -}}{{- end -}} + {{- if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_SECRET")) -}}{{- includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_SECRET" | decrypt | trim -}}{{- else -}}{{- env "CLOUDFLARE_TEAMS_CLIENT_SECRET" -}}{{- end -}} diff --git a/home/dot_bashrc b/home/dot_bashrc index 31bd0127..220f6fec 100644 --- a/home/dot_bashrc +++ b/home/dot_bashrc @@ -32,6 +32,10 @@ fi ### History export HISTFILE="$XDG_STATE_HOME/bash/history" +if [ -d "$HISTFILE" ]; then + # Remove history file if it is incorrectly created as a directory + rm -rf "$HISTFILE" +fi ### /etc/bashrc if [ -f /etc/bashrc ]; then diff --git a/home/dot_config/task/Taskfile.yml b/home/dot_config/task/Taskfile.yml index cbbc72ed..5bb405da 100644 --- a/home/dot_config/task/Taskfile.yml +++ b/home/dot_config/task/Taskfile.yml @@ -39,6 +39,43 @@ tasks: echo "> Copying Password" ### Copy the password to the clipboard printf '%s' "$(echo "$selected" | jq -r '.login.password')" | $COPY + + build:packer: + desc: Builds Packer boxes using all supported virtualization platform / operating system combinations + summary: | + # {{ .AppName}} Packer Build + + This command will use Packer to build all the supported virtualization platform / operating system + combinations. This command can be used to test {{ .AppName }} on all the various systems that are + supported. + + ## Supported Virtualization Platforms + + * KVM + * Hyper-V + * VirtualBox + * Parallels + * VMWare + + ## Supported Operating Systems + + * Archlinux + * CentOS + * Debian + * Fedora + * macOS + * Ubuntu + * Windows + + ## Qubes Support + + Qubes can leverage the assets generated from the VirtualBox builds to power HVMs. + cmds: + - | + cd "$HOME/.local/src/bento" + packer init -upgrade ./packer_templates + logg info 'Building Ubuntu VirtualBox VMs' + packer build -var-file=os_pkrvars/ubuntu/ubuntu-22.04-x86_64.pkrvars.hcl ./packer_templates brave:profile:backup: desc: Backs up the user's {{ .AppName }} profile to the user's S3-backed Restic repository diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program index 1c7573b0..d76399e4 100644 --- a/home/dot_local/bin/executable_install-program +++ b/home/dot_local/bin/executable_install-program @@ -1810,12 +1810,13 @@ async function installSoftware(pkgsToInstall) { binLinkRan = true log('info', 'Bin', 'Linking bin aliases to their installed packages') await linkBin(installOrdersBinLink) - for (const script of installOrdersPost) { - try { - await $` ${script}` - } catch(e) { - log('info', 'Post-Install Hook', 'Encountered error while running post-install hook') - } + } + for (const script of installOrdersPost) { + try { + log('info', 'Post Hook', script) + runCommand('Running post-install hook', script) + } catch(e) { + log('info', 'Post-Install Hook', 'Encountered error while running post-install hook') } } installOrdersPlugins.length && log('info', 'Plugin', 'Installing package-specific plugins') diff --git a/home/dot_local/share/firefox/defaults/pref/autoconfig.js b/home/dot_local/share/firefox/defaults/pref/autoconfig.js index 7faae9c8..3ace8ddd 100644 --- a/home/dot_local/share/firefox/defaults/pref/autoconfig.js +++ b/home/dot_local/share/firefox/defaults/pref/autoconfig.js @@ -1,2 +1,3 @@ -pref('general.config.filename', 'firefox.cfg') -pref('general.config.obscure_value', 0) +// IMPORTANT: Start your code on the 2nd line (this line was copied from firefox.cfg in parent directory) +pref('general.config.filename', 'firefox.cfg'); +pref('general.config.obscure_value', 0); \ No newline at end of file