diff --git a/_src.all/private_dot_config/vim/_init b/_src.all/private_dot_config/vim/_init index ee86b35..f19db37 100644 --- a/_src.all/private_dot_config/vim/_init +++ b/_src.all/private_dot_config/vim/_init @@ -1,4 +1,3 @@ -set bg=dark " Set custom Vim config directory let s:vim_config_dir = '~/.config/vim' let s:autoload_dir = s:vim_config_dir . '/autoload' @@ -14,6 +13,7 @@ endif set runtimepath+=~/.config/vim execute 'source ' . s:plug_vim + " Initialize vim-plug call plug#begin('~/.config/vim/plugged') diff --git a/_src.posix/.chezmoiexternal.yaml.tmpl b/_src.posix/.chezmoiexternal.yaml.tmpl index 9861e9c..510cbc7 100644 --- a/_src.posix/.chezmoiexternal.yaml.tmpl +++ b/_src.posix/.chezmoiexternal.yaml.tmpl @@ -226,7 +226,7 @@ url: "https://raw.githubusercontent.com/rcaloras/bash-preexec/master/bash-preexec.sh" refreshPeriod: "{{ $defaultRefresh }}" -{{ if (and ( eq .chezmoi.os "linux" ) ( ne .chezmoi.osRelease.id "centos" )) -}} +{{ if eq .chezmoi.os "linux" -}} ".local/bin/nvim.AppImage": type: "file" url: "https://github.com/neovim/neovim/releases/download/stable/nvim-linux-x86_64.appimage" diff --git a/_src.posix/private_dot_local/bin/executable_load-zellij b/_src.posix/private_dot_local/bin/executable_load-zellij index 7b10c37..ef170cb 100644 --- a/_src.posix/private_dot_local/bin/executable_load-zellij +++ b/_src.posix/private_dot_local/bin/executable_load-zellij @@ -27,20 +27,13 @@ if is_sourced; then } refresh-zellij() { ${SET:-:} -x - local bin_path=~/.local/bin/zellij - local cached_path=~/.cache/chezmoi/tmp/zellij - if [ -z "$(env which zellij)" ] && [ -x "${cached_path}" ]; then - printf "Grabbing zellij from the web!\n" - cp "${cached_path}" "${bin_path}" - fi - local cached_path=/tmp/zellij/bootstrap/zellij - if [ -z "$(env which zellij)" ] && ! [ -x "${bin_path}" ]; then - if [[ ! -r "${cached_path}" ]]; then + if [ -z "$(env which zellij)" ] && ! [ -x ~/.local/bin/zellij ]; then + if [[ ! -r /tmp/zellij/bootstrap/zellij ]]; then printf "Grabbing zellij from the web!\n" bash <(curl -sL zellij.dev/launch) "--help" > /dev/null 2>&1 || true fi - if [[ -r "${cached_path}" ]]; then - mv "${cached_path}" "${bin_path}" + if [[ -r /tmp/zellij/bootstrap/zellij ]]; then + mv /tmp/zellij/bootstrap/zellij ~/.local/bin/zellij rm -fR /tmp/zellij fi fi