Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ is missing or empty.
- The notification center slides down from the top when the clock is
clicked, as when it is pulled.
- About shows an icon on its renderer line, as on every other.
- The control center and the notification center can be used fully from
the keyboard (Super+Ctrl+1 and Super+Ctrl+2).
- Settings has Date & Time: the time zone, automatic time and a 24-hour
switch for every clock.
- Settings lists every keyboard shortcut (Settings > Keyboard).
- The bar's background and clock format can be changed in Settings, and
rows that do nothing on this device are dimmed.

## [0.3.2] - 2026-11-19

Expand Down
5 changes: 4 additions & 1 deletion desktop/install-tree
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ project=$(dirname "$here")
shell=$here/shell config=$here/configuration
omarchy=$root/usr/share/omarchy
for input in "$build/wvkbd-mobintl" "$build/wtype" "$build/wtype.LICENSE" "$upstream/themes" "$upstream/bin" \
"$upstream/themes/jade-horse/colors.toml" "$upstream/icons/papercraft" "$upstream/applications/foot.desktop" "$dbus_next/dbus_next/__init__.py"; do
"$upstream/themes/jade-horse/colors.toml" "$upstream/icons/papercraft" "$upstream/applications/foot.desktop" "$upstream/default/hypr/toggles/bar-glassy.lua" "$dbus_next/dbus_next/__init__.py"; do
[[ -e $input ]] || { echo "Missing input: $input" >&2; exit 1; }
done
umask 022
Expand Down Expand Up @@ -54,6 +54,9 @@ find "$omarchy" \( -name __pycache__ -o -name '*.pyc' \) -prune -exec rm -rf {}
cp -RP "$upstream/themes" "$omarchy/themes"
# Upstream's app icon sets (Papercraft, the default; Arcade; Original).
cp -RP "$upstream/icons" "$omarchy/icons"
# Upstream's glassy-bar toggle: labwc never reads it, but omarchy-bar puts it
# where Hyprland would, and refuses the Glassy background without it.
put "$upstream/default/hypr/toggles/bar-glassy.lua" "$omarchy/default/hypr/toggles/bar-glassy.lua"
# Our drawings for the tablet's own apps, in upstream's sets: Firefox, the
# default browser, which upstream's sets do not draw.
cp -R "$here/icons/." "$omarchy/icons/"
Expand Down
69 changes: 69 additions & 0 deletions desktop/shell/bin/omarchy-shell-config
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#!/bin/bash

# omarchy:summary=Shared helpers for editing ~/.config/omarchy-ipad/shell.json (source this, don't run it).
# omarchy:hidden=true

# Orchard: upstream's, with the tablet shell's own config, which it reads
# instead of ~/.config/omarchy/shell.json (shell.qml userConfigPath), so the
# upstream commands that edit the shell's config (omarchy-bar, ...) edit the
# one the shell reads.
CONFIG_FILE="$HOME/.config/omarchy-ipad/shell.json"
DEFAULTS_FILE="$OMARCHY_PATH/config/omarchy/shell.json"

fail() {
echo "${0##*/}: $*" >&2
exit 1
}

refresh_shell_config() {
if ! omarchy-shell shell reloadConfig >/dev/null 2>&1; then
omarchy-shell -q shell rescanPlugins >/dev/null 2>&1 || true
fi
}

source_file() {
if [[ -s $CONFIG_FILE ]]; then
printf '%s\n' "$CONFIG_FILE"
else
printf '%s\n' "$DEFAULTS_FILE"
fi
}

# jq pipeline that normalizes shell.json into a well-shaped object with
# version=1, bar.layout.{left,centerBegin,center,centerEnd,right} arrays, and
# plugins array. Every mutation pipes through this so downstream jq can assume
# structure.
NORMALIZE='
def object_or_empty: if type == "object" then . else {} end;
def array_or_empty: if type == "array" then . else [] end;
object_or_empty
| .version = 1
| .bar = (.bar | object_or_empty)
| .bar.layout = (.bar.layout | object_or_empty)
| .bar.layout.left = (.bar.layout.left | array_or_empty)
| .bar.layout.centerBegin = (.bar.layout.centerBegin | array_or_empty)
| .bar.layout.center = (.bar.layout.center | array_or_empty)
| .bar.layout.centerEnd = (.bar.layout.centerEnd | array_or_empty)
| .bar.layout.right = (.bar.layout.right | array_or_empty)
| .plugins = (.plugins | array_or_empty)
'

# Apply a jq program to the source file and atomically write the result to the
# user config, then refresh the running shell. Extra args after the program are
# forwarded to jq (e.g. --arg/--argjson).
_SHELL_CONFIG_TMP=""
cleanup_shell_config_tmp() {
if [[ -n $_SHELL_CONFIG_TMP ]]; then rm -f "$_SHELL_CONFIG_TMP"; fi
}
trap cleanup_shell_config_tmp EXIT

commit() {
local program="$1"
shift
mkdir -p "$(dirname "$CONFIG_FILE")"
_SHELL_CONFIG_TMP=$(mktemp)
jq -S -e "$@" "$program" "$(source_file)" >"$_SHELL_CONFIG_TMP" || fail "could not update shell config"
mv "$_SHELL_CONFIG_TMP" "$CONFIG_FILE"
_SHELL_CONFIG_TMP=""
refresh_shell_config
}
52 changes: 51 additions & 1 deletion desktop/shell/default/i18n/en/shell.json
Original file line number Diff line number Diff line change
Expand Up @@ -733,5 +733,55 @@
"settings.noWifiDevice": "No Wi-Fi on this device",
"settings.brightness": "Brightness",
"settings.autoBrightness": "Auto-Brightness",
"settings.rotationLock": "Rotation Lock"
"settings.rotationLock": "Rotation Lock",
"settings.dateTime": "Date & Time",
"settings.setAutomatically": "Set Automatically",
"settings.timeZone": "Time Zone",
"settings.timeNow": "Now",
"settings.searchTimeZones": "Search cities and time zones",
"settings.shortcuts": "Keyboard Shortcuts",
"shortcuts.none": "No shortcuts",
"shortcuts.group.shell": "Shell",
"shortcuts.group.apps": "Apps",
"shortcuts.group.windows": "Windows",
"shortcuts.group.screenshots": "Screenshots",
"shortcuts.group.hardware": "Hardware Keys",
"shortcuts.group.other": "Other",
"shortcuts.launcher": "Launcher",
"shortcuts.controlCenter": "Control Center",
"shortcuts.notificationCenter": "Notification Center",
"shortcuts.audio": "Sound",
"shortcuts.bluetooth": "Bluetooth",
"shortcuts.display": "Display",
"shortcuts.network": "Network",
"shortcuts.power": "Battery",
"shortcuts.menu": "Omarchy Menu",
"shortcuts.systemMenu": "Session Menu",
"shortcuts.bar": "Show or Hide the Bar",
"shortcuts.terminal": "Terminal",
"shortcuts.browser": "Browser",
"shortcuts.activity": "Activity",
"shortcuts.screenshot": "Screenshot",
"shortcuts.volumeUp": "Volume Up",
"shortcuts.volumeDown": "Volume Down",
"shortcuts.mute": "Mute",
"shortcuts.brightnessUp": "Brightness Up",
"shortcuts.brightnessDown": "Brightness Down",
"shortcuts.scaleUp": "Larger Display Scale",
"shortcuts.scaleDown": "Smaller Display Scale",
"shortcuts.close": "Close Window",
"shortcuts.fullscreen": "Full Screen",
"shortcuts.maximize": "Maximize or Restore",
"shortcuts.overview": "Exposé",
"shortcuts.nextWindow": "Next Window",
"shortcuts.previousWindow": "Previous Window",
"shortcuts.hideCursor": "Hide Pointer",
"shortcuts.minimize": "Minimize",
"shortcuts.snapUp": "Snap to Top",
"shortcuts.snapDown": "Snap to Bottom",
"shortcuts.snapLeft": "Snap to Left",
"shortcuts.snapRight": "Snap to Right",
"shortcuts.switchWindows": "Switch Windows",
"shortcuts.switchWindowsBack": "Switch Windows Backwards",
"settings.time24": "24-Hour Time"
}
26 changes: 26 additions & 0 deletions desktop/shell/shell/Commons/TimeFormat.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
pragma Singleton
import QtQuick
import Quickshell
import "TimeFormatModel.js" as Model

// 24-hour or 12-hour time, for every clock the shell draws (the bar's, the
// lock screen's, the notification center's, a banner's time). The bar's
// clock format in the shell's config says which: Settings' Date & Time
// switch flips that format's hours (keeping its style), and Appearance's
// Clock picks the style; so the two never disagree.
QtObject {
id: root

readonly property string configPath: (Quickshell.env("HOME") || "") + "/.config/omarchy-ipad/shell.json"
property WatchedFile config: WatchedFile { path: root.configPath }

// The bar clock's format, "HH:mm" while there is none.
readonly property string barFormat: clockFormat(config.text)
readonly property bool use24: is24(barFormat)
// The time alone, as the clocks show it.
readonly property string time: use24 ? "HH:mm" : "h:mm AP"

function clockFormat(text) { return Model.clockFormat(text) }
function is24(format) { return Model.is24(format) }
function flipped(format, to24) { return Model.flipped(format, to24) }
}
27 changes: 27 additions & 0 deletions desktop/shell/shell/Commons/TimeFormatModel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// 24-hour or 12-hour time from the bar clock's format (TimeFormat.qml).

function clockFormat(text) {
try {
var layout = (JSON.parse(text || "{}").bar || {}).layout || {}
for (var section in layout) {
var widgets = layout[section] || []
for (var i = 0; i < widgets.length; i++)
if (widgets[i] && widgets[i].id === "omarchy.clock" && widgets[i].format) return String(widgets[i].format)
}
} catch (e) {}
return "HH:mm"
}
// Hours as H (0-23) are 24-hour time; h with AP is 12-hour. Quoted text
// ('W') is not a token. A format without hours reads as 24-hour.
function is24(format) {
var tokens = String(format).replace(/'[^']*'/g, "")
return tokens.indexOf("h") < 0 || tokens.indexOf("H") >= 0
}
// The format with its hours the other way: "dddd HH:mm" ↔ "dddd h:mm AP".
function flipped(format, to24) {
var f = String(format)
if (to24) return f.replace(/\bh(h?)(:mm(:ss)?)\s*(AP|ap|A|a)/, "HH$2")
return f.replace(/\bHH?(:mm(:ss)?)/, "h$1 AP")
}

if (typeof module !== "undefined") module.exports = { clockFormat: clockFormat, is24: is24, flipped: flipped }
10 changes: 10 additions & 0 deletions desktop/shell/shell/Commons/TimeZone.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
pragma Singleton
import QtQuick

// A time zone change, for the shell's clocks: each only turns at its next
// minute otherwise, and a new zone moves the hour at once. Settings' Date &
// Time calls changed() when it sets one.
QtObject {
property int revision: 0
function changed() { revision++ }
}
2 changes: 2 additions & 0 deletions desktop/shell/shell/Commons/qmldir
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ singleton InputDevices 1.0 InputDevices.qml
singleton IpcRegistry 1.0 IpcRegistry.qml
singleton InputMethodState 1.0 InputMethodState.qml
singleton Style 1.0 Style.qml
singleton TimeZone 1.0 TimeZone.qml
singleton TimeFormat 1.0 TimeFormat.qml
singleton UntypedInput 1.0 UntypedInput.qml
singleton Util 1.0 Util.qml
ShellIpc 1.0 ShellIpc.qml
Expand Down
Loading
Loading