From 3b16b3440e460382ade109bd89f26ce3548cd0f0 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger <tobias@msrg.cc> Date: Mon, 15 Jan 2024 16:06:59 +0100 Subject: [PATCH] Update autoinstall stuff --- .bin/.e | 2 +- .config/autoinstall.toml | 44 +++++++++++++++++++++++++++++++++++ .config/completionsrc | 27 +++++++-------------- .config/yadm/hooks/post_pull | 2 +- .config/zsh/.zshrc | 15 ++---------- .local/share/yadm/archive | Bin 2227 -> 2267 bytes 6 files changed, 57 insertions(+), 33 deletions(-) diff --git a/.bin/.e b/.bin/.e index 22e5611..036f325 100755 --- a/.bin/.e +++ b/.bin/.e @@ -5,7 +5,7 @@ declare -A mapper=( [".t"]="$HOME/.bin/.t" ["alacritty"]="$HOME/.config/alacritty/alacritty.toml" ["astronvim"]="$HOME/.config/astronvim/lua/user/init.lua" - ["autostart"]="$HOME/.bin/autostart-manage" + ["autoinstall.toml"]="$HOME/.config/autoinstall.toml" ["autostart.toml"]="$HOME/.config/autostart.toml" ["bash"]="$HOME/.bashrc" ["bspwm"]="$HOME/.config/bspwm/bspwmrc" diff --git a/.config/autoinstall.toml b/.config/autoinstall.toml index 33b0eeb..960b1eb 100644 --- a/.config/autoinstall.toml +++ b/.config/autoinstall.toml @@ -38,6 +38,48 @@ target = "eza" pipe = "tar xzO" group = "base" +[[autoinstall]] +type = "exe" +source = "https://git.serguzim.me/serguzim/tools/releases/download/latest/autostart-manage" +target = "autostart-manage" +group = "base" +completions = "completions" + +[[autoinstall]] +type = "exe" +source = "https://git.serguzim.me/serguzim/tools/releases/download/latest/autoinstall" +target = "autoinstall" +group = "base" +completions = "completions" + + + +[[autoinstall]] +type = "git" +source = "https://github.com/zsh-users/zsh-syntax-highlighting.git" +target = "${plugin_path:?}/zsh-syntax-highlighting" +group = "oh-my-zsh" + +[[autoinstall]] +type = "git" +source = "https://github.com/spwhitt/nix-zsh-completions.git" +target = "${plugin_path:?}/nix-zsh-completions" +group = "oh-my-zsh" + +[[autoinstall]] +type = "git" +source = "https://github.com/chisui/zsh-nix-shell.git" +target = "${plugin_path:?}/nix-shell" +group = "oh-my-zsh" + +[[autoinstall]] +type = "file" +source = "https://gist.githubusercontent.com/oshybystyi/475ee7768efc03727f21/raw/4bfd57ef277f5166f3070f11800548b95a501a19/git-auto-status.plugin.zsh" +target = "${plugin_path:?}/git-auto-status/git-auto-status.plugin.zsh" +group = "oh-my-zsh" + + + [[autoinstall]] type = "file" source = "https://raw.githubusercontent.com/dracula/alacritty/master/dracula.toml" @@ -76,6 +118,8 @@ target = "jetbrains-toolbox" pipe = "tar xzO" group = "graphical" + + [[autoinstall]] type = "text" source = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCkmWZmum4cVeDy5+9N1HdUzfnjEHSJ900ucD8F0wAy4MV1cdPYnZ4u5PFv5XMfmvA9SJ+VFsr0lhYlr+GQBG9aCCAdMJVVmEz3SccT6dp6ZYywT158RNshzfCe9ylWKK80+W7XnDXhdkec7aK+BQn5wOER3A3mUqRR0JDXWga9jyakH1K6OwXmQOO419bJWs2uCT1ZEgndHxKJEt2pEvoSz7z8p1SS2zyro+R3YtvL9WiDo3+0yPFYficNDr7s39yF5IJE+KTqAlCn5R2+kJ54lRmzB8oNS2jGwK2Q6wtph4AmfnlJTMODG2U2RjUltH2MIDXIYe2epATWL8qhkI4LTr38C7QR3DeJQsel/yTWdYqGakvU6Ge/xkbsaWOrSDTV3bPgKHzlL+dIKaGpV+5usZN4fpOLOb/nmYy3ekLpobzxza7rBRT2CxXS72DoPFaRE1ye7SxhcsLBNwre9YQFE4VvUZwJYkWz2V7eqGrk8VYnmQmT/bnUnMnVwMpeDc7pFKAFndIUxifoOj77c98Tdy3ncdS7SOd7+zRbLG+7k0UU1k89o1+tfREAddUJYR4RvB6g0kCyjpwOf1Pt4zhJR3y/zpsCCc5UnzK9X2kEo/8TSyvTr+GBiFVp5yLYgwCPJSNna33YX7+c3oLRM1QGgtqZk9qnGX9hgP8qpF8Akw== openpgp:0xAB920993" diff --git a/.config/completionsrc b/.config/completionsrc index 3f3e44e..20b380e 100644 --- a/.config/completionsrc +++ b/.config/completionsrc @@ -30,21 +30,12 @@ _dott_completions() } complete -F _dott_completions ".t" -#_autostart_manage_completions() -#{ -# if [ "${#COMP_WORDS[@]}" == "2" ]; then -# return -# fi -# -# COMPREPLY=() -# while IFS='' read -r line -# do -# COMPREPLY+=("$line") -# done < <(compgen -W "$(autostart-manage list)" "${COMP_WORDS[1]}") -#} -#complete -F _autostart_manage_completions "autostart-manage" - -for additional_completions in "$XDG_CONFIG_HOME/completionsrc.d/"*; do - # shellcheck disable=1090 - . "$additional_completions" -done +completions_dir="$XDG_CONFIG_HOME/completionsrc.d/" +if [ -n "$(ls "$completions_dir" 2>/dev/null)" ] +then + for additional_completions in "$completions_dir"* + do + # shellcheck disable=1090 + . "$additional_completions" + done +fi diff --git a/.config/yadm/hooks/post_pull b/.config/yadm/hooks/post_pull index 832a719..7c8972f 100755 --- a/.config/yadm/hooks/post_pull +++ b/.config/yadm/hooks/post_pull @@ -2,4 +2,4 @@ echo "Running post pull script..." -autoinstall base +autoinstall run base diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index f2c6bd7..07d9474 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -62,19 +62,8 @@ HIST_STAMPS="yyyy-mm-dd" # Would you like to use another custom folder than $ZSH/custom? ZSH_CUSTOM=$ZDOTDIR/custom -plugin_path="$ZSH_CUSTOM/plugins" -autoinstall git \ - "https://github.com/zsh-users/zsh-syntax-highlighting.git" \ - "$plugin_path/zsh-syntax-highlighting" -autoinstall git \ - "https://github.com/spwhitt/nix-zsh-completions.git" \ - "$plugin_path/nix-zsh-completions" -autoinstall git \ - "https://github.com/chisui/zsh-nix-shell.git" \ - "$plugin_path/nix-shell" -autoinstall file \ - "https://gist.githubusercontent.com/oshybystyi/475ee7768efc03727f21/raw/4bfd57ef277f5166f3070f11800548b95a501a19/git-auto-status.plugin.zsh" \ - "$plugin_path/git-auto-status/git-auto-status.plugin.zsh" +export plugin_path="$ZSH_CUSTOM/plugins" +autoinstall run oh-my-zsh # Which plugins would you like to load? diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive index 3be9f8f45d3dbd4b2690ec21f2bccc01c101ebc0..b545bad1203a5617c20a518b8d005b75ce688822 100644 GIT binary patch literal 2267 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 literal 2227 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 BSXBT3