ZacharyZhang-NY/omarchycn
2
2
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 3 Wiki Activity

Use our pkg helpers consistently

Browse Source
This commit is contained in:
David Heinemeier Hansson
2026-02-21 09:52:17 +01:00
parent c6ac6de366
commit d2acf3b6ba
13 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/omarchy-install-dev-env
+1 -1
View File
@@ -8,7 +8,7 @@ if [[ -z $1 ]]; then
fi fi
install_php() { install_php() {
sudo pacman -S php composer php-sqlite xdebug --noconfirm omarchy-pkg-add php composer php-sqlite xdebug
# Install Path for Composer # Install Path for Composer
if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then
bin/omarchy-install-xbox-controllers
+2 -2
View File
@@ -5,8 +5,8 @@
set -e set -e
# Install xpadneo to ensure controllers work out of the box # Install xpadneo to ensure controllers work out of the box
sudo pacman -S --noconfirm --needed linux-headers omarchy-pkg-add linux-headers
yay -S --noconfirm xpadneo-dkms omarchy-pkg-aur-add xpadneo-dkms
# Prevent xpad/xpadneo driver conflict # Prevent xpad/xpadneo driver conflict
echo blacklist xpad | sudo tee /etc/modprobe.d/blacklist-xpad.conf >/dev/null echo blacklist xpad | sudo tee /etc/modprobe.d/blacklist-xpad.conf >/dev/null
bin/omarchy-menu
+6 -6
View File
@@ -52,15 +52,15 @@ open_in_editor() {
} }
install() { install() {
present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2" present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2"
} }
install_and_launch() { install_and_launch() {
present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2 && setsid gtk-launch $3" present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2 && setsid gtk-launch $3"
} }
install_font() { install_font() {
present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'" present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2 && sleep 2 && omarchy-font-set '$3'"
} }
install_terminal() { install_terminal() {
@@ -68,11 +68,11 @@ install_terminal() {
} }
aur_install() { aur_install() {
present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2" present_terminal "echo 'Installing $1 from AUR...'; omarchy-pkg-aur-add $2"
} }
aur_install_and_launch() { aur_install_and_launch() {
present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2 && setsid gtk-launch $3" present_terminal "echo 'Installing $1 from AUR...'; omarchy-pkg-aur-add $2 && setsid gtk-launch $3"
} }
show_learn_menu() { show_learn_menu() {
@@ -317,7 +317,7 @@ show_install_editor_menu() {
case $(menu "Install" " VSCode\n Cursor\n Zed\n Sublime Text\n Helix\n Emacs") in case $(menu "Install" " VSCode\n Cursor\n Zed\n Sublime Text\n Helix\n Emacs") in
*VSCode*) present_terminal omarchy-install-vscode ;; *VSCode*) present_terminal omarchy-install-vscode ;;
*Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;; *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
*Zed*) present_terminal "echo 'Installing Zed...'; sudo pacman -S zed && setsid gtk-launch dev.zed.Zed" ;; *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
*Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;; *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
*Helix*) install "Helix" "helix" ;; *Helix*) install "Helix" "helix" ;;
*Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;; *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
bin/omarchy-setup-fido2
+1 -1
View File
@@ -88,7 +88,7 @@ else
# Install required packages # Install required packages
print_info "Installing required packages..." print_info "Installing required packages..."
sudo pacman -S --noconfirm --needed libfido2 pam-u2f omarchy-pkg-add libfido2 pam-u2f
if ! check_fido2_hardware; then if ! check_fido2_hardware; then
exit 1 exit 1
bin/omarchy-setup-fingerprint
+1 -1
View File
@@ -100,7 +100,7 @@ else
# Install required packages # Install required packages
print_info "Installing required packages..." print_info "Installing required packages..."
sudo pacman -S --noconfirm --needed fprintd usbutils omarchy-pkg-add fprintd usbutils
if ! check_fingerprint_hardware; then if ! check_fingerprint_hardware; then
exit 1 exit 1
install/config/hardware/fix-apple-spi-keyboard.sh
+1 -1
View File
@@ -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 if [[ "$product_name" =~ MacBook[89],1|MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then
echo "Detected MacBook with SPI keyboard" 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 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 echo "MODULES=(applespi spi_pxa2xx_platform spi_pxa2xx_pci)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
else else
install/config/hardware/fix-apple-t2.sh
+1 -1
View File
@@ -3,7 +3,7 @@
if lspci -nn | grep -q "106b:180[12]"; then if lspci -nn | grep -q "106b:180[12]"; then
echo "Detected MacBook with T2 chip. Installing support items..." echo "Detected MacBook with T2 chip. Installing support items..."
sudo pacman -S --noconfirm --needed \ omarchy-pkg-add \
linux-t2 \ linux-t2 \
linux-t2-headers \ linux-t2-headers \
apple-t2-audio-config \ apple-t2-audio-config \
install/config/hardware/fix-bcm43xx.sh
+1 -1
View File
@@ -6,5 +6,5 @@ pci_info=$(lspci -nnv)
if (echo "$pci_info" | grep -q "14e4:43a0" || echo "$pci_info" | grep -q "14e4:4331"); then if (echo "$pci_info" | grep -q "14e4:43a0" || echo "$pci_info" | grep -q "14e4:4331"); then
echo "BCM4360 / BCM4331 detected" echo "BCM4360 / BCM4331 detected"
sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers omarchy-pkg-add broadcom-wl dkms linux-headers
fi fi
install/config/hardware/intel.sh
+2 -2
View File
@@ -3,9 +3,9 @@
if INTEL_GPU=$(lspci | grep -iE 'vga|3d|display' | grep -i 'intel'); then if INTEL_GPU=$(lspci | grep -iE 'vga|3d|display' | grep -i 'intel'); then
# HD Graphics and newer uses intel-media-driver # HD Graphics and newer uses intel-media-driver
if [[ "${INTEL_GPU,,}" =~ "hd graphics"|"xe"|"iris" ]]; then 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 elif [[ "${INTEL_GPU,,}" =~ "gma" ]]; then
# Older generations from 2008 to ~2014-2017 use libva-intel-driver # 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
fi fi
install/helpers/presentation.sh
+1 -1
View File
@@ -1,6 +1,6 @@
# Ensure we have gum available # Ensure we have gum available
if ! command -v gum &>/dev/null; then if ! command -v gum &>/dev/null; then
sudo pacman -S --needed --noconfirm gum omarchy-pkg-add gum
fi fi
# Get terminal size from /dev/tty (works in all scenarios: direct, sourced, or piped) # Get terminal size from /dev/tty (works in all scenarios: direct, sourced, or piped)
install/login/limine-snapper.sh
+1 -1
View File
@@ -1,5 +1,5 @@
if command -v limine &>/dev/null; then 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 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) HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs)
install/packaging/base.sh
+1 -1
View File
@@ -1,3 +1,3 @@
# Install all base packages # Install all base packages
mapfile -t packages < <(grep -v '^#' "$OMARCHY_INSTALL/omarchy-base.packages" | grep -v '^$') mapfile -t packages < <(grep -v '^#' "$OMARCHY_INSTALL/omarchy-base.packages" | grep -v '^$')
sudo pacman -S --noconfirm --needed "${packages[@]}" omarchy-pkg-add "${packages[@]}"
install/preflight/pacman.sh
+2 -2
View File
@@ -1,6 +1,6 @@
if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
# Install build tools # Install build tools
sudo pacman -S --needed --noconfirm base-devel omarchy-pkg-add base-devel
# Configure pacman # Configure pacman
sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf /etc/pacman.conf 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-key --lsign-key 40DFB630FF42BCFFB047046CF0134EE680CAC571
sudo pacman -Sy sudo pacman -Sy
sudo pacman -S --noconfirm --needed omarchy-keyring omarchy-pkg-add omarchy-keyring
# Refresh all repos # Refresh all repos
sudo pacman -Syyu --noconfirm sudo pacman -Syyu --noconfirm