diff --git a/tforgione.sh b/tforgione.sh index 15600ff..0cad3f2 100755 --- a/tforgione.sh +++ b/tforgione.sh @@ -51,6 +51,7 @@ yes_no_ask() { fi } +has_sudo=0 has_apt=0 has_pacman=0 should_install_git=0 @@ -109,8 +110,8 @@ ask_for_dotfiles() { } ask_for_neovim() { - if [ $sudo_available -eq 0 ]; then - warn_n "can't install neovim without sudo" + if [ $has_sudo -eq 0 ]; then + warn "can't install neovim without sudo" return fi @@ -140,8 +141,8 @@ ask_for_rust() { } ask_for_python() { - if [ $sudo_available -eq 0 ]; then - warn_n "can't install python without sudo" + if [ $has_sudo -eq 0 ]; then + warn "can't install python without sudo" return fi @@ -154,8 +155,8 @@ ask_for_python() { } ask_for_nodejs() { - if [ $sudo_available -eq 0 ]; then - warn_n "can't install node without sudo" + if [ $has_sudo -eq 0 ]; then + warn "can't install node without sudo" return fi @@ -171,12 +172,12 @@ ask_for_nodejs() { } ask_for_hyprland() { - if [ $sudo_available -eq 0 ]; then + if [ $has_sudo -eq 0 ]; then return fi if [ $has_pacman -ne 1 ]; then - warn_n "can't install hyprland on this OS" + warn "can't install hyprland on this OS" return fi @@ -262,6 +263,7 @@ run() { # Install some python plugins that work well with neovim if necessary if [ $should_install_neovim -eq 1 ]; then + python_packages+=(neovim) python_packages+=(pycodestyle) python_packages+=("python-lsp-server[all]") fi @@ -329,7 +331,7 @@ run() { export UPDATE_CHECK_TYPE=sliding $HOME/.config/dotfiles/bin/update postpone - if [ $sudo_available -eq 0 ]; then + if [ $has_sudo -eq 0 ]; then mkdir -p $HOME/.config/dotfiles/.data touch $HOME/.config/dotfiles/.data/noroot fi @@ -350,7 +352,8 @@ run() { # Create config files an directories mkdir -p $HOME/.nvim/backups $HOME/.nvim/swp $HOME/.nvim/undo rm -f $HOME/.config/nvim - ln -s $HOME/.config/dotfiles/nvim $HOME/.config/nvim + mkdir -p $HOME/.config/nvim + ln -s $HOME/.config/dotfiles/nvim.lua $HOME/.config/nvim/init.lua # Install vim plug curl -fLo $HOME/.local/share/nvim/site/autoload/plug.vim --create-dirs \ @@ -411,7 +414,9 @@ main() { info "before anything, i need to know if your user can use sudo" yes_no_ask "can your user use sudo?" - sudo_available=$? + if [ $? -eq 0 ]; then + has_sudo=1 + fi ask_for_dotfiles ask_for_neovim