Skip to content

Commit 66d701f

Browse files
demonkillerrdemonkillerr
committed
zen iso nvidia support
1 parent 1423a94 commit 66d701f

11 files changed

Lines changed: 94 additions & 35 deletions

File tree

‎airootfs/etc/mkinitcpio.d/linux.preset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# SPDX-License-Identifier: GPL-3.0-or-later
33

4-
# mkinitcpio preset file for the 'linux' package on archiso
4+
# mkinitcpio preset file for the 'linux-zen' package on archiso
55

66
PRESETS=('archiso')
77

‎airootfs/etc/modprobe.d/broadcom-wl.conf‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎airootfs/etc/resolv.conf‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

airootfs/etc/skel/.zshrc renamed to airootfs/etc/skel/zshrc.bak

File renamed without changes.

‎airootfs/usr/local/bin/alg-finalisation‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
3+
chmod 750 /etc/sudoers.d
4+
chmod 750 /etc/polkit-1/rules.d
5+
chgrp polkitd /etc/polkit-1/rules.d
6+
chmod -v 750 /root
7+
8+
rm -vf /etc/sudoers.d/g_wheel
9+
rm -vf /etc/sddm.conf.d/autologin.conf
10+
rm -vf /etc/polkit-1/rules.d/49-nopasswd_global.rules
11+
rm -vr /etc/systemd/system/etc-pacman.d-gnupg.mount
12+
rm -vf /root/{.automated_script.sh,.zlogin}
13+
14+
rm /usr/local/bin/{alg-finalisation,livecd-sound,Installation_guide}

‎airootfs/usr/local/bin/alg-preset‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
mv -v /etc/mkinitcpio.d/alg /etc/mkinitcpio.d/linux.preset
4+
5+
rm -v /usr/local/bin/alg-preset

‎airootfs/usr/local/bin/alg-remove-nvidia‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
#!/bin/bash
2+
# driver=free or driver=nonfree - grub and efi
3+
echo "Start alg-remove-nvidia"
4+
kernel_cmdline(){
5+
for param in $(cat /proc/cmdline); do
6+
case "${param}" in
7+
$1=*) echo "${param##*=}"; return 0 ;;
8+
$1) return 0 ;;
9+
*) continue ;;
10+
esac
11+
done
12+
[ -n "${2}" ] && echo "${2}"
13+
return 1
14+
}
15+
16+
get_driver(){
17+
echo $(kernel_cmdline driver)
18+
}
19+
20+
21+
while [ -e "/var/lib/pacman/db.lck" ];
22+
do
23+
echo 'Pacman is not ready yet. Will try again in 10 seconds.'
24+
seconds=$(($seconds + 10))
25+
sleep 10
26+
if [[ "$seconds" == "30" ]]; then
27+
echo 'Warning: removing pacman db.lck!'
28+
rm /var/lib/pacman/db.lck
29+
fi
30+
done
31+
32+
# free = remove nvidia keep nouveau
33+
selection=$(get_driver)
34+
echo "#################################"
35+
echo "Selection was "$selection
36+
echo "#################################"
37+
if [[ $selection == "free" ]]; then
38+
pacman -Rns --noconfirm nvidia nvidia-utils nvidia-settings
39+
fi
40+
41+
42+
#nonfree = keepin nvidia and nouveau
43+
selection=$(get_driver)
44+
echo "Selection was "$selection
45+
if [[ $selection == "nonfree" ]]; then
46+
echo "#################################"
47+
echo "We keep nvidia onboard"
48+
echo "#################################"
49+
fi
50+
51+
52+
echo "#################################"
53+
echo "End alg-remove-nvidia"
54+
echo "#################################"
55+
rm /usr/local/bin/alg-remove-nvidia
56+

efiboot/loader/entries/archiso-x86_64-linux.conf renamed to efiboot/loader/entries/01-archiso-x86_64-linux.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#
22
# SPDX-License-Identifier: GPL-3.0-or-later
33

4-
title Arch Linux install medium (x86_64, UEFI, Zen Kernel)
4+
title Arch Linux installer (x86_64, UEFI, Zen Kernel), FOSS GPU Drivers
55
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen
66
initrd /%INSTALL_DIR%/boot/intel-ucode.img
77
initrd /%INSTALL_DIR%/boot/amd-ucode.img
88
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img
9-
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
9+
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1

efiboot/loader/entries/archiso-x86_64-ram-linux.conf renamed to efiboot/loader/entries/02-archiso-x86_64-linux-nvidia.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#
22
# SPDX-License-Identifier: GPL-3.0-or-later
33

4-
title Arch Linux install medium (x86_64, UEFI, Zen, Copy to RAM)
4+
title Arch Linux installer (x86_64, UEFI, Zen Kernel), LATEST NVIDIA GPUS ONLY
55
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen
66
initrd /%INSTALL_DIR%/boot/intel-ucode.img
77
initrd /%INSTALL_DIR%/boot/amd-ucode.img
88
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-zen.img
9-
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
9+
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G driver=nonfree nouveau.modeset=0 modprobe.blacklist=nouveau nvidia radeon.modeset=1 i915.modeset=1

‎packages.x86_64‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ arch-install-scripts
66
b43-fwcutter
77
base
88
bind-tools
9-
brltty
10-
#broadcom-wl
119
btrfs-progs
1210
clonezilla
1311
cloud-init
@@ -45,7 +43,6 @@ kitty-terminfo
4543
lftp
4644
linux-zen
4745
linux-zen-headers
48-
linux-atm
4946
linux-firmware
5047
livecd-sounds
5148
lsscsi
@@ -118,10 +115,6 @@ xdg-user-dirs
118115
spectacle
119116
neofetch
120117

121-
#Browser
122-
firefox
123-
alg-firefox-settings
124-
125118
#Software Center
126119
pamac-aur
127120
archlinux-appstream-data-pamac
@@ -132,11 +125,11 @@ calamares
132125
alg-zen-cala-config
133126
os-prober
134127

135-
#Icons
136-
tela-circle-icon
137-
mcmojave-cursors
138-
alg-plasma-settings
139-
140128
#chaotic aur
141129
chaotic-keyring
142130
chaotic-mirrorlist
131+
132+
#nvidia
133+
nvidia
134+
nvidia-utils
135+
nvidia-settings

0 commit comments

Comments
 (0)