diff --git a/deploy_dotfiles.sh b/deploy_dotfiles.sh index 2b512d4..ce7621f 100755 --- a/deploy_dotfiles.sh +++ b/deploy_dotfiles.sh @@ -32,54 +32,54 @@ if ! [ -x "$(command -v rg)" ]; then MISSING="${MISSING} ripgrep" fi -if ! [ -z "$MISSING" ]; then +if [ -n "$MISSING" ]; then echo "Installation de $MISSING" - sudo apt -y install $MISSING + sudo apt -y install "$MISSING" fi if ! [ -x "$HOME/.bin/starship" ]; then echo "Installation de starship" - mkdir -p $HOME/.bin + mkdir -p "$HOME/.bin" curl -sfL https://starship.rs/install.sh -o /tmp/install.sh chmod +x /tmp/install.sh - /tmp/install.sh -y -b $HOME/.bin + /tmp/install.sh -y -b "$HOME/.bin" rm /tmp/install.sh fi -if [ ! $SHELL = "/bin/zsh" ]; then - sudo usermod $USER -s /bin/zsh && echo "Nouveau shell: zsh" +if [ ! "$SHELL" = "/bin/zsh" ]; then + sudo usermod "$USER" -s /bin/zsh && echo "Nouveau shell: zsh" fi if ! [ -d "$HOME/.cache/antibody" ]; then echo "Installation d'antibody" curl -sfL git.io/antibody -o /tmp/antibody.sh chmod +x /tmp/antibody.sh - /tmp/antibody.sh -b $HOME/.bin + /tmp/antibody.sh -b "$HOME/.bin" rm /tmp/antibody.sh - mkdir -p $HOME/.cache/antibody + mkdir -p "$HOME/.cache/antibody" fi -if [ ! -x $HOME/.bin/chezmoi ]; then +if [ ! -x "$HOME/.bin/chezmoi" ]; then echo "Installation de chezmoi" - mkdir -p $HOME/.bin + mkdir -p "$HOME/.bin" curl -sfL https://git.io/chezmoi -o /tmp/chezmoi.sh chmod +x /tmp/chezmoi.sh - /tmp/chezmoi.sh -b $HOME/.bin -d + /tmp/chezmoi.sh -b "$HOME/.bin" -d rm /tmp/chezmoi.sh fi -if [ ! -d $HOME/.local/share/chezmoi/.git ]; then - mkdir -p $HOME/.vim/backup +if [ ! -d "$HOME/.local/share/chezmoi/.git" ]; then + mkdir -p "$HOME/.vim/backup" echo "Application des dotfiles …" - cd $HOME - $HOME/.bin/chezmoi init --apply --verbose https://git.sysnove.net/jrabier/dotfiles + cd "$HOME" || exit + "$HOME/.bin/chezmoi" init --apply --verbose https://git.sysnove.net/jrabier/dotfiles echo "Application des dotfiles terminée" else echo "Mise à jour de chezmoi" - $HOME/.bin/chezmoi upgrade + "$HOME/.bin/chezmoi" upgrade echo "Mise à jour des dotfiles" - $HOME/.bin/chezmoi update -v + "$HOME/.bin/chezmoi" update -v echo "Mise à jour des plugins ZSH" - $HOME/.bin/antibody update - mkdir -p $HOME/.vim/backup + "$HOME/.bin/antibody" update + mkdir -p "$HOME/.vim/backup" fi diff --git a/private_dot_config/nvim/init.vim.tmpl b/private_dot_config/nvim/init.vim.tmpl index 206309f..433f95f 100644 --- a/private_dot_config/nvim/init.vim.tmpl +++ b/private_dot_config/nvim/init.vim.tmpl @@ -177,6 +177,7 @@ call minpac#add('tpope/vim-dispatch') call minpac#add('paretje/deoplete-notmuch') call minpac#add('deoplete-plugins/deoplete-dictionary') call minpac#add('dpelle/vim-Grammalecte') +call minpac#add('itspriddle/vim-shellcheck') let g:grammalecte_cli_py='/home/taziden/prog/grammalecte/grammalecte-cli.py' let g:racer_experimental_completer = 1