Skip to content

Improve macOS app integration #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svensieber wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Improve macOS app integration #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bfe25ac
Improve macOS app integration
Jun 9, 2026
da92165
Refresh tests for current APIs
Jun 9, 2026
15818db
Fix popup options mutability warning
Jun 9, 2026
8ba476b
Make macOS status item visible
Jun 9, 2026
d0b837b
Show tracking summary in macOS status item
Jun 9, 2026
c04d112
Improve macOS lock detection
Jun 9, 2026
acd3d6a
Enable macOS backend by default
Jun 9, 2026
66e3117
Use native macOS resume dialog
Jun 9, 2026
25af3e5
Use TCP IPC by default on macOS
Jun 9, 2026
aefa9cc
Keep macOS daemon alive while hidden
Jun 9, 2026
b4edaae
Fix macOS popup, hide-to-tray, lock detection and stop-reminder
Jun 10, 2026
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
105 changes: 91 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,14 @@ keyring = { version = "3.6", features = ["apple-native", "windows-native", "sync
whoami = "1.5"

[features]
default = ["backend-sway", "ipc-unix", "popup-ui", "popup-output-placement"]
default = [
"backend-sway",
"backend-macos",
"ipc-unix",
"ipc-tcp",
"popup-ui",
"popup-output-placement",
]
backend-linux = ["dep:dbus", "dep:x11rb"]
backend-sway = ["backend-linux", "dep:swayipc"]
backend-hyprland = ["backend-linux"]
Expand Down Expand Up @@ -65,6 +72,13 @@ optional = true
default-features = false
features = ["default_fonts", "glow"]

[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.10"
core-foundation-sys = "0.8"
objc2 = "0.6"
objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSRunningApplication"] }
tray-icon = { version = "0.24", default-features = false }

[dev-dependencies]
tempfile = "3.18"

Expand Down
9 changes: 6 additions & 3 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,17 @@ impl Config {
if let Some(path) = &self.ipc_socket_path {
return PathBuf::from(path);
}
#[cfg(feature = "ipc-unix")]
#[cfg(all(feature = "ipc-tcp", any(target_os = "macos", target_os = "windows")))]
return PathBuf::from("127.0.0.1:45555");

#[cfg(all(feature = "ipc-unix", not(any(target_os = "macos", target_os = "windows"))))]
if let Some(home) = dirs::home_dir() {
return home.join(".local/run/lazytime.sock");
}
#[cfg(feature = "ipc-unix")]
#[cfg(all(feature = "ipc-unix", not(any(target_os = "macos", target_os = "windows"))))]
return PathBuf::from("/tmp/lazytime.sock");

#[cfg(feature = "ipc-tcp")]
#[cfg(all(feature = "ipc-tcp", not(any(target_os = "macos", target_os = "windows"))))]
return PathBuf::from("127.0.0.1:45555");

#[allow(unreachable_code)]
Expand Down
Loading