diff --git a/home/.chezmoiexternal.toml b/home/.chezmoiexternal.toml index a4a741e..b220b89 100644 --- a/home/.chezmoiexternal.toml +++ b/home/.chezmoiexternal.toml @@ -1,7 +1,6 @@ -[".zim/zimfw.zsh"] - type = "file" - url = "https://github.com/zimfw/zimfw/releases/latest/download/zimfw.zsh" - exact = true +[".asdf"] + type = "git-repo" + url = "https://github.com/asdf-vm/asdf.git" refreshPeriod = "168h" [".config/ranger/plugins/ranger_udisk_menu"] @@ -39,4 +38,11 @@ url = "https://github.com/tmux-plugins/tpm.git" refreshPeriod = "168h" +[".zim/zimfw.zsh"] + type = "file" + url = "https://github.com/zimfw/zimfw/releases/latest/download/zimfw.zsh" + exact = true + refreshPeriod = "168h" + + diff --git a/home/.chezmoiscripts/run_onchange_after_10-install-packages.sh.tmpl b/home/.chezmoiscripts/run_onchange_after_10-install-packages.sh.tmpl index 618dc28..80664ec 100644 --- a/home/.chezmoiscripts/run_onchange_after_10-install-packages.sh.tmpl +++ b/home/.chezmoiscripts/run_onchange_after_10-install-packages.sh.tmpl @@ -76,7 +76,7 @@ packages=( echo "deb [arch=all,$(dpkg --print-architecture) signed-by=/usr/share/keyrings/prebuilt-mpr-archive-keyring.gpg] https://proget.makedeb.org prebuilt-mpr $(lsb_release -cs)" | sudo tee /etc/apt/sources.list.d/prebuilt-mpr.list sudo -E apt update -qq sudo -E apt upgrade --yes -qq - sudo -E apt-get install --yes --no-install-recommends --ignore-missing -qq mist + sudo -E apt-get install --yes --no-install-recommends --ignore-missing --fix-broken -qq mist {{- else }} apt-get install --yes --no-install-recommends --ignore-missing -qq lsb-release gpg curl -fsSL 'https://proget.makedeb.org/debian-feeds/makedeb.pub' | gpg --dearmor | tee /usr/share/keyrings/makedeb-archive-keyring.gpg 1> /dev/null @@ -85,32 +85,32 @@ packages=( echo "deb [arch=all,$(dpkg --print-architecture) signed-by=/usr/share/keyrings/prebuilt-mpr-archive-keyring.gpg] https://proget.makedeb.org prebuilt-mpr $(lsb_release -cs)" | tee /etc/apt/sources.list.d/prebuilt-mpr.list apt update -qq apt upgrade --yes -qq - apt-get install --yes --no-install-recommends --ignore-missing -qq mist + apt-get install --yes --no-install-recommends --ignore-missing --fix-broken -qq mist {{- end}} mist update ## Install packages packages=(${packages[@]//starship/makedeb}) - packages+=( - apt-utils - autoconf - automake - cmake - doxygen - libtool - libtool-bin - ninja-build - pkg-config - ) + ## packages+=( + ## apt-utils + ## autoconf + ## automake + ## cmake + ## doxygen + ## libtool + ## libtool-bin + ## ninja-build + ## pkg-config + ## ) for package in ${packages[@]}; do inf "installing ${package}..." {{- if ne .chezmoi.username "root" }} - sudo -E apt-get install --yes --no-install-recommends --ignore-missing -qq $package + sudo -E apt-get install --yes --no-install-recommends --ignore-missing --fix-broken -qq $package {{- else }} - apt-get install --yes --no-install-recommends --ignore-missing -qq $package + apt-get install --yes --no-install-recommends --ignore-missing --fix-broken -qq $package {{- end }} done diff --git a/home/.chezmoiscripts/run_onchange_after_20-install-shell.sh.tmpl b/home/.chezmoiscripts/run_onchange_after_20-install-shell.sh.tmpl index 24dc56d..ab8d69b 100644 --- a/home/.chezmoiscripts/run_onchange_after_20-install-shell.sh.tmpl +++ b/home/.chezmoiscripts/run_onchange_after_20-install-shell.sh.tmpl @@ -59,9 +59,9 @@ log "Begin Zsh installation" inf "installing ${package}..." {{- if ne .chezmoi.username "root" }} - sudo -E apt-get install --yes --no-install-recommends --ignore-missing -qq $package + sudo -E apt-get install --yes --no-install-recommends --ignore-missing --fix-broken -qq $package {{- else }} - apt-get install --yes --no-install-recommends --ignore-missing -qq $package + apt-get install --yes --no-install-recommends --ignore-missing --fix-broken -qq $package {{- end }} done diff --git a/home/.chezmoiscripts/run_onchange_after_80-install-nvim.sh.tmpl b/home/.chezmoiscripts/run_onchange_after_80-install-nvim.sh.tmpl index 77b2c6c..862bda6 100644 --- a/home/.chezmoiscripts/run_onchange_after_80-install-nvim.sh.tmpl +++ b/home/.chezmoiscripts/run_onchange_after_80-install-nvim.sh.tmpl @@ -64,9 +64,9 @@ log "Begin LVim installation" inf "installing ${package}..." {{- if ne .chezmoi.username "root" }} - sudo -E apt-get install --yes --no-install-recommends --ignore-missing -qq $package + sudo -E apt-get install --yes --no-install-recommends --ignore-missing --fix-broken -qq $package {{- else }} - apt-get install --yes --no-install-recommends --ignore-missing -qq $package + apt-get install --yes --no-install-recommends --ignore-missing --fix-broken -qq $package {{- end }} done diff --git a/home/dot_zimrc b/home/dot_zimrc index 98f1fef..a715684 100644 --- a/home/dot_zimrc +++ b/home/dot_zimrc @@ -24,6 +24,10 @@ zmodule zsh-users/zsh-autosuggestions # Productivity # +# Sets up asdf, with auto install and optimized usage of the direnv plugin. +zmodul asdf +# chezmoi +joke/zim-chezmoi # Provides handy git aliases and functions. zmodule git # Sets a custom terminal title. @@ -34,6 +38,8 @@ zmodule archive zmodule manjaro # Personal aliases zmodule jl-helper +# starship +joke/zim-starship # sudo module zmodule sudo # Utility aliases and functions. Adds colour to ls, grep and less.