Use our pkg helpers consistently
This commit is contained in:
@@ -3,7 +3,7 @@ product_name="$(cat /sys/class/dmi/id/product_name 2>/dev/null)"
|
||||
if [[ "$product_name" =~ MacBook[89],1|MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then
|
||||
echo "Detected MacBook with SPI keyboard"
|
||||
|
||||
sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms
|
||||
omarchy-pkg-add macbook12-spi-driver-dkms
|
||||
if [[ "$product_name" == "MacBook8,1" ]]; then
|
||||
echo "MODULES=(applespi spi_pxa2xx_platform spi_pxa2xx_pci)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
|
||||
else
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
if lspci -nn | grep -q "106b:180[12]"; then
|
||||
echo "Detected MacBook with T2 chip. Installing support items..."
|
||||
|
||||
sudo pacman -S --noconfirm --needed \
|
||||
omarchy-pkg-add \
|
||||
linux-t2 \
|
||||
linux-t2-headers \
|
||||
apple-t2-audio-config \
|
||||
|
||||
@@ -6,5 +6,5 @@ pci_info=$(lspci -nnv)
|
||||
|
||||
if (echo "$pci_info" | grep -q "14e4:43a0" || echo "$pci_info" | grep -q "14e4:4331"); then
|
||||
echo "BCM4360 / BCM4331 detected"
|
||||
sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
|
||||
omarchy-pkg-add broadcom-wl dkms linux-headers
|
||||
fi
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
if INTEL_GPU=$(lspci | grep -iE 'vga|3d|display' | grep -i 'intel'); then
|
||||
# HD Graphics and newer uses intel-media-driver
|
||||
if [[ "${INTEL_GPU,,}" =~ "hd graphics"|"xe"|"iris" ]]; then
|
||||
sudo pacman -S --needed --noconfirm intel-media-driver
|
||||
omarchy-pkg-add intel-media-driver
|
||||
elif [[ "${INTEL_GPU,,}" =~ "gma" ]]; then
|
||||
# Older generations from 2008 to ~2014-2017 use libva-intel-driver
|
||||
sudo pacman -S --needed --noconfirm libva-intel-driver
|
||||
omarchy-pkg-add libva-intel-driver
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Ensure we have gum available
|
||||
if ! command -v gum &>/dev/null; then
|
||||
sudo pacman -S --needed --noconfirm gum
|
||||
omarchy-pkg-add gum
|
||||
fi
|
||||
|
||||
# Get terminal size from /dev/tty (works in all scenarios: direct, sourced, or piped)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
if command -v limine &>/dev/null; then
|
||||
sudo pacman -S --noconfirm --needed limine-snapper-sync limine-mkinitcpio-hook
|
||||
omarchy-pkg-add limine-snapper-sync limine-mkinitcpio-hook
|
||||
|
||||
sudo tee /etc/mkinitcpio.conf.d/omarchy_hooks.conf <<EOF >/dev/null
|
||||
HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs)
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Install all base packages
|
||||
mapfile -t packages < <(grep -v '^#' "$OMARCHY_INSTALL/omarchy-base.packages" | grep -v '^$')
|
||||
sudo pacman -S --noconfirm --needed "${packages[@]}"
|
||||
omarchy-pkg-add "${packages[@]}"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
|
||||
# Install build tools
|
||||
sudo pacman -S --needed --noconfirm base-devel
|
||||
omarchy-pkg-add base-devel
|
||||
|
||||
# Configure pacman
|
||||
sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf /etc/pacman.conf
|
||||
@@ -10,7 +10,7 @@ if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
|
||||
sudo pacman-key --lsign-key 40DFB630FF42BCFFB047046CF0134EE680CAC571
|
||||
|
||||
sudo pacman -Sy
|
||||
sudo pacman -S --noconfirm --needed omarchy-keyring
|
||||
omarchy-pkg-add omarchy-keyring
|
||||
|
||||
# Refresh all repos
|
||||
sudo pacman -Syyu --noconfirm
|
||||
|
||||
Reference in New Issue
Block a user