11 Commits

Author SHA1 Message Date
5d09154079 Start walker service after doing installation 2025-07-20 22:19:22 -05:00
f083d3e9ec fix the low contrast colors for comments in NeoVim for matte black theme (#268) 2025-07-20 22:00:48 -05:00
f60e66cfdf Move Dropbox to a setup script 2025-07-20 21:51:46 -05:00
fcf00494bb Now that Dropbox has its own service starter, use another example 2025-07-20 21:43:29 -05:00
e7da208505 Fix using backgrounds from inside the themes 2025-07-20 21:30:06 -05:00
3415fef297 Go back to just always updating system packages
Otherwise we can't depend on having the same minimum versions
2025-07-20 21:24:10 -05:00
61a7aee377 Ensure this isnt run over and over also 2025-07-20 21:21:28 -05:00
f781a805c9 Install missing Dropbox dependencies if Dropbox is there 2025-07-20 21:19:34 -05:00
9c01775287 Better to use the refresh commands so you don't forget to write the migration 2025-07-20 21:16:04 -05:00
b8b3548019 Update waybar.css to fix waybar dancing workspace numbers with a migration 2025-07-20 21:09:07 -05:00
3634235eee Move from permission setup to .bak process
Means less interaction for folks just riding on the default train
without overwriting the work of people who've made changes.
2025-07-20 21:07:59 -05:00
15 changed files with 67 additions and 31 deletions

View File

@ -105,8 +105,9 @@ remove_theme_prompt() {
setup_menu() { setup_menu() {
show_ascii_art show_ascii_art
local menu=("Add fingerprint sensor" "Remove fingerprint sensor" "Add Fido2 device" "Remove Fido2 device" "Back") local menu=("Dropbox" "Add fingerprint sensor" "Remove fingerprint sensor" "Add Fido2 device" "Remove Fido2 device" "Back")
local commands=( local commands=(
"omarchy-setup-dropbox"
"omarchy-setup-fingerprint" "omarchy-setup-fingerprint"
"omarchy-setup-fingerprint --remove" "omarchy-setup-fingerprint --remove"
"omarchy-setup-fido2" "omarchy-setup-fido2"

View File

@ -1,7 +0,0 @@
#!/bin/bash
# Link all the key config files to omarchy's internal versions for quicker testing
ln -nsf ~/.local/share/omarchy/config/hypr/hyprland.conf ~/.config/hypr/
ln -nsf ~/.local/share/omarchy/config/hypr/hypridle.conf ~/.config/hypr/
ln -nsf ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/
ln -nsf ~/.local/share/omarchy/config/waybar/config.jsonc ~/.config/waybar/

View File

@ -1,5 +1,11 @@
#!/bin/bash #!/bin/bash
# Overwrite local Hyprlock settings with the latest in Omarchy, but create a backup # Overwrite local Hyprlock settings with the latest in Omarchy, but create a backup if it differs
cp -f ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak 2>/dev/null cp -f ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak 2>/dev/null
cp -f ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/ 2>/dev/null cp -f ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/ 2>/dev/null
if cmp -s ~/.config/hypr/hyprlock.conf.bak ~/.config/hypr/hyprlock.conf; then
rm ~/.config/hypr/hyprlock.conf.bak
else
echo -e "\e[31mExisting .config/hypr/hyprlock.conf replaced with new Omarchy default, but a .bak file was made.\e[0m"
fi

View File

@ -1,5 +1,10 @@
#!/bin/bash #!/bin/bash
if [[ "$1" == "-y" ]] || gum confirm "Refresh Walker config? This will replace your current settings with Omarchy defaults."; then cp -f ~/.config/walker/config.toml ~/.config/walker/config.toml.bak 2>/dev/null
cp -f ~/.local/share/omarchy/config/walker/config.toml ~/.config/walker/ 2>/dev/null cp -f ~/.local/share/omarchy/config/walker/config.toml ~/.config/walker/ 2>/dev/null
if cmp -s ~/.config/walker/config.toml.bak ~/.config/walker/config.toml; then
rm ~/.config/walker/config.toml.bak
else
echo -e "\e[31mExisting .config/walker/config.toml replaced with new Omarchy default, but a .bak file was made.\e[0m"
fi fi

View File

@ -1,10 +1,25 @@
#!/bin/bash #!/bin/bash
if gum confirm "Refresh Waybar config? This will replace your current settings with Omarchy defaults."; then # Backup existing settings
# Overwrite local waybar settings with the latest in Omarchy cp -f ~/.config/waybar/config.jsonc ~/.config/waybar/config.jsonc.bak 2>/dev/null
cp -f ~/.local/share/omarchy/config/waybar/config.jsonc ~/.config/waybar/ 2>/dev/null cp -f ~/.config/waybar/style.css ~/.config/waybar/style.css.bak 2>/dev/null
cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
# Restart waybar # Overwrite local waybar settings with the latest in Omarchy
pkill -SIGUSR2 waybar cp -f ~/.local/share/omarchy/config/waybar/config.jsonc ~/.config/waybar/ 2>/dev/null
cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
# Remove identical backup files
if cmp -s ~/.config/waybar/config.jsonc.bak ~/.config/waybar/config.jsonc; then
rm ~/.config/waybar/config.jsonc.bak
else
echo -e "\e[31mExisting .config/waybar/config.jsonc replaced with new Omarchy default, but a .bak file was made.\e[0m"
fi fi
if cmp -s ~/.config/waybar/style.css.bak ~/.config/waybar/style.css; then
rm ~/.config/waybar/style.css.bak
else
echo -e "\e[31mExisting .config/waybar/style.css replaced with new Omarchy default, but a .bak file was made.\e[0m"
fi
# Restart waybar
pkill -SIGUSR2 waybar

8
bin/omarchy-setup-dropbox Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
echo "Installing all dependencies..."
yay -S --noconfirm --needed \
dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
echo "Starting Dropbox and asking for identification..."
uwsm app -- dropbox start -i &>/dev/null &

View File

@ -2,7 +2,7 @@
# Cycles through the background images available # Cycles through the background images available
BACKGROUNDS_DIR="$HOME/.config/omarchy/current/backgrounds/" BACKGROUNDS_DIR="$HOME/.config/omarchy/current/theme/backgrounds/"
CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background" CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
mapfile -d '' -t BACKGROUNDS < <(find "$BACKGROUNDS_DIR" -type f -print0 | sort -z) mapfile -d '' -t BACKGROUNDS < <(find "$BACKGROUNDS_DIR" -type f -print0 | sort -z)

View File

@ -26,5 +26,5 @@ done
# Back to where we came from # Back to where we came from
cd - >/dev/null cd - >/dev/null
echo -e "" # Update system packages
gum confirm "Update system packages too?" && yay -Syu --noconfirm yay -Syu --noconfirm

View File

@ -45,7 +45,7 @@ bind = SUPER, X, exec, $webapp="https://x.com/"
bind = SUPER SHIFT, X, exec, $webapp="https://x.com/compose/post" bind = SUPER SHIFT, X, exec, $webapp="https://x.com/compose/post"
# Extra autostart processes # Extra autostart processes
# exec-once = dropbox-cli start # exec-once = uwsm app -- my-service
# Extra env variables # Extra env variables
# Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch) # Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch)

View File

@ -12,9 +12,6 @@ if [ -z "$OMARCHY_BARE" ]; then
echo -e "\e[31mFailed to install $pkg. Continuing without!\e[0m" echo -e "\e[31mFailed to install $pkg. Continuing without!\e[0m"
done done
yay -S --noconfirm --needed dropbox libappindicator-gtk3 python-gpgme nautilus-dropbox ||
echo -e "\e[31mFailed to install Dropbox. Continuing without!\e[0m"
yay -S --noconfirm --needed 1password-beta 1password-cli || yay -S --noconfirm --needed 1password-beta 1password-cli ||
echo -e "\e[31mFailed to install 1password. Continuing without!\e[0m" echo -e "\e[31mFailed to install 1password. Continuing without!\e[0m"
fi fi

View File

@ -1,14 +1,10 @@
echo "Enable battery low notifications for laptops" echo "Enable battery low notifications for laptops"
if ls /sys/class/power_supply/BAT* &>/dev/null; then if ls /sys/class/power_supply/BAT* &>/dev/null && [[ ! -f ~/.local/share/omarchy/config/systemd/user/omarchy-battery-monitor.service ]]; then
mkdir -p ~/.config/systemd/user mkdir -p ~/.config/systemd/user
cp ~/.local/share/omarchy/config/systemd/user/omarchy-battery-monitor.* ~/.config/systemd/user/ cp ~/.local/share/omarchy/config/systemd/user/omarchy-battery-monitor.* ~/.config/systemd/user/
systemctl --user daemon-reload systemctl --user daemon-reload
systemctl --user enable --now omarchy-battery-monitor.timer || true systemctl --user enable --now omarchy-battery-monitor.timer || true
echo "Battery monitoring enabled - you'll receive notifications at 10% battery"
else
echo "No battery detected - skipping battery monitor setup"
fi fi

View File

@ -8,4 +8,6 @@ if ! command -v walker &>/dev/null; then
mkdir -p ~/.config/walker mkdir -p ~/.config/walker
cp -r ~/.local/share/omarchy/config/walker/* ~/.config/walker/ cp -r ~/.local/share/omarchy/config/walker/* ~/.config/walker/
uwsm app -- walker --gapplication-service
fi fi

5
migrations/1753062084.sh Normal file
View File

@ -0,0 +1,5 @@
echo "Fix dancing workspace numbers in Waybar"
if ! grep -q 'min-width: 9px' ~/.config/waybar/style.css; then
omarchy-refresh-waybar
fi

6
migrations/1753064164.sh Normal file
View File

@ -0,0 +1,6 @@
echo "Add missing Dropbox dependencies"
# Dropbox is still there, but the dependencies aren't yet
if command -v dropbox-cli &>/dev/null && ! pacman -Q libappindicator-gtk3 &>/dev/null; then
yay -S --noconfirm --needed dropbox libappindicator-gtk3 python-gpgme nautilus-dropbox
fi

View File

@ -16,10 +16,10 @@ return {
local matte_black_palette = { local matte_black_palette = {
-- Base "Matte Black" Palette Overrides -- Base "Matte Black" Palette Overrides
bg0 = "#0D0D0D", bg1 = "#121212", bg2 = "#1E1E1E", bg3 = "#2C2C2C", bg4 = "#333333", bg0 = "#0D0D0D", bg1 = "#121212", bg2 = "#1E1E1E", bg3 = "#2C2C2C", bg4 = "#333333",
fg0 = "#FFFFFF", fg1 = "#BEBEBE", fg2 = "#BEBEBE", fg3 = "#8A8A8D", fg0 = "#FFFFFF", fg1 = "#EAEAEA", fg2 = "#BEBEBE", fg3 = "#8A8A8D",
sel0 = "#2C2C2C", sel0 = "#2C2C2C",
sel1 = c.from_hex("#2C2C2C"):blend(c.from_hex("#F59E0B"), 0.2):to_css(), sel1 = c.from_hex("#2C2C2C"):blend(c.from_hex("#F59E0B"), 0.2):to_css(),
comment = "#333333", comment = "#8A8A8D",
red = Shade.new("#D35F5F", c.from_hex("#D35F5F"):lighten(8):to_css(), "#B91C1C"), red = Shade.new("#D35F5F", c.from_hex("#D35F5F"):lighten(8):to_css(), "#B91C1C"),
orange = Shade.new("#F59E0B", "#FFC107", c.from_hex("#F59E0B"):lighten(-8):to_css()), orange = Shade.new("#F59E0B", "#FFC107", c.from_hex("#F59E0B"):lighten(-8):to_css()),
yellow = Shade.new("#FFC107", c.from_hex("#FFC107"):lighten(10):to_css(), "#F59E0B"), yellow = Shade.new("#FFC107", c.from_hex("#FFC107"):lighten(10):to_css(), "#F59E0B"),
@ -82,6 +82,8 @@ return {
Whitespace = { fg = "palette.black.bright" }, Whitespace = { fg = "palette.black.bright" },
NonText = { fg = "palette.black.bright" }, NonText = { fg = "palette.black.bright" },
IncSearch = { bg = "palette.sel1" }, IncSearch = { bg = "palette.sel1" },
CursorLine = { bg = "palette.bg2" },
Normal = { fg = "palette.fg1" },
-- Noice Cmdline Overrides -- Noice Cmdline Overrides
NoiceCmdlinePopupBorder = { fg = "palette.fg3" }, NoiceCmdlinePopupBorder = { fg = "palette.fg3" },