diff --git a/bin/omarchy b/bin/omarchy index 1fc29ff..092a276 100755 --- a/bin/omarchy +++ b/bin/omarchy @@ -24,12 +24,13 @@ main_menu() { update_menu() { show_ascii_art - local menu=("Omarchy" "Waybar" "Walker" "Plymouth" "Desktop apps" "Back") + local menu=("Omarchy" "Waybar" "Walker" "Plymouth" "SwayOSD" "Desktop apps" "Back") local commands=( "omarchy-update" "omarchy-refresh-waybar" "omarchy-refresh-walker" "omarchy-refresh-plymouth" + "omarchy-refresh-swayosd" "omarchy-refresh-applications" "main_menu" ) diff --git a/bin/omarchy-refresh-swayosd b/bin/omarchy-refresh-swayosd new file mode 100755 index 0000000..c0ef9d6 --- /dev/null +++ b/bin/omarchy-refresh-swayosd @@ -0,0 +1,13 @@ +#!/bin/bash + +cp -f ~/.config/swayosd/config.toml ~/.config/swayosd/config.toml.back 2>/dev/null +cp -f ~/.local/share/omarchy/config/walker/config.toml ~/.config/swayosd 2>/dev/null + +if cmp -s ~/.config/swayosd/config.toml.bak ~/.config/swayosd/config.toml; then + rm ~/.config/swayosd//config.toml.bak +else + echo -e "\e[31mExisting .config/swayosd/config.toml replaced with new Omarchy default, but a .bak file was made.\e[0m" +fi + +pkill swayosd-server +uwsm app -- swayosd-server --gapplication-service & diff --git a/bin/omarchy-theme-set b/bin/omarchy-theme-set index def6105..88ffd43 100755 --- a/bin/omarchy-theme-set +++ b/bin/omarchy-theme-set @@ -46,6 +46,7 @@ pkill -SIGUSR2 btop # Restart components to apply new theme pkill -SIGUSR2 waybar +pkill -SIGUSR2 swayosd-server makoctl reload hyprctl reload diff --git a/config/swayosd/config.toml b/config/swayosd/config.toml new file mode 100644 index 0000000..694ab07 --- /dev/null +++ b/config/swayosd/config.toml @@ -0,0 +1,4 @@ +[server] +show_percentage = true +max_volume = 150 +style = "./style.css" diff --git a/config/swayosd/style.css b/config/swayosd/style.css new file mode 100644 index 0000000..544b6cb --- /dev/null +++ b/config/swayosd/style.css @@ -0,0 +1,28 @@ +@import "../omarchy/current/theme/swayosd.css"; + +window { + border-radius: 0; + opacity: 0.97; + border: 2px solid @border-color; + + background-color: @background-color; +} + +label { + font-family: 'CaskaydiaMono Nerd Font', monospace; + font-size: 11pt; + + color: @label; +} + +image { + color: @image; +} + +progressbar { + border-radius: 0; +} + +progress { + background-color: @progress; +} diff --git a/migrations/1753224615.sh b/migrations/1753224615.sh new file mode 100755 index 0000000..dc1b0ec --- /dev/null +++ b/migrations/1753224615.sh @@ -0,0 +1,6 @@ +echo "Adding SwayOSD" + +if [[ ! -d ~/.config/swayosd ]]; then + mkdir -p ~/.config/swayosd + cp -r ~/.local/share/omarchy/config/swayosd/* ~/.config/swayosd/ +fi diff --git a/themes/catppuccin-latte/swayosd.css b/themes/catppuccin-latte/swayosd.css new file mode 100644 index 0000000..5b0eaea --- /dev/null +++ b/themes/catppuccin-latte/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #eff1f5; +@define-color border-color #4c4f69; +@define-color label #4c4f69; +@define-color image #4c4f69; +@define-color progress #4c4f69; + diff --git a/themes/catppuccin/swayosd.css b/themes/catppuccin/swayosd.css new file mode 100644 index 0000000..a25d38a --- /dev/null +++ b/themes/catppuccin/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #24273a; +@define-color border-color #c6d0f5; +@define-color label #c6d0f5; +@define-color image #c6d0f5; +@define-color progress #c6d0f5; + diff --git a/themes/everforest/swayosd.css b/themes/everforest/swayosd.css new file mode 100644 index 0000000..f0bff40 --- /dev/null +++ b/themes/everforest/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #2d353b; +@define-color border-color #d3c6aa; +@define-color label #d3c6aa; +@define-color image #d3c6aa; +@define-color progress #d3c6aa; + diff --git a/themes/gruvbox/swayosd.css b/themes/gruvbox/swayosd.css new file mode 100644 index 0000000..614748f --- /dev/null +++ b/themes/gruvbox/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #282828; +@define-color border-color #ebdbb2; +@define-color label #ebdbb2; +@define-color image #ebdbb2; +@define-color progress #ebdbb2; + diff --git a/themes/kanagawa/swayosd.css b/themes/kanagawa/swayosd.css new file mode 100644 index 0000000..1eb5c85 --- /dev/null +++ b/themes/kanagawa/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #1f1f28; +@define-color border-color #dcd7ba; +@define-color label #dcd7ba; +@define-color image #dcd7ba; +@define-color progress #dcd7ba; + diff --git a/themes/matte-black/swayosd.css b/themes/matte-black/swayosd.css new file mode 100644 index 0000000..08c28d7 --- /dev/null +++ b/themes/matte-black/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #121212; +@define-color border-color #EAEAEA; +@define-color label #EAEAEA; +@define-color image #EAEAEA; +@define-color progress #EAEAEA; + diff --git a/themes/nord/swayosd.css b/themes/nord/swayosd.css new file mode 100644 index 0000000..db1b40d --- /dev/null +++ b/themes/nord/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #2E3440; +@define-color border-color #D8DEE9; +@define-color label #D8DEE9; +@define-color image #D8DEE9; +@define-color progress #D8DEE9; + diff --git a/themes/rose-pine/swayosd.css b/themes/rose-pine/swayosd.css new file mode 100644 index 0000000..e58cc08 --- /dev/null +++ b/themes/rose-pine/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #faf4ed; +@define-color border-color #575279; +@define-color label #575279; +@define-color image #575279; +@define-color progress #575279; + diff --git a/themes/tokyo-night/swayosd.css b/themes/tokyo-night/swayosd.css new file mode 100644 index 0000000..14c0dcd --- /dev/null +++ b/themes/tokyo-night/swayosd.css @@ -0,0 +1,6 @@ +@define-color background-color #1a1b26; +@define-color border-color #33ccff; +@define-color label #33ccff; +@define-color image #33ccff; +@define-color progress #33ccff; +