mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Compare commits
9 Commits
v2.0.5
...
follow-arc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fc82476f24 | ||
|
|
dd719051cb | ||
|
|
18aef9fd86 | ||
|
|
3d1e9ced81 | ||
|
|
c677098165 | ||
|
|
ca455c434a | ||
|
|
2e8a57fac4 | ||
|
|
20ab2ee81e | ||
|
|
4cbc8eef43 |
@@ -33,11 +33,6 @@ install_php() {
|
|||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
install_node() {
|
|
||||||
echo -e "Installing Node.js...\n"
|
|
||||||
mise use --global node@lts
|
|
||||||
}
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
ruby)
|
ruby)
|
||||||
echo -e "Installing Ruby on Rails...\n"
|
echo -e "Installing Ruby on Rails...\n"
|
||||||
@@ -47,7 +42,8 @@ ruby)
|
|||||||
echo -e "\nYou can now run: rails new myproject"
|
echo -e "\nYou can now run: rails new myproject"
|
||||||
;;
|
;;
|
||||||
node)
|
node)
|
||||||
install_node
|
echo -e "Installing Node.js...\n"
|
||||||
|
mise use --global node@lts
|
||||||
;;
|
;;
|
||||||
bun)
|
bun)
|
||||||
echo -e "Installing Bun...\n"
|
echo -e "Installing Bun...\n"
|
||||||
@@ -68,7 +64,6 @@ php)
|
|||||||
laravel)
|
laravel)
|
||||||
echo -e "Installing PHP and Laravel...\n"
|
echo -e "Installing PHP and Laravel...\n"
|
||||||
install_php
|
install_php
|
||||||
install_node
|
|
||||||
composer global require laravel/installer
|
composer global require laravel/installer
|
||||||
echo -e "\nYou can now run: laravel new myproject"
|
echo -e "\nYou can now run: laravel new myproject"
|
||||||
;;
|
;;
|
||||||
|
|||||||
@@ -4,5 +4,5 @@ echo "Adding multilib repository for 32-bit compatibility"
|
|||||||
sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
|
sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
|
||||||
|
|
||||||
echo "Now pick dependencies matching your graphics card"
|
echo "Now pick dependencies matching your graphics card"
|
||||||
sudo pacman -Syu --noconfirm steam
|
sudo pacman -Syu steam
|
||||||
setsid gtk-launch steam >/dev/null 2>&1 &
|
setsid gtk-launch steam >/dev/null 2>&1 &
|
||||||
|
|||||||
@@ -377,12 +377,11 @@ go_to_menu() {
|
|||||||
*screenrecord*) show_screenrecord_menu ;;
|
*screenrecord*) show_screenrecord_menu ;;
|
||||||
*toggle*) show_toggle_menu ;;
|
*toggle*) show_toggle_menu ;;
|
||||||
*setup*) show_setup_menu ;;
|
*setup*) show_setup_menu ;;
|
||||||
*power*) show_setup_power_menu ;;
|
|
||||||
*install*) show_install_menu ;;
|
*install*) show_install_menu ;;
|
||||||
*remove*) show_remove_menu ;;
|
*remove*) show_remove_menu ;;
|
||||||
*update*) show_update_menu ;;
|
*update*) show_update_menu ;;
|
||||||
*about*) alacritty --class Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s' ;;
|
|
||||||
*system*) show_system_menu ;;
|
*system*) show_system_menu ;;
|
||||||
|
*about*) alacritty --class Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s' ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Resetting sudo lockout for user
|
echo "Resetting sudo lockout for user: $USER"
|
||||||
su -c "faillock --reset --user $USER"
|
su -c "faillock --reset --user $USER"
|
||||||
|
|||||||
@@ -16,15 +16,9 @@ case "$COMMAND" in
|
|||||||
create)
|
create)
|
||||||
DESC="$(omarchy-version)"
|
DESC="$(omarchy-version)"
|
||||||
|
|
||||||
echo -e "\e[32mCreate system snapshot\e[0m"
|
for config in root home; do
|
||||||
|
|
||||||
# Get existing snapper config names from CSV output
|
|
||||||
mapfile -t CONFIGS < <(sudo snapper --csvout list-configs | awk -F, 'NR>1 {print $1}')
|
|
||||||
|
|
||||||
for config in "${CONFIGS[@]}"; do
|
|
||||||
sudo snapper -c "$config" create -c number -d "$DESC"
|
sudo snapper -c "$config" create -c number -d "$DESC"
|
||||||
done
|
done
|
||||||
echo
|
|
||||||
;;
|
;;
|
||||||
restore)
|
restore)
|
||||||
sudo limine-snapper-restore
|
sudo limine-snapper-restore
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo $(git -C "$OMARCHY_PATH" rev-parse --abbrev-ref HEAD)
|
|
||||||
@@ -68,12 +68,6 @@
|
|||||||
"keyColor": "blue",
|
"keyColor": "blue",
|
||||||
"text": "version=$(omarchy-version); echo \"Omarchy $version\""
|
"text": "version=$(omarchy-version); echo \"Omarchy $version\""
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"type": "command",
|
|
||||||
"key": "│ ├",
|
|
||||||
"keyColor": "blue",
|
|
||||||
"text": "branch=$(omarchy-version-branch); echo \"$branch\""
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"type": "kernel",
|
"type": "kernel",
|
||||||
"key": "│ ├",
|
"key": "│ ├",
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ general {
|
|||||||
lock_cmd = omarchy-lock-screen # lock screen and 1password
|
lock_cmd = omarchy-lock-screen # lock screen and 1password
|
||||||
before_sleep_cmd = loginctl lock-session # lock before suspend.
|
before_sleep_cmd = loginctl lock-session # lock before suspend.
|
||||||
after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display.
|
after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display.
|
||||||
|
on_unlock_cmd = omarchy-restart-waybar # prevent stacking of waybar when waking
|
||||||
inhibit_sleep = 3 # wait until screen is locked
|
inhibit_sleep = 3 # wait until screen is locked
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -88,7 +88,6 @@
|
|||||||
"tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
|
"tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
|
||||||
"tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
|
"tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
|
||||||
"interval": 5,
|
"interval": 5,
|
||||||
"on-click": "omarchy-menu power",
|
|
||||||
"states": {
|
"states": {
|
||||||
"warning": 20,
|
"warning": 20,
|
||||||
"critical": 10
|
"critical": 10
|
||||||
|
|||||||
@@ -52,6 +52,9 @@ source $OMARCHY_INSTALL/login/plymouth.sh
|
|||||||
source $OMARCHY_INSTALL/login/limine-snapper.sh
|
source $OMARCHY_INSTALL/login/limine-snapper.sh
|
||||||
source $OMARCHY_INSTALL/login/alt-bootloaders.sh
|
source $OMARCHY_INSTALL/login/alt-bootloaders.sh
|
||||||
|
|
||||||
|
# Pin bad packages
|
||||||
|
sudo pacman -U --noconfirm https://pkgs.omarchy.org/x86_64/abseil-cpp-20250512.1-1-x86_64.pkg.tar.zst
|
||||||
|
|
||||||
# Reboot
|
# Reboot
|
||||||
clear
|
clear
|
||||||
tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch
|
tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Copy over the keyboard layout that's been set in Arch during install to Hyprland
|
# Copy over the keyboard layout that's been set in Arch during install to Hyprland
|
||||||
conf="/etc/vconsole.conf"
|
conf="/etc/vconsole.conf"
|
||||||
hyprconf="$HOME/.config/hypr/input.conf"
|
hyprconf="$HOME/.config/hypr/hyprland.conf"
|
||||||
|
|
||||||
layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
|
layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
|
||||||
variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
|
variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
# This can happen if archinstall used ethernet
|
# This can happen if archinstall used ethernet
|
||||||
if ! command -v iwctl &>/dev/null; then
|
if ! command -v iwctl &>/dev/null; then
|
||||||
sudo pacman -S --noconfirm --needed iwd
|
sudo pacman -S --noconfirm --needed iwd
|
||||||
sudo systemctl enable iwd.service
|
chrootable_systemctl_enable iwd.service
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Prevent systemd-networkd-wait-online timeout on boot
|
# Prevent systemd-networkd-wait-online timeout on boot
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# force package database refresh
|
# force package database refresh
|
||||||
sudo pacman -Syu --noconfirm
|
sudo pacman -Syu
|
||||||
|
|
||||||
# Install packages
|
# Install packages
|
||||||
PACKAGES_TO_INSTALL=(
|
PACKAGES_TO_INSTALL=(
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
abseil-cpp
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
https://pkgs.omarchy.org/x86_64/abseil-cpp-20250512.1-1-x86_64.pkg.tar.zst
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ sudo pacman -S --noconfirm --needed \
|
|||||||
tldr \
|
tldr \
|
||||||
tree-sitter-cli \
|
tree-sitter-cli \
|
||||||
ttf-cascadia-mono-nerd \
|
ttf-cascadia-mono-nerd \
|
||||||
|
ttf-font-awesome \
|
||||||
ttf-ia-writer \
|
ttf-ia-writer \
|
||||||
ttf-jetbrains-mono \
|
ttf-jetbrains-mono \
|
||||||
typora \
|
typora \
|
||||||
@@ -112,7 +113,6 @@ sudo pacman -S --noconfirm --needed \
|
|||||||
wl-clip-persist \
|
wl-clip-persist \
|
||||||
wl-clipboard \
|
wl-clipboard \
|
||||||
wl-screenrec \
|
wl-screenrec \
|
||||||
woff2-font-awesome \
|
|
||||||
xdg-desktop-portal-gtk \
|
xdg-desktop-portal-gtk \
|
||||||
xdg-desktop-portal-hyprland \
|
xdg-desktop-portal-hyprland \
|
||||||
xmlstarlet \
|
xmlstarlet \
|
||||||
|
|||||||
@@ -8,9 +8,9 @@ if ! grep -q "ILoveCandy" /etc/pacman.conf; then
|
|||||||
sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf
|
sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Add the Omarchy repository
|
# Add the Omarchy repository as first choice
|
||||||
if ! grep -q "omarchy" /etc/pacman.conf; then
|
if ! grep -q "omarchy" /etc/pacman.conf; then
|
||||||
echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch/\n" | sudo tee -a /etc/pacman.conf >/dev/null
|
sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\/\n' /etc/pacman.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Set mirrors to global ones only
|
# Set mirrors to global ones only
|
||||||
@@ -36,4 +36,4 @@ if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Refresh all repos
|
# Refresh all repos
|
||||||
sudo pacman -Syu --noconfirm
|
sudo pacman -Syu
|
||||||
|
|||||||
@@ -3,5 +3,5 @@ echo "Add Omarchy Package Repository"
|
|||||||
if ! grep -q "omarchy" /etc/pacman.conf; then
|
if ! grep -q "omarchy" /etc/pacman.conf; then
|
||||||
sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\/\n' /etc/pacman.conf
|
sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\/\n' /etc/pacman.conf
|
||||||
sudo systemctl restart systemd-timesyncd
|
sudo systemctl restart systemd-timesyncd
|
||||||
sudo pacman -Syu --noconfirm
|
sudo pacman -Syu
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ if [[ "$(uname -m)" == "x86_64" ]] && ! grep -q '^\[chaotic-aur\]' /etc/pacman.c
|
|||||||
echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
|
echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
|
||||||
|
|
||||||
# Refresh pacman package databases
|
# Refresh pacman package databases
|
||||||
sudo pacman -Syu --noconfirm
|
sudo pacman -Syu
|
||||||
else
|
else
|
||||||
echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
|
echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
echo "Checking and correcting Snapper configs if needed"
|
|
||||||
if command -v snapper &>/dev/null; then
|
|
||||||
if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then
|
|
||||||
sudo snapper -c root create-config /
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! sudo snapper list-configs 2>/dev/null | grep -q "home"; then
|
|
||||||
sudo snapper -c home create-config /home
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
echo "Move Omarchy Package Repository after Arch core/extra/multilib for extra security on resolution"
|
|
||||||
|
|
||||||
sudo cp /etc/pacman.conf /etc/pacman.conf.bak
|
|
||||||
sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf
|
|
||||||
sudo sed -i '/\[chaotic-aur\]/i\[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/\n' /etc/pacman.conf ||
|
|
||||||
sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/" >> /etc/pacman.conf'
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
echo "Update About config to include the Omarchy branch name"
|
|
||||||
|
|
||||||
omarchy-refresh-fastfetch
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
# FIXME: This really shouldn't happen, need to find out why!
|
|
||||||
echo "Ensure walker is present"
|
|
||||||
|
|
||||||
sudo pacman -Syu --needed --noconfirm walker-bin
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
echo "Stop restarting waybar on unlock to see if we have solved the stacking problem for good"
|
|
||||||
|
|
||||||
omarchy-refresh-hypridle
|
|
||||||
Reference in New Issue
Block a user