final tweak before merging to main... I think I am happy now with this
This commit is contained in:
@@ -176,7 +176,6 @@ source ~/.zshrc
|
|||||||
|
|
||||||
#### 🛣️ Roadmap:
|
#### 🛣️ Roadmap:
|
||||||
- [ ] show a progress bar in downloading and compiling part when installing outside AUR or official repo
|
- [ ] show a progress bar in downloading and compiling part when installing outside AUR or official repo
|
||||||
- [ ] When preset.sh is used, it still asked whether I want thunar to be default manager or not
|
|
||||||
|
|
||||||
#### ❗ some known issues for nvidia
|
#### ❗ some known issues for nvidia
|
||||||
- reports from members of my discord, states that some users of nvidia are getting stuck on sddm login. credit to @Kenni Fix stated was
|
- reports from members of my discord, states that some users of nvidia are getting stuck on sddm login. credit to @Kenni Fix stated was
|
||||||
|
|||||||
@@ -53,14 +53,16 @@ else
|
|||||||
echo "Nvidia modules added in /etc/mkinitcpio.conf"
|
echo "Nvidia modules added in /etc/mkinitcpio.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
printf "\n%.0s" {1..2}
|
||||||
|
printf "${INFO} Rebuilding ${YELLOW}Initramfs${RESET}...\n" 2>&1 | tee -a "$LOG"
|
||||||
sudo mkinitcpio -P 2>&1 | tee -a "$LOG"
|
sudo mkinitcpio -P 2>&1 | tee -a "$LOG"
|
||||||
|
|
||||||
printf "\n%.0s" {1..3}
|
printf "\n%.0s" {1..2}
|
||||||
|
|
||||||
# Additional Nvidia steps
|
# Additional Nvidia steps
|
||||||
NVEA="/etc/modprobe.d/nvidia.conf"
|
NVEA="/etc/modprobe.d/nvidia.conf"
|
||||||
if [ -f "$NVEA" ]; then
|
if [ -f "$NVEA" ]; then
|
||||||
printf "${OK} Seems like ${YELLOW}nvidia-drm modeset=1${RESET} is already added in your system..moving on."
|
printf "${OK} Seems like ${YELLOW}nvidia_drm modeset=1 fbdev=1${RESET} is already added in your system..moving on."
|
||||||
printf "\n"
|
printf "\n"
|
||||||
else
|
else
|
||||||
printf "\n"
|
printf "\n"
|
||||||
@@ -71,7 +73,7 @@ fi
|
|||||||
|
|
||||||
# Additional for GRUB users
|
# Additional for GRUB users
|
||||||
if [ -f /etc/default/grub ]; then
|
if [ -f /etc/default/grub ]; then
|
||||||
printf "${INFO} GRUB bootloader detected\n" 2>&1 | tee -a "$LOG"
|
printf "${INFO} ${YELLOW}GRUB${RESET} bootloader detected\n" 2>&1 | tee -a "$LOG"
|
||||||
|
|
||||||
# Check if nvidia-drm.modeset=1 is present
|
# Check if nvidia-drm.modeset=1 is present
|
||||||
if ! sudo grep -q "nvidia-drm.modeset=1" /etc/default/grub; then
|
if ! sudo grep -q "nvidia-drm.modeset=1" /etc/default/grub; then
|
||||||
@@ -88,15 +90,15 @@ if [ -f /etc/default/grub ]; then
|
|||||||
# Regenerate GRUB configuration
|
# Regenerate GRUB configuration
|
||||||
if sudo grep -q "nvidia-drm.modeset=1" /etc/default/grub || sudo grep -q "nvidia_drm.fbdev=1" /etc/default/grub; then
|
if sudo grep -q "nvidia-drm.modeset=1" /etc/default/grub || sudo grep -q "nvidia_drm.fbdev=1" /etc/default/grub; then
|
||||||
sudo grub-mkconfig -o /boot/grub/grub.cfg
|
sudo grub-mkconfig -o /boot/grub/grub.cfg
|
||||||
printf "GRUB configuration regenerated\n" 2>&1 | tee -a "$LOG"
|
printf "${YELLOW}GRUB${RESET} configuration regenerated\n" 2>&1 | tee -a "$LOG"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
printf "${OK} Additional steps for GRUB completed\n" 2>&1 | tee -a "$LOG"
|
printf "${OK} Additional steps for ${YELLOW}GRUB${RESET} completed\n" 2>&1 | tee -a "$LOG"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Additional for systemd-boot users
|
# Additional for systemd-boot users
|
||||||
if [ -f /boot/loader/loader.conf ]; then
|
if [ -f /boot/loader/loader.conf ]; then
|
||||||
printf "${INFO} systemd-boot bootloader detected\n" 2>&1 | tee -a "$LOG"
|
printf "${INFO} ${YELLOW}systemd-boot${RESET} bootloader detected\n" 2>&1 | tee -a "$LOG"
|
||||||
|
|
||||||
backup_count=$(find /boot/loader/entries/ -type f -name "*.conf.bak" | wc -l)
|
backup_count=$(find /boot/loader/entries/ -type f -name "*.conf.bak" | wc -l)
|
||||||
conf_count=$(find /boot/loader/entries/ -type f -name "*.conf" | wc -l)
|
conf_count=$(find /boot/loader/entries/ -type f -name "*.conf" | wc -l)
|
||||||
@@ -112,9 +114,9 @@ if [ -f /boot/loader/loader.conf ]; then
|
|||||||
sudo sed -i "/^options/c${sdopt} nvidia-drm.modeset=1 nvidia_drm.fbdev=1" "$imgconf" 2>&1 | tee -a "$LOG"
|
sudo sed -i "/^options/c${sdopt} nvidia-drm.modeset=1 nvidia_drm.fbdev=1" "$imgconf" 2>&1 | tee -a "$LOG"
|
||||||
done
|
done
|
||||||
|
|
||||||
printf "${OK} Additional steps for systemd-boot completed\n" 2>&1 | tee -a "$LOG"
|
printf "${OK} Additional steps for ${YELLOW}systemd-boot${RESET} completed\n" 2>&1 | tee -a "$LOG"
|
||||||
else
|
else
|
||||||
printf "${NOTE} systemd-boot is already configured...\n" 2>&1 | tee -a "$LOG"
|
printf "${NOTE} ${YELLOW}systemd-boot${RESET} is already configured...\n" 2>&1 | tee -a "$LOG"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -128,7 +130,7 @@ echo
|
|||||||
if [[ $blacklist_nouveau =~ ^[Yy]$ ]]; then
|
if [[ $blacklist_nouveau =~ ^[Yy]$ ]]; then
|
||||||
NOUVEAU="/etc/modprobe.d/nouveau.conf"
|
NOUVEAU="/etc/modprobe.d/nouveau.conf"
|
||||||
if [ -f "$NOUVEAU" ]; then
|
if [ -f "$NOUVEAU" ]; then
|
||||||
printf "${OK} Seems like nouveau is already blacklisted..moving on.\n"
|
printf "${OK} Seems like ${YELLOW}nouveau${RESET} is already blacklisted..moving on.\n"
|
||||||
else
|
else
|
||||||
echo "blacklist nouveau" | sudo tee -a "$NOUVEAU" 2>&1 | tee -a "$LOG"
|
echo "blacklist nouveau" | sudo tee -a "$NOUVEAU" 2>&1 | tee -a "$LOG"
|
||||||
printf "${NOTE} has been added to $NOUVEAU.\n"
|
printf "${NOTE} has been added to $NOUVEAU.\n"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ if [[ $USE_PRESET = [Yy] ]]; then
|
|||||||
source ./preset.sh
|
source ./preset.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
zsh=(
|
zsh_pkg=(
|
||||||
eza
|
eza
|
||||||
zsh
|
zsh
|
||||||
zsh-completions
|
zsh-completions
|
||||||
@@ -33,7 +33,7 @@ while true; do
|
|||||||
fi
|
fi
|
||||||
case "$pokemon_choice" in
|
case "$pokemon_choice" in
|
||||||
[Yy]*)
|
[Yy]*)
|
||||||
zsh+=('pokemon-colorscripts-git')
|
zsh_pkg+=('pokemon-colorscripts-git')
|
||||||
sed -i '/#pokemon-colorscripts --no-title -s -r/s/^#//' assets/.zshrc >> "$LOG" 2>&1
|
sed -i '/#pokemon-colorscripts --no-title -s -r/s/^#//' assets/.zshrc >> "$LOG" 2>&1
|
||||||
|
|
||||||
# commenting out fastfetch since pokemon was chosen to install
|
# commenting out fastfetch since pokemon was chosen to install
|
||||||
@@ -53,16 +53,15 @@ done
|
|||||||
|
|
||||||
# Installing zsh packages
|
# Installing zsh packages
|
||||||
printf "${NOTE} Installing core zsh packages...${RESET}\n"
|
printf "${NOTE} Installing core zsh packages...${RESET}\n"
|
||||||
for ZSH in "${zsh[@]}"; do
|
for ZSH in "${zsh_pkg[@]}"; do
|
||||||
(
|
(
|
||||||
# Call the global install_package function and redirect its output to the log
|
|
||||||
install_package "$ZSH" "$LOG"
|
install_package "$ZSH" "$LOG"
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo -e "\e[1A\e[K${ERROR} - $ZSH Package installation failed, Please check the installation logs"
|
exit 1
|
||||||
fi
|
fi
|
||||||
) &
|
) &
|
||||||
done
|
done
|
||||||
wait # Ensure all background processes finish before continuing
|
wait
|
||||||
|
|
||||||
# Install Oh My Zsh, plugins, and set zsh as default shell
|
# Install Oh My Zsh, plugins, and set zsh as default shell
|
||||||
if command -v zsh >/dev/null; then
|
if command -v zsh >/dev/null; then
|
||||||
|
|||||||
Reference in New Issue
Block a user