diff --git a/chrootInstall.sh b/chrootInstall.sh index f494c57..9179c5b 100755 --- a/chrootInstall.sh +++ b/chrootInstall.sh @@ -33,11 +33,11 @@ if [ "$boot" == 2 ]; then grub-install --target=i386-pc "$disk" fi cp /usr/share/locale/en\@quot/LC_MESSAGES/grub.mo /boot/grub/locale/en.mo +curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/grub -o /etc/default/grub if [ "$gpu" != 'NVIDIA' ]; then - curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/grub -o /etc/default/grub + echo "GRUB_CMDLINE_LINUX_DEFAULT=\"loglevel=3 quiet nowatchdog mem_sleep_default=deep\"" >> /etc/default/grub else - curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/grub-nvidia -o /etc/default/grub -fi + echo "GRUB_CMDLINE_LINUX_DEFAULT=\"loglevel=3 quiet nowatchdog mem_sleep_default=deep nvidia-drm.modeset=1\"" >> /etc/default/grub grub-mkconfig -o /boot/grub/grub.cfg # account setup diff --git a/config-files/grub b/config-files/grub index a22d412..edb9968 100755 --- a/config-files/grub +++ b/config-files/grub @@ -1,57 +1,12 @@ -# GRUB boot loader configuration - Universal-ish Arch Installer 05/07/2022 +# GRUB boot loader configuration - rwinkhart/artix-install-script 06/26/2022 GRUB_DEFAULT="Advanced options for Arch Linux>Arch Linux, with Linux linux" GRUB_TIMEOUT=0 GRUB_DISTRIBUTOR="Arch" -GRUB_CMDLINE_LINUX_DEFAULT="loglevel=3 quiet nowatchdog mem_sleep_default=deep" -GRUB_CMDLINE_LINUX="" - -# Preload both GPT and MBR modules so that they are not missed GRUB_PRELOAD_MODULES="part_gpt part_msdos" - -# Uncomment to enable booting from LUKS encrypted devices -#GRUB_ENABLE_CRYPTODISK=y - -# Set to 'countdown' or 'hidden' to change timeout behavior, -# press ESC key to display menu. GRUB_TIMEOUT_STYLE=menu - -# Uncomment to use basic console GRUB_TERMINAL_INPUT=console - -# Uncomment to disable graphical terminal -#GRUB_TERMINAL_OUTPUT=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' GRUB_GFXMODE=auto - -# Uncomment to allow the kernel use the same resolution used by grub GRUB_GFXPAYLOAD_LINUX=keep - -# Uncomment if you want GRUB to pass to the Linux kernel the old parameter -# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries GRUB_DISABLE_RECOVERY=true - -# Uncomment and set to the desired menu colors. Used by normal and wallpaper -# modes only. Entries specified as foreground/background. -#GRUB_COLOR_NORMAL="light-blue/black" -#GRUB_COLOR_HIGHLIGHT="light-cyan/blue" - -# Uncomment one of them for the gfx desired, a image background or a gfxtheme -#GRUB_BACKGROUND="/path/to/wallpaper" -#GRUB_THEME="/path/to/gfxtheme" - -# Uncomment to get a beep at GRUB start -#GRUB_INIT_TUNE="480 440 1" - -# Uncomment to make GRUB remember the last selection. This requires -# setting 'GRUB_DEFAULT=saved' above. -#GRUB_SAVEDEFAULT=true - -# Uncomment to disable submenus in boot menu -#GRUB_DISABLE_SUBMENU=y +GRUB_CMDLINE_LINUX="" diff --git a/config-files/grub-nvidia b/config-files/grub-nvidia deleted file mode 100755 index c98dd01..0000000 --- a/config-files/grub-nvidia +++ /dev/null @@ -1,57 +0,0 @@ -# GRUB boot loader configuration - Universal-ish Arch Installer 05/07/2022 - -GRUB_DEFAULT="Advanced options for Arch Linux>Arch Linux, with Linux linux" -GRUB_TIMEOUT=0 -GRUB_DISTRIBUTOR="Arch" -GRUB_CMDLINE_LINUX_DEFAULT="loglevel=3 quiet nowatchdog mem_sleep_default=deep nvidia-drm.modeset=1" -GRUB_CMDLINE_LINUX="" - -# Preload both GPT and MBR modules so that they are not missed -GRUB_PRELOAD_MODULES="part_gpt part_msdos" - -# Uncomment to enable booting from LUKS encrypted devices -#GRUB_ENABLE_CRYPTODISK=y - -# Set to 'countdown' or 'hidden' to change timeout behavior, -# press ESC key to display menu. -GRUB_TIMEOUT_STYLE=menu - -# Uncomment to use basic console -GRUB_TERMINAL_INPUT=console - -# Uncomment to disable graphical terminal -#GRUB_TERMINAL_OUTPUT=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' -GRUB_GFXMODE=auto - -# Uncomment to allow the kernel use the same resolution used by grub -GRUB_GFXPAYLOAD_LINUX=keep - -# Uncomment if you want GRUB to pass to the Linux kernel the old parameter -# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -GRUB_DISABLE_RECOVERY=true - -# Uncomment and set to the desired menu colors. Used by normal and wallpaper -# modes only. Entries specified as foreground/background. -#GRUB_COLOR_NORMAL="light-blue/black" -#GRUB_COLOR_HIGHLIGHT="light-cyan/blue" - -# Uncomment one of them for the gfx desired, a image background or a gfxtheme -#GRUB_BACKGROUND="/path/to/wallpaper" -#GRUB_THEME="/path/to/gfxtheme" - -# Uncomment to get a beep at GRUB start -#GRUB_INIT_TUNE="480 440 1" - -# Uncomment to make GRUB remember the last selection. This requires -# setting 'GRUB_DEFAULT=saved' above. -#GRUB_SAVEDEFAULT=true - -# Uncomment to disable submenus in boot menu -#GRUB_DISABLE_SUBMENU=y