mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Compare commits
17 Commits
v2.0.2
...
follow-arc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fc82476f24 | ||
|
|
dd719051cb | ||
|
|
18aef9fd86 | ||
|
|
3d1e9ced81 | ||
|
|
c677098165 | ||
|
|
ca455c434a | ||
|
|
2e8a57fac4 | ||
|
|
20ab2ee81e | ||
|
|
4cbc8eef43 | ||
|
|
e5927fc1b2 | ||
|
|
175066ecba | ||
|
|
cf4e1c0eb7 | ||
|
|
b264c6540a | ||
|
|
90cdbd5504 | ||
|
|
147242cbba | ||
|
|
c09ac13f90 | ||
|
|
ec85068c67 |
@@ -6,7 +6,7 @@ if [[ -z "$1" ]]; then
|
||||
fi
|
||||
|
||||
install_php() {
|
||||
sudo pacman -Sy php composer php-sqlite --noconfirm
|
||||
sudo pacman -S php composer php-sqlite --noconfirm
|
||||
|
||||
# Install Path for Composer
|
||||
if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
|
||||
echo "Adding multilib repository for 32-bit compatibility"
|
||||
sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
|
||||
sudo pacman -Sy
|
||||
|
||||
echo "Now pick dependencies matching your graphics card"
|
||||
sudo pacman -S steam
|
||||
sudo pacman -Syu steam
|
||||
setsid gtk-launch steam >/dev/null 2>&1 &
|
||||
|
||||
4
bin/omarchy-launch-floating-terminal-with-presentation
Executable file
4
bin/omarchy-launch-floating-terminal-with-presentation
Executable file
@@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
cmd="$*"
|
||||
setsid alacritty --class Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
|
||||
@@ -26,7 +26,7 @@ terminal() {
|
||||
}
|
||||
|
||||
present_terminal() {
|
||||
alacritty --class Omarchy -e bash -c "omarchy-show-logo; eval \"$1\"; omarchy-show-done;"
|
||||
omarchy-launch-floating-terminal-with-presentation $1
|
||||
}
|
||||
|
||||
edit_in_nvim() {
|
||||
@@ -35,23 +35,23 @@ edit_in_nvim() {
|
||||
}
|
||||
|
||||
install() {
|
||||
present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2"
|
||||
present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2"
|
||||
}
|
||||
|
||||
install_and_launch() {
|
||||
present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2 && setsid gtk-launch $3"
|
||||
present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2 && setsid gtk-launch $3"
|
||||
}
|
||||
|
||||
install_font() {
|
||||
present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
|
||||
present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
|
||||
}
|
||||
|
||||
aur_install() {
|
||||
present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2"
|
||||
present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2"
|
||||
}
|
||||
|
||||
aur_install_and_launch() {
|
||||
present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2 && setsid gtk-launch $3"
|
||||
present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2 && setsid gtk-launch $3"
|
||||
}
|
||||
|
||||
show_learn_menu() {
|
||||
|
||||
@@ -18,7 +18,7 @@ pkg_names=$(yay -Slqa | fzf "${fzf_args[@]}")
|
||||
|
||||
if [[ -n "$pkg_names" ]]; then
|
||||
# Convert newline-separated selections to space-separated for yay
|
||||
echo "$pkg_names" | tr '\n' ' ' | xargs yay -Sy --noconfirm
|
||||
echo "$pkg_names" | tr '\n' ' ' | xargs yay -S --noconfirm
|
||||
sudo updatedb
|
||||
omarchy-show-done
|
||||
fi
|
||||
|
||||
@@ -14,12 +14,11 @@ fzf_args=(
|
||||
--color 'pointer:green,marker:green'
|
||||
)
|
||||
|
||||
sudo pacman -Sy
|
||||
pkg_names=$(pacman -Slq | fzf "${fzf_args[@]}")
|
||||
|
||||
if [[ -n "$pkg_names" ]]; then
|
||||
# Convert newline-separated selections to space-separated for yay
|
||||
echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -Sy --noconfirm
|
||||
echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -S --noconfirm
|
||||
sudo updatedb
|
||||
omarchy-show-done
|
||||
fi
|
||||
|
||||
3
bin/omarchy-refresh-fastfetch
Executable file
3
bin/omarchy-refresh-fastfetch
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
omarchy-refresh-config fastfetch/config.jsonc
|
||||
@@ -1,13 +1,18 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Ensure remote is reachable
|
||||
if ! git -C "$OMARCHY_PATH" ls-remote &>/dev/null; then
|
||||
echo "Error: Unable to reach remote repository."
|
||||
# Get remote tag
|
||||
latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
|
||||
if [[ -z "$latest_tag" ]]; then
|
||||
echo "Error: Could not retrieve latest tag."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
|
||||
# Get local tag
|
||||
current_tag=$(git -C "$OMARCHY_PATH" describe --tags $(git -C "$OMARCHY_PATH" rev-list --tags --max-count=1))
|
||||
if [[ -z "$current_tag" ]]; then
|
||||
echo "Error: Could not retrieve current tag."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "$current_tag" != "$latest_tag" ]]; then
|
||||
echo "Omarchy update available ($latest_tag)"
|
||||
|
||||
2
boot.sh
2
boot.sh
@@ -14,7 +14,7 @@ ansi_art=' ▄▄▄
|
||||
clear
|
||||
echo -e "\n$ansi_art\n"
|
||||
|
||||
sudo pacman -Sy --noconfirm --needed git
|
||||
sudo pacman -Syu --noconfirm --needed git
|
||||
|
||||
# Use custom repo if specified, otherwise default to basecamp/omarchy
|
||||
OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
"type": "command",
|
||||
"key": "\ue900 OS",
|
||||
"keyColor": "blue",
|
||||
"text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"Omarchy $version\""
|
||||
"text": "version=$(omarchy-version); echo \"Omarchy $version\""
|
||||
},
|
||||
{
|
||||
"type": "kernel",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
$terminal = uwsm app -- alacritty
|
||||
$browser = omarchy-launch-browser
|
||||
|
||||
bindd = SUPER, return, Terminal, exec, $terminal --working-directory $(omarchy-cmd-terminal-cwd)
|
||||
bindd = SUPER, return, Terminal, exec, $terminal --working-directory=$(omarchy-cmd-terminal-cwd)
|
||||
bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
|
||||
bindd = SUPER, B, Browser, exec, $browser
|
||||
bindd = SUPER, M, Music, exec, uwsm app -- spotify
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
"custom/update": {
|
||||
"format": "",
|
||||
"exec": "omarchy-update-available",
|
||||
"on-click": "alacritty --class Omarchy --title Omarchy -e omarchy-update",
|
||||
"on-click": "omarchy-launch-floating-terminal-with-presentation omarchy-update",
|
||||
"tooltip-format": "Omarchy update available",
|
||||
"interval": 3600
|
||||
},
|
||||
|
||||
@@ -36,7 +36,7 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then
|
||||
fi
|
||||
|
||||
# force package database refresh
|
||||
sudo pacman -Syy
|
||||
sudo pacman -Syu
|
||||
|
||||
# Install packages
|
||||
PACKAGES_TO_INSTALL=(
|
||||
|
||||
0
install/config/localdb.sh
Normal file → Executable file
0
install/config/localdb.sh
Normal file → Executable file
@@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Install build tools
|
||||
sudo pacman -Sy --needed --noconfirm base-devel
|
||||
sudo pacman -S --needed --noconfirm base-devel
|
||||
|
||||
# Add fun and color and verbosity to the pacman installer
|
||||
if ! grep -q "ILoveCandy" /etc/pacman.conf; then
|
||||
@@ -30,16 +30,10 @@ if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ]; then
|
||||
if ! grep -q "chaotic-aur" /etc/pacman.conf; then
|
||||
echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
|
||||
fi
|
||||
|
||||
# Refresh all repos
|
||||
sudo pacman -Sy
|
||||
else
|
||||
echo -e "Failed to install Chaotic-AUR, so won't include it in pacman config!"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Allow repository index updates without sudo
|
||||
sudo tee /etc/sudoers.d/repositories >/dev/null <<EOF
|
||||
$USER ALL=(ALL) NOPASSWD: /usr/bin/pacman -Sy
|
||||
EOF
|
||||
sudo chmod 440 /etc/sudoers.d/repositories
|
||||
# Refresh all repos
|
||||
sudo pacman -Syu
|
||||
|
||||
@@ -3,5 +3,5 @@ echo "Add Omarchy Package Repository"
|
||||
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 systemctl restart systemd-timesyncd
|
||||
sudo pacman -Sy
|
||||
sudo pacman -Syu
|
||||
fi
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
echo "Install Plymouth splash screen"
|
||||
|
||||
sudo pacman -Sy --needed --noconfirm uwsm plymouth
|
||||
sudo pacman -S --needed --noconfirm uwsm plymouth
|
||||
source "$HOME/.local/share/omarchy/install/login/plymouth.sh"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
echo "Replace wofi with walker as the default launcher"
|
||||
|
||||
if ! command -v walker &>/dev/null; then
|
||||
sudo pacman -Sy --noconfirm --needed walker-bin libqalculate
|
||||
sudo pacman -S --noconfirm --needed walker-bin libqalculate
|
||||
|
||||
sudo pacman -Rns --noconfirm wofi
|
||||
rm -rf ~/.config/wofi
|
||||
|
||||
@@ -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
|
||||
|
||||
# Refresh pacman package databases
|
||||
sudo pacman -Sy
|
||||
sudo pacman -Syu
|
||||
else
|
||||
echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
|
||||
fi
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
echo "Add xmlstarlet needed for updating fonts via Omarchy menu"
|
||||
|
||||
sudo pacman -Sy --noconfirm --needed xmlstarlet
|
||||
sudo pacman -S --noconfirm --needed xmlstarlet
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
echo "Update and restart Walker to resolve stuck Omarchy menu"
|
||||
|
||||
sudo pacman -Sy --noconfirm walker-bin
|
||||
sudo pacman -Syu --noconfirm walker-bin
|
||||
omarchy-restart-walker
|
||||
|
||||
@@ -11,7 +11,7 @@ set_theme_colors() {
|
||||
|
||||
if command -v chromium &>/dev/null; then
|
||||
sudo pacman -Rns --noconfirm chromium || true
|
||||
sudo pacman -Sy --noconfirm omarchy-chromium
|
||||
sudo pacman -S --noconfirm omarchy-chromium
|
||||
|
||||
if pgrep -x chromium; then
|
||||
if gum confirm "Chromium must be restarted. Ready?"; then
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
echo "Ensure latest uwsm is installed"
|
||||
|
||||
sudo pacman -Sy --noconfirm uwsm
|
||||
sudo pacman -Syu --noconfirm uwsm
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
echo "Use current terminal shell cwd for new terminal working directories"
|
||||
|
||||
sed -i 's|bindd = SUPER, return, Terminal, exec, \$terminal|bindd = SUPER, return, Terminal, exec, $terminal --working-directory $(omarchy-cmd-terminal-cwd)|' ~/.config/hypr/bindings.conf
|
||||
if ! grep -q "working-directory" ~/.config/hypr/bindings.conf; then
|
||||
sed -i '/bindd = SUPER, return, Terminal, exec, \$terminal/ s|$| --working-directory=$(omarchy-cmd-terminal-cwd)|' ~/.config/hypr/bindings.conf
|
||||
fi
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
echo "Allow pacman -Sy without sudo to easier installs"
|
||||
|
||||
sudo tee /etc/sudoers.d/repositories >/dev/null <<EOF
|
||||
$USER ALL=(ALL) NOPASSWD: /usr/bin/pacman -Sy
|
||||
EOF
|
||||
sudo chmod 440 /etc/sudoers.d/repositories
|
||||
3
migrations/1756300740.sh
Normal file
3
migrations/1756300740.sh
Normal file
@@ -0,0 +1,3 @@
|
||||
echo "Remove no-longer-needed sudoless package listing updates"
|
||||
|
||||
sudo rm -f /etc/sudoers.d/repositories
|
||||
Reference in New Issue
Block a user