Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use Bumblebee as default #454

Merged
merged 2 commits into from
Oct 31, 2020
+18 −17
Merged

fix: use Bumblebee as default #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
717475f
fix: use Bumblebee as default
storm1ng Oct 31, 2020
ffdad23
fix: add BUMBLEBEE var and add comments
storm1ng Oct 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lilo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,21 +801,21 @@ install_video_cards(){
elif [[ ${VIDEO_DRIVER} == optimus ]]; then
XF86_DRIVERS=$(pacman -Qe | grep xf86-video | awk '{print $1}')
[[ -n $XF86_DRIVERS ]] && pacman -Rcsn "$XF86_DRIVERS"
read_input_text "Use Bumblebee instead of NVIDIA PRIME Render Offload?" "$BUMBLEBEE"
read_input_text "Use NVIDIA PRIME Render Offload instead of Bumblebee?" "$BUMBLEBEE"
if [[ $OPTION == y ]]; then
pacman -S --needed xf86-video-intel bumblebee nvidia
package_install "nvidia nvidia-utils libglvnd nvidia-prime"
package_install "mesa mesa-libgl libvdpau-va-gl"
[[ ${ARCHI} == x86_64 ]] && pacman -S --needed lib32-virtualgl lib32-nvidia-utils
replace_line '*options nouveau modeset=1' '#options nouveau modeset=1' /etc/modprobe.d/modprobe.conf
replace_line '*MODULES="nouveau"' '#MODULES="nouveau"' /etc/mkinitcpio.conf
create_ramdisk_environment
add_user_to_group "${username}" bumblebee
else
package_install "nvidia nvidia-utils libglvnd nvidia-prime"
package_install "mesa mesa-libgl libvdpau-va-gl"
pacman -S --needed xf86-video-intel bumblebee nvidia
[[ ${ARCHI} == x86_64 ]] && pacman -S --needed lib32-virtualgl lib32-nvidia-utils
replace_line '*options nouveau modeset=1' '#options nouveau modeset=1' /etc/modprobe.d/modprobe.conf
replace_line '*MODULES="nouveau"' '#MODULES="nouveau"' /etc/mkinitcpio.conf
create_ramdisk_environment
add_user_to_group "${username}" bumblebee
fi
#}}}
#NVIDIA {{{
Expand Down Expand Up @@ -912,7 +912,7 @@ install_additional_firmwares(){
echo "10) $(menu_item "libmtp") [Android Devices]"
echo "11) $(menu_item "libraw1394") [IEEE1394 Driver]"
echo "12) $(menu_item "wd719x-firmware") $AUR"
echo "13) $(menu_item "upd72020x-fw") $AUR"
echo "13) $(menu_item "upd72020x-fw") [Renesas USB3.0 Driver] $AUR"
echo ""
echo " d) DONE"
echo ""
Expand Down
23 changes: 12 additions & 11 deletions lilo.automode
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
ZSH="n"
OH_MY_ZSH="n"
BETTER_VIDEO_DRIVER="y" # NVIDIA/AMDGPU
BUMBLEBEE="y" # Optimus, use Bumblebee instead of NVIDIA PRIME Render Offload
FONTCONFIG="y"
#}}}
#ADDITIONAL FIRMWARE {{{
# 1) aic94xx-firmware
# 2) alsa-firmware
# 3) b43
# 4) b43legacy
# 5) bfa-firmware
# 6) bluez-firmware
# 7) broadcom-wl
# 8) ipw2100
# 9) ipw2200
# 10) libffado [Firmware Audio Devices]
# 11) libmtp [Android Devices]
# 12) libraw1394 [IEE1394 Driver]
# 13) wd719x-firmware
# 3) b43-firmware
# 4) b43-firmware-legacy
# 5) bluez-firmware
# 6) broadcom-wl-dkms
# 7) ipw2100-fw
# 8) ipw2200-fw
# 9) libffado [Firmware Audio Devices]
# 10) libmtp [Android Devices]
# 11) libraw1394 [IEE1394 Driver]
# 12) wd719x-firmware
# 13) upd72020x-fw [Renesas USB3.0 Driver]
FIRMWARE_OPTIONS=""
#}}}
#}}}
Expand Down