Fix multi-user setup

Author: rsnk96

1-BasicSetUp.sh

@@ -57,29 +57,41 @@ sudo sed -i '/zsh/d' /etc/shells 2>/dev/null || true
 
 spatialPrint "Setting up Zsh + Zim now"
 execute sudo apt-get install zsh -y
-sudo mkdir -p /opt/.zsh/ && sudo chmod ugo+w /opt/.zsh/
+sudo mkdir -p /opt/.zsh/ && sudo chmod a+rw -R /opt/.zsh/
 export ZIM_HOME=/opt/.zsh/zim
+export ZIM_CONFIG_FILE=/opt/.zsh/zim/zimrc
 curl -fsSL https://raw.githubusercontent.com/zimfw/install/master/install.zsh | zsh
 # Change default shell to zsh
-command -v zsh | sudo tee -a /etc/shells
 sudo chsh -s "$(command -v zsh)" "${USER}"
 sudo useradd -D -s /bin/zsh
 
+
+# Append 'zmodule steeef' to the zimrc configuration file
+echo "zmodule steeef" | sudo tee -a /opt/.zsh/zim/zimrc >/dev/null
+sudo chmod -R a+rw /opt/.zsh/
+
 execute sudo apt-get install aria2 -y
 
 # Create bash aliases
 cp ./config_files/bash_aliases /opt/.zsh/bash_aliases >/dev/null  # Suppress error messages in case the file already exists
 rm -f ~/.bash_aliases
 ln -s /opt/.zsh/bash_aliases ~/.bash_aliases
 
+# Set ZIM_CONFIG_FILE at the start of ~/.zshrc, then append existing content, then the rest
+tmp_zshrc="$(mktemp)"
+echo "ZIM_CONFIG_FILE=/opt/.zsh/zim/zimrc" > "$tmp_zshrc"
+cat ~/.zshrc >> "$tmp_zshrc"
 {
+    echo ""
+    echo ""
     echo "if [ -f ~/.bash_aliases ]; then"
     echo "  source ~/.bash_aliases"
     echo "fi"
-
+    echo ""
     echo "# Switching to 256-bit colour by default so that zsh-autosuggestion's suggestions are not suggested in white, but in grey instead"
     echo "export TERM=xterm-256color"
-} >> ~/.zshrc
+} >> "$tmp_zshrc"
+mv "$tmp_zshrc" ~/.zshrc
 
 # Now create shortcuts
 execute sudo apt-get install run-one xbindkeys wmctrl xdotool -y
@@ -178,33 +190,50 @@ fi
 
 
 ## Install zellij
-wget https://github.com/zellij-org/zellij/releases/download/v0.43.1/zellij-x86_64-unknown-linux-musl.tar.gz
-tar -xvf zellij-x86_64-unknown-linux-musl.tar.gz
-chmod +x zellij
-sudo mv zellij /usr/local/bin/
-rm -rf ./zellij*
+if [ -x "$(command -v zellij)" ]; then
+    echo "Zellij already installed, skipping it"
+else
+    wget https://github.com/zellij-org/zellij/releases/download/v0.43.1/zellij-x86_64-unknown-linux-musl.tar.gz
+    tar -xvf zellij-x86_64-unknown-linux-musl.tar.gz
+    chmod +x zellij
+    sudo mv zellij /usr/local/bin/
+    rm -rf ./zellij*
+fi
 
 ## Install Neovim with all essential lazyvim plugins
-
-curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
-sudo apt install -y build-essential "lua5.1" luarocks ripgrep fd-find fzf nodejs
-mkdir -p ~/.local/bin
-ln -s $(which fdfind) ~/.local/bin/fd
-rm -rf ~/.local/share/nvim/
-rm -rf ~/.config/nvim/
+if [ -x "$(command -v nvim)" ] && [ -d ~/.config/nvim ]; then
+    echo "Neovim and LazyVim already installed, skipping installation"
+else
+    curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+    sudo apt install -y nodejs
+    sudo apt install -y build-essential "lua5.1" luarocks ripgrep fd-find fzf
+    
+    mkdir -p ~/.local/bin
+    if [ ! -L ~/.local/bin/fd ]; then
+        ln -s $(which fdfind) ~/.local/bin/fd
+    fi
+    
+    rm -rf ~/.local/share/nvim/
+    rm -rf ~/.config/nvim/
+        
+    sudo add-apt-repository ppa:neovim-ppa/unstable -y
+    sudo apt update
+    sudo apt install -y neovim
+    
+    git clone https://github.com/LazyVim/starter ~/.config/nvim
+    rm -rf ~/.config/nvim/.git
+fi
 
 ## Install nerd fonts
-sudo mkdir -p /usr/local/share/fonts
-wget -O /tmp/VictorMono.zip \
-  https://github.com/ryanoasis/nerd-fonts/releases/latest/download/VictorMono.zip
-sudo unzip /tmp/VictorMono.zip -d /usr/local/share/fonts/VictorMono
-sudo fc-cache -fv
-
-sudo add-apt-repository ppa:neovim-ppa/unstable -y
-sudo apt update
-sudo apt install -y neovim
-git clone https://github.com/LazyVim/starter ~/.config/nvim
-rm -rf ~/.config/nvim/.git
+if [ -d /usr/local/share/fonts/VictorMono ]; then
+    echo "Nerd fonts (VictorMono) already installed, skipping installation"
+else
+    sudo mkdir -p /usr/local/share/fonts
+    wget -O /tmp/VictorMono.zip \
+      https://github.com/ryanoasis/nerd-fonts/releases/latest/download/VictorMono.zip
+    sudo unzip /tmp/VictorMono.zip -d /usr/local/share/fonts/VictorMono
+    sudo fc-cache -fv
+fi
 
 
 # Force GDM to use Xorg (X11) instead of Wayland (skip in CI - no display manager)

README.md

@@ -39,23 +39,7 @@ Then execute them in the terminal in the sequence of filenames using `./1-BasicS
 <br>
 
 ## Notes
-* If you are using this script to set up a computer with many users,
-    * You need to run these scripts using **only one** user, say `first_user`. But make sure you have **logged in at least once** into the new user so that the home directory of the other user is instantiated.
-    * We need to copy the configuration files to the new user, say `new_user`. From `first_user`'s account, run the following after entering the username of the `new_user` in the second line of this snippet
-        ```bash
-        cd ~
-        export NEW_USER=<username_of_new_user>
-        sudo cp /opt/.zsh/bash_aliases /home/$NEW_USER/.bash_aliases
-        sudo cp -r ~/.zim/ /home/$NEW_USER/.zim
-        sudo cp ~/.zimrc /home/$NEW_USER/.zimrc
-        sudo cp ~/.zlogin /home/$NEW_USER/.zlogin
-        sudo cp ~/.zshrc /home/$NEW_USER/.zshrc
-        sudo cp ~/.zshenv /home/$NEW_USER/.zshenv
-
-        sudo cp ~/.xbindkeysrc /home/$NEW_USER
-        
-        sudo chown -R $NEW_USER: /home/$NEW_USER/.zim /home/$NEW_USER/.bash_aliases /home/$NEW_USER/.zimrc /home/$NEW_USER/.zlogin /home/$NEW_USER/.zshrc /home/$NEW_USER/.xbindkeysrc /home/$NEW_USER/.config/tilda /home/$NEW_USER/.tmux.conf*
-        ```
+* **Adding a new OS user:** If setting up multiple users on the OS, try to use the script `./add_new_user.sh` in this repo. It will set the correct settings for them to also benefit from zsh, conda, etc.
 * Make sure that your system time and date is correct and synchronized before running the scripts, otherwise this will cause failure while trying to download the packages.
 * These scripts are written and tested on the following configurations:
   * Ubuntu 24.04 (Noble) and 26.04 (Oracular) LTS releases

add_new_user.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Argument Data Validation
+if [[ $# -ne 1 ]]; then
+    echo "Please pass the username as an argument"
+    exit 1
+fi
+USERNAME=$1
+
+# Check if user already exists
+if id "$USERNAME" &>/dev/null; then
+    echo "User $USERNAME already exists"
+    exit 1
+fi
+
+# Create the user, and set the default password
+sudo useradd -m -s /bin/zsh "$USERNAME"
+
+# Add the user to the docker group
+sudo usermod -aG docker "$USERNAME"
+
+# Copy the configuration files
+USER_HOMEDIR=$(getent passwd "$USERNAME" | cut -d: -f6)
+sudo mkdir -p "$USER_HOMEDIR/.config"
+sudo cp ~/.zshrc ~/.xbindkeysrc "$USER_HOMEDIR"
+sudo cp /opt/.zsh/bash_aliases "$USER_HOMEDIR/.bash_aliases"
+sudo cp -r ~/.config/nvim/ "$USER_HOMEDIR/.config"
+
+sudo ln -s "$USER_HOMEDIR" /home 2>/dev/null || true
+
+# Change user folder permission, and disable others from reading it
+sudo chown "$USERNAME:$USERNAME" -R "$USER_HOMEDIR"
+sudo chmod o-rwX -R "$USER_HOMEDIR"
+
+# Force user to change password on first login
+sudo chage -d 0 "$USERNAME"

config_files/bash_aliases

@@ -8,4 +8,4 @@ alias glog="git log --graph --abbrev-commit --decorate --format=format:'%C(bold
 alias update="sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y"
 alias aria="aria2c --file-allocation=none -c -x 10 -s 10"
 alias cat="batcat -p"
-alias vi = "nvim"
+alias vi="nvim"