diff --git a/migrations/1751887718.sh b/migrations/1751887718.sh index 3d3f401b..6a94fc7c 100644 --- a/migrations/1751887718.sh +++ b/migrations/1751887718.sh @@ -2,5 +2,4 @@ echo "Install Impala as new wifi selection TUI" if omarchy-cmd-missing impala; then omarchy-pkg-add impala - omarchy-refresh-waybar fi diff --git a/migrations/1752725616.sh b/migrations/1752725616.sh index 5afc394b..8e2fe084 100644 --- a/migrations/1752725616.sh +++ b/migrations/1752725616.sh @@ -7,8 +7,6 @@ if [[ -f ~/.local/share/applications/blueberry.desktop ]]; then gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark" - - omarchy-refresh-waybar fi if [[ ! -L $HOME/.config/omarchy/themes/rose-pine ]]; then diff --git a/migrations/1752793122.sh b/migrations/1752793122.sh deleted file mode 100644 index 9429d92b..00000000 --- a/migrations/1752793122.sh +++ /dev/null @@ -1,5 +0,0 @@ -echo "Rename waybar config file for syntax highlighting" - -if [[ -f ~/.config/waybar/config ]]; then - mv ~/.config/waybar/config ~/.config/waybar/config.jsonc -fi diff --git a/migrations/1752896442.sh b/migrations/1752896442.sh index f8fa9a8c..0edb42c5 100644 --- a/migrations/1752896442.sh +++ b/migrations/1752896442.sh @@ -4,5 +4,4 @@ if omarchy-cmd-missing wiremix; then omarchy-pkg-add wiremix omarchy-pkg-drop pavucontrol omarchy-refresh-applications - omarchy-refresh-waybar fi diff --git a/migrations/1753495989.sh b/migrations/1753495989.sh index 119b4324..85e1a61e 100644 --- a/migrations/1753495989.sh +++ b/migrations/1753495989.sh @@ -2,5 +2,4 @@ echo "Allow updating of timezone by right-clicking on the clock (or running omar if omarchy-cmd-missing tzupdate; then bash "$OMARCHY_PATH/install/config/timezones.sh" - omarchy-refresh-waybar fi diff --git a/migrations/1754228071.sh b/migrations/1754228071.sh deleted file mode 100644 index e7b69b11..00000000 --- a/migrations/1754228071.sh +++ /dev/null @@ -1,5 +0,0 @@ -echo "Add auto-update icon to waybar when update available" - -if ! grep -q "custom/update" ~/.config/waybar/config.jsonc; then - omarchy-refresh-waybar -fi diff --git a/migrations/1754331529.sh b/migrations/1754331529.sh deleted file mode 100644 index ae92aae4..00000000 --- a/migrations/1754331529.sh +++ /dev/null @@ -1,5 +0,0 @@ -echo "Update Waybar for new Omarchy menu" - -if ! grep -q "" ~/.config/waybar/config.jsonc; then - omarchy-refresh-waybar -fi diff --git a/migrations/1756371020.sh b/migrations/1756371020.sh deleted file mode 100644 index f629b598..00000000 --- a/migrations/1756371020.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Stop restarting waybar on unlock to see if we have solved the stacking problem for good" - -omarchy-refresh-hypridle diff --git a/migrations/1757279511.sh b/migrations/1757279511.sh deleted file mode 100644 index dc4588c1..00000000 --- a/migrations/1757279511.sh +++ /dev/null @@ -1,6 +0,0 @@ -echo "Add locale to the waybar clock format" - -sed -i \ - -e 's/{:%A %H:%M}/{:L%A %H:%M}/' \ - -e 's/{:%d %B W%V %Y}/{:L%d %B W%V %Y}/' \ - "$HOME/.config/waybar/config.jsonc" \ No newline at end of file diff --git a/migrations/1757511571.sh b/migrations/1757511571.sh deleted file mode 100644 index 7753a28e..00000000 --- a/migrations/1757511571.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Add screen recording indicator to Waybar" - -gum confirm "Replace current Waybar config (backup will be made)?" && omarchy-refresh-waybar diff --git a/migrations/1760693222.sh b/migrations/1760693222.sh deleted file mode 100644 index cc9828e8..00000000 --- a/migrations/1760693222.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Use explicit timezone selector when right-clicking on clock" - -sed -i 's/omarchy-cmd-tzupdate/omarchy-launch-floating-terminal-with-presentation omarchy-tz-select/g' ~/.config/waybar/config.jsonc diff --git a/migrations/1760787158.sh b/migrations/1760787158.sh deleted file mode 100644 index f57cc77d..00000000 --- a/migrations/1760787158.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Update Waybar styles for better spacing between icons" - -omarchy-refresh-config waybar/style.css diff --git a/migrations/1761269603.sh b/migrations/1761269603.sh deleted file mode 100644 index 700a3efa..00000000 --- a/migrations/1761269603.sh +++ /dev/null @@ -1,7 +0,0 @@ -echo "Add right-click terminal action to waybar omarchy menu icon" - -WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc" - -if [[ -f $WAYBAR_CONFIG ]] && ! grep -A5 '"custom/omarchy"' "$WAYBAR_CONFIG" | grep -q '"on-click-right"'; then - sed -i '/"on-click": "omarchy-menu",/a\ "on-click-right": "omarchy-launch-terminal",' "$WAYBAR_CONFIG" -fi diff --git a/migrations/1762121828.sh b/migrations/1762121828.sh index b7b86c91..c41eaaaa 100644 --- a/migrations/1762121828.sh +++ b/migrations/1762121828.sh @@ -40,15 +40,6 @@ sed -i 's/--working-directory=/--dir=/g' ~/.config/hypr/bindings.conf # Update TERMINAL variable in uwsm config sed -i 's/export TERMINAL=.*/export TERMINAL=xdg-terminal-exec/' ~/.config/uwsm/default -# Update waybar config to use xdg-terminal-exec -waybar_config=~/.config/waybar/config.jsonc -if [[ -f $waybar_config ]]; then - sed -i 's|"on-click-right": "omarchy-launch-terminal"|"on-click-right": "xdg-terminal-exec"|' "$waybar_config" - sed -i 's|"on-click": "\$TERMINAL -e btop"|"on-click": "xdg-terminal-exec btop"|' "$waybar_config" - sed -i 's|"on-click": "\$TERMINAL --class=Wiremix -e wiremix"|"on-click": "xdg-terminal-exec --app-id=com.omarchy.Wiremix -e wiremix"|' "$waybar_config" - omarchy-state set restart-waybar-required -fi - # Update hyprland window rules to use DNS-format class names system_conf=~/.config/hypr/apps/system.conf if [[ -f $system_conf ]]; then diff --git a/migrations/1762417304.sh b/migrations/1762417304.sh index a3c9e03c..8b53a6c0 100644 --- a/migrations/1762417304.sh +++ b/migrations/1762417304.sh @@ -2,7 +2,3 @@ echo "Replace bluetooth GUI with TUI" omarchy-pkg-add bluetui omarchy-pkg-drop blueberry - -if ! grep -q "omarchy-launch-bluetooth" ~/.config/waybar/config.jsonc; then - sed -i 's/blueberry/omarchy-launch-bluetooth/' ~/.config/waybar/config.jsonc -fi diff --git a/migrations/1763386443.sh b/migrations/1763386443.sh index e6d806d4..354b0cd4 100644 --- a/migrations/1763386443.sh +++ b/migrations/1763386443.sh @@ -2,7 +2,3 @@ echo "Uniquely identify terminal apps with custom app-ids using omarchy-launch-t # Replace terminal -e calls with omarchy-launch-tui in bindings sed -i 's/\$terminal -e \([^ ]*\)/omarchy-launch-tui \1/g' ~/.config/hypr/bindings.conf - -# Update waybar to use omarchy-launch-or-focus with omarchy-launch-tui for TUI apps -sed -i 's|xdg-terminal-exec btop|omarchy-launch-or-focus-tui btop|' ~/.config/waybar/config.jsonc -sed -i 's|xdg-terminal-exec --app-id=com\.omarchy\.Wiremix -e wiremix|omarchy-launch-or-focus-tui wiremix|' ~/.config/waybar/config.jsonc diff --git a/migrations/1763409505.sh b/migrations/1763409505.sh deleted file mode 100644 index ad1995be..00000000 --- a/migrations/1763409505.sh +++ /dev/null @@ -1,5 +0,0 @@ -echo "Add 10th workspace option to waybar config" - -if ! grep -q '"10": "0",' ~/.config/waybar/config.jsonc; then - sed -i '/"9": "9",/a\ "10": "0",' ~/.config/waybar/config.jsonc -fi diff --git a/migrations/1763560161.sh b/migrations/1763560161.sh deleted file mode 100644 index b3956966..00000000 --- a/migrations/1763560161.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Hide Bluetooth module in waybar if there's no BT controller" - -sed -i '/format-connected": "",/a\ "format-no-controller": "",' ~/.config/waybar/config.jsonc diff --git a/migrations/1763634099.sh b/migrations/1763634099.sh deleted file mode 100644 index 267558b6..00000000 --- a/migrations/1763634099.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Using 󰂱 icon for bluetooth when connected" - -sed -i 's/"format-connected": "",/"format-connected": "󰂱",/' ~/.config/waybar/config.jsonc diff --git a/migrations/1763653692.sh b/migrations/1763653692.sh deleted file mode 100644 index 46e2af14..00000000 --- a/migrations/1763653692.sh +++ /dev/null @@ -1,5 +0,0 @@ -echo "Replace Waybar dock icon with something more obvious" - -sed -i 's/"format": ""/"format": ""/' ~/.config/waybar/config.jsonc -sed -i '/#custom-expand-icon {/,/}/ s/margin-right: 20px;/margin-right: 18px;/' ~/.config/waybar/style.css -omarchy-restart-waybar diff --git a/migrations/1764067068.sh b/migrations/1764067068.sh deleted file mode 100644 index 01843585..00000000 --- a/migrations/1764067068.sh +++ /dev/null @@ -1,6 +0,0 @@ -echo "Use Bluetooth off icon in the waybar when BlueTUI has turned off the adapter" - -if ! grep -q '"format-off": "󰂲"' ~/.config/waybar/config.jsonc; then - sed -i '/"format-disabled": "󰂲",/a\ "format-off": "󰂲",' ~/.config/waybar/config.jsonc - omarchy-restart-waybar -fi diff --git a/migrations/1767227973.sh b/migrations/1767227973.sh deleted file mode 100644 index 549727c9..00000000 --- a/migrations/1767227973.sh +++ /dev/null @@ -1,3 +0,0 @@ -echo "Replace Waybar omarchy-launch-or-focus-tui wiremix with omarchy-launch-audio" - -sed -i 's/omarchy-launch-or-focus-tui wiremix/omarchy-launch-audio/g' ~/.config/waybar/config.jsonc diff --git a/migrations/1767685679.sh b/migrations/1767685679.sh deleted file mode 100644 index 55c7baba..00000000 --- a/migrations/1767685679.sh +++ /dev/null @@ -1,32 +0,0 @@ -echo "Add Voxtype to Waybar" - -STYLE_FILE=~/.config/waybar/style.css -CONFIG_FILE=~/.config/waybar/config.jsonc - -# Add voxtype CSS if not present -if ! grep -q "#custom-voxtype" "$STYLE_FILE"; then - sed -i 's/margin-left: 8\.75px;/margin-left: 5px;/' "$STYLE_FILE" - sed -i '/#custom-screenrecording-indicator {/,/}/ s/font-size: 10px;/font-size: 10px;\n padding-bottom: 1px;/' "$STYLE_FILE" - cat >> "$STYLE_FILE" << 'EOF' - -#custom-voxtype { - min-width: 12px; - margin: 0 0 0 7.5px; -} - -#custom-voxtype.recording { - color: #a55555; -} -EOF -fi - -# Add voxtype to modules-center if not present -if ! grep -q "custom/voxtype" "$CONFIG_FILE"; then - # Add to modules-center array - sed -i 's/"custom\/screenrecording-indicator"]/"custom\/voxtype", "custom\/screenrecording-indicator"]/' "$CONFIG_FILE" - - # Add voxtype config block before tray config - sed -i '/"tray": {/i\ "custom/voxtype": {\n "exec": "omarchy-voxtype-status",\n "return-type": "json",\n "format": "{icon}",\n "format-icons": {\n "idle": "",\n "recording": "󰍬",\n "transcribing": "󰔟"\n },\n "tooltip": true,\n "on-click-right": "omarchy-voxtype-config",\n "on-click": "omarchy-voxtype-model"\n },' "$CONFIG_FILE" -fi - -omarchy-restart-waybar diff --git a/migrations/1767716691.sh b/migrations/1767716691.sh deleted file mode 100644 index c98ebfb6..00000000 --- a/migrations/1767716691.sh +++ /dev/null @@ -1,14 +0,0 @@ -echo "Add icons for additional audio profiles in Waybar" - -if ! grep -q '"headphone": ""' "$HOME/.config/waybar/config.jsonc"; then - sed -i ' - /"pulseaudio": {/,/^[ ]*}/{ - /"format-icons": {/,/^[ ]*}/{ - /"default":/i\ -\ "headphone": "", - } - } - ' "$HOME/.config/waybar/config.jsonc" - - omarchy-restart-waybar -fi diff --git a/migrations/1768270644.sh b/migrations/1768270644.sh deleted file mode 100644 index 59083d19..00000000 --- a/migrations/1768270644.sh +++ /dev/null @@ -1,14 +0,0 @@ -echo "Add icon for headset audio profile in Waybar" - -if ! grep -q '"headset": ""' "$HOME/.config/waybar/config.jsonc"; then - sed -i ' - /"pulseaudio": {/,/^[ ]*}/{ - /"format-icons": {/,/^[ ]*}/{ - /"default":/i\ -\ "headset": "", - } - } - ' "$HOME/.config/waybar/config.jsonc" - - omarchy-restart-waybar -fi diff --git a/migrations/1771602477.sh b/migrations/1771602477.sh deleted file mode 100644 index f7bb4a61..00000000 --- a/migrations/1771602477.sh +++ /dev/null @@ -1,37 +0,0 @@ -echo "Add idle lock indicator to Waybar" - -STYLE_FILE=~/.config/waybar/style.css -CONFIG_FILE=~/.config/waybar/config.jsonc - -# Add idle-indicator to modules-center if not present -if ! grep -q "custom/idle-indicator" "$CONFIG_FILE"; then - sed -i 's/"custom\/screenrecording-indicator"]/"custom\/screenrecording-indicator", "custom\/idle-indicator"]/' "$CONFIG_FILE" - - sed -i '/"tray": {/i\ "custom/idle-indicator": {\n "on-click": "omarchy-toggle-idle",\n "exec": "$OMARCHY_PATH/default/waybar/indicators/idle.sh",\n "signal": 9,\n "return-type": "json"\n },' "$CONFIG_FILE" -fi - -# Add idle-indicator CSS if not present -if ! grep -q "#custom-idle-indicator" "$STYLE_FILE"; then - # Remove screenrecording-indicator from shared margin block and pair it with idle-indicator instead - sed -i 's/^#custom-screenrecording-indicator,$//' "$STYLE_FILE" - - # Add shared rule for both indicators and idle-indicator active state - sed -i '/#custom-screenrecording-indicator.active {/i\#custom-screenrecording-indicator,\n#custom-idle-indicator {\n min-width: 12px;\n margin-left: 5px;\n margin-right: 0;\n font-size: 10px;\n padding-bottom: 1px;\n}\n' "$STYLE_FILE" - - # Remove the now-duplicated properties from the standalone screenrecording block - sed -i '/#custom-screenrecording-indicator {/,/^}/ { - /min-width:/d - /margin-left:/d - /font-size:/d - /padding-bottom:/d - /^#custom-screenrecording-indicator {/d - /^}$/d - }' "$STYLE_FILE" - - cat >> "$STYLE_FILE" << 'EOF' - -#custom-idle-indicator.active { - color: #a55555; -} -EOF -fi diff --git a/migrations/1771602647.sh b/migrations/1771602647.sh deleted file mode 100644 index fa880780..00000000 --- a/migrations/1771602647.sh +++ /dev/null @@ -1,22 +0,0 @@ -echo "Add notification silencing indicator to Waybar" - -STYLE_FILE=~/.config/waybar/style.css -CONFIG_FILE=~/.config/waybar/config.jsonc - -# Add notification-silencing-indicator to modules-center if not present -if ! grep -q "custom/notification-silencing-indicator" "$CONFIG_FILE"; then - sed -i 's/"custom\/idle-indicator"]/"custom\/idle-indicator", "custom\/notification-silencing-indicator"]/' "$CONFIG_FILE" - - sed -i '/"tray": {/i\ "custom/notification-silencing-indicator": {\n "on-click": "omarchy-toggle-notification-silencing",\n "exec": "$OMARCHY_PATH/default/waybar/indicators/notification-silencing.sh",\n "signal": 10,\n "return-type": "json"\n },' "$CONFIG_FILE" -fi - -# Add notification-silencing-indicator CSS if not present -if ! grep -q "#custom-notification-silencing-indicator" "$STYLE_FILE"; then - # Add to the shared indicator rule - sed -i 's/#custom-idle-indicator {/#custom-idle-indicator,\n#custom-notification-silencing-indicator {/' "$STYLE_FILE" - - # Add to the shared active color rule - sed -i 's/#custom-idle-indicator.active {/#custom-idle-indicator.active,\n#custom-notification-silencing-indicator.active {/' "$STYLE_FILE" -fi - -omarchy-restart-waybar diff --git a/migrations/1773506226.sh b/migrations/1773506226.sh index 88c84a9f..6a56f863 100644 --- a/migrations/1773506226.sh +++ b/migrations/1773506226.sh @@ -12,5 +12,4 @@ if omarchy-cmd-present voxtype; then voxtype setup systemd systemctl --user restart voxtype - omarchy-restart-waybar fi diff --git a/migrations/1775208227.sh b/migrations/1775208227.sh deleted file mode 100644 index 4a50586d..00000000 --- a/migrations/1775208227.sh +++ /dev/null @@ -1,7 +0,0 @@ -echo "Remove misleading waybar network transfer speeds" - -if grep -q "bandwidthDownBytes" ~/.config/waybar/config.jsonc; then - sed -i 's/"tooltip-format-wifi": "{essid} ({frequency} GHz)\\n⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}"/"tooltip-format-wifi": "{essid} ({frequency} GHz)"/' ~/.config/waybar/config.jsonc - sed -i 's/"tooltip-format-ethernet": "⇣{bandwidthDownBytes} ⇡{bandwidthUpBytes}"/"tooltip-format-ethernet": "Connected"/' ~/.config/waybar/config.jsonc - omarchy-restart-waybar -fi diff --git a/migrations/1775241210.sh b/migrations/1775241210.sh index f6e45eeb..520a8a5e 100644 --- a/migrations/1775241210.sh +++ b/migrations/1775241210.sh @@ -12,5 +12,4 @@ if omarchy-cmd-present voxtype; then voxtype setup systemd systemctl --user restart voxtype - omarchy-restart-waybar fi diff --git a/migrations/1777017528.sh b/migrations/1777017528.sh deleted file mode 100644 index 7f340748..00000000 --- a/migrations/1777017528.sh +++ /dev/null @@ -1,6 +0,0 @@ -echo "Show battery status notification on right-click of the waybar battery icon" - -if ! grep -q 'omarchy-battery-status' ~/.config/waybar/config.jsonc; then - sed -i '/"on-click": "omarchy-menu power",/a\ "on-click-right": "notify-send -u low \\"$(omarchy-battery-status)\\"",' ~/.config/waybar/config.jsonc - omarchy-restart-waybar -fi diff --git a/migrations/1777464602.sh b/migrations/1777464602.sh deleted file mode 100644 index 8c845442..00000000 --- a/migrations/1777464602.sh +++ /dev/null @@ -1,8 +0,0 @@ -echo "Update Waybar screen recording command" - -WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc" - -if [[ -f $WAYBAR_CONFIG ]] && grep -q 'omarchy-cmd-screenrecord' "$WAYBAR_CONFIG"; then - sed -i 's/omarchy-cmd-screenrecord/omarchy-capture-screenrecording/g' "$WAYBAR_CONFIG" - omarchy-restart-waybar -fi diff --git a/migrations/1777578316.sh b/migrations/1777578316.sh deleted file mode 100644 index d9e584c2..00000000 --- a/migrations/1777578316.sh +++ /dev/null @@ -1,8 +0,0 @@ -echo "Rename screen recording command" - -WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc" - -if [[ -f $WAYBAR_CONFIG ]] && grep -q 'omarchy-capture-screencording' "$WAYBAR_CONFIG"; then - sed -i 's/omarchy-capture-screencording/omarchy-capture-screenrecording/g' "$WAYBAR_CONFIG" - omarchy-restart-waybar -fi diff --git a/migrations/1778139028.sh b/migrations/1778139028.sh deleted file mode 100644 index d7bc95e1..00000000 --- a/migrations/1778139028.sh +++ /dev/null @@ -1,29 +0,0 @@ -echo "Add weather widget to Waybar" - -WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc" -WAYBAR_STYLE="$HOME/.config/waybar/style.css" - -if [[ -f $WAYBAR_CONFIG ]]; then - if ! grep -q '"custom/weather"' "$WAYBAR_CONFIG"; then - sed -i 's/"modules-center": \["clock",/"modules-center": ["clock", "custom\/weather",/' "$WAYBAR_CONFIG" - sed -i '/"network": {/i\ "custom/weather": {\n "exec": "$OMARCHY_PATH/default/waybar/weather.sh",\n "return-type": "json",\n "interval": 60,\n "tooltip": false,\n "on-click": "notify-send -u low \\"$(omarchy-weather-status)\\""\n },' "$WAYBAR_CONFIG" - fi -fi - -if [[ -f $WAYBAR_STYLE ]] && ! grep -q '#custom-weather' "$WAYBAR_STYLE"; then - cat >>"$WAYBAR_STYLE" <<'EOF' - -#custom-weather { - margin-left: 7.5px; - margin-right: 7.5px; -} - -#custom-weather.unavailable { - min-width: 0; - margin: 0; - padding: 0; -} -EOF -fi - -omarchy-restart-waybar diff --git a/migrations/1778405462.sh b/migrations/1778405462.sh index e66a9c14..1bca5634 100644 --- a/migrations/1778405462.sh +++ b/migrations/1778405462.sh @@ -1,5 +1,4 @@ -echo "Create Mako and Walker toggle configs" +echo "Create Walker toggle config" mkdir -p ~/.local/state/omarchy/toggles -[[ -f ~/.local/state/omarchy/toggles/mako.ini ]] || touch ~/.local/state/omarchy/toggles/mako.ini [[ -f ~/.local/state/omarchy/toggles/walker.css ]] || touch ~/.local/state/omarchy/toggles/walker.css diff --git a/migrations/1778539119.sh b/migrations/1778539119.sh deleted file mode 100644 index 42f38268..00000000 --- a/migrations/1778539119.sh +++ /dev/null @@ -1,5 +0,0 @@ -echo "Refresh Waybar config and style for position support" - -if gum confirm "Replace current Waybar config and style (backups will be made)?"; then - omarchy-refresh-waybar -fi