From b4cbb2b42026cea1679f2581ef36c2a8b40a5c33 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:10:25 -0400 Subject: [PATCH] Pending changes exported from your codespace (#83) --- home/.chezmoiexternal.toml.tmpl | 6 ++++++ home/dot_zshrc | 24 ++++++------------------ software.yml | 9 --------- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/home/.chezmoiexternal.toml.tmpl b/home/.chezmoiexternal.toml.tmpl index aa9553c5..9adcaac8 100644 --- a/home/.chezmoiexternal.toml.tmpl +++ b/home/.chezmoiexternal.toml.tmpl @@ -150,6 +150,12 @@ refreshPeriod = "{{ $refreshPeriod }}" clone.args = ["--depth", "1"] pull.args = ["--ff-only"] +[".local/share/install.doctor"] + type = "git-repo" + url = "https://github.com/megabyte-labs/install.doctor.git" + refreshPeriod = "{{ $refreshPeriod }}" + clone.args = ["--depth", "1"] + pull.args = ["--ff-only"] #[".local/oh-my-bash"] # type = "git-repo" # url = "https://github.com/ohmybash/oh-my-bash.git" diff --git a/home/dot_zshrc b/home/dot_zshrc index 7a650843..7df1dd8a 100644 --- a/home/dot_zshrc +++ b/home/dot_zshrc @@ -451,14 +451,10 @@ if command -v hoard > /dev/null && [ -f "${XDG_DATA_HOME:-$HOME/.local/share}/ho fi ### iTerm2 -if [ -f "$HOME/.local/scripts/iterm2.zsh" ]; then - source "$HOME/.local/scripts/iterm2.zsh" -fi +[ -f "$HOME/.local/scripts/iterm2.zsh" ] && source "$HOME/.local/scripts/iterm2.zsh" ### Java (asdf) -if [ -f "$ASDF_DATA_DIR/plugins/java/set-java-home.zsh" ]; then - . "$ASDF_DATA_DIR/plugins/java/set-java-home.zsh" -fi +[ -f "$ASDF_DATA_DIR/plugins/java/set-java-home.zsh" ] && source "$ASDF_DATA_DIR/plugins/java/set-java-home.zsh" ### Mamba Forge (Faster Conda Drop-In Replacement) # TODO: Add support for Linux @@ -498,19 +494,13 @@ if [ -f /usr/local/bin/micromamba ]; then fi ### Navi (Ctrl+G) -if command -v navi > /dev/null; then - eval "$(navi widget zsh)" -fi +command -v navi > /dev/null && eval "$(navi widget zsh)" ### Fig -if [ -f "$HOME/.fig/shell/zshrc.post.zsh" ]; then - source "$HOME/.fig/shell/zshrc.post.zsh" -fi +[ -f "$HOME/.fig/shell/zshrc.post.zsh" ] && source "$HOME/.fig/shell/zshrc.post.zsh" ### Powerline -if [ -f "${XDG_CONFIG_HOME:-$HOME.config}/scripts/p10k.zsh" ]; then - source "$HOME/.local/scripts/p10k.zsh" -fi +[ -f "${XDG_CONFIG_HOME:-$HOME.config}/scripts/p10k.zsh" ] && source "$HOME/.local/scripts/p10k.zsh" ### SDKMan if command -v brew > /dev/null && command -v sdkman-cli > /dev/null; then @@ -525,9 +515,7 @@ fi [ -f "${XDG_DATA_HOME:-$HOME/.local/share}/up/up.sh" ] && source "${XDG_DATA_HOME:-$HOME/.local/share}/up/up.sh" ### HashiCorp Vault -if command -v vault > /dev/null; then - complete -o nospace -C vault vault -fi +command -v vault > /dev/null && complete -o nospace -C vault vault ### zoxide if command -v zoxide > /dev/null; then diff --git a/software.yml b/software.yml index 975f6f8a..9020c93e 100644 --- a/software.yml +++ b/software.yml @@ -921,15 +921,6 @@ softwarePackages: choco: lua dnf: lua pacman: lua - cloc: - _bin: cloc - _github: https://github.com/AlDanial/cloc - _name: Cloc - apt: cloc - brew: cloc - choco: cloc - dnf: cloc - pacman: cloc typescript-to-lua: _bin: tstl _github: https://github.com/TypeScriptToLua/TypeScriptToLua