mirror of
https://github.com/Zedfrigg/ironbar.git
synced 2025-08-17 14:51:04 +02:00
Merge branch 'master' into develop
# Conflicts: # Cargo.lock # Cargo.toml # src/clients/networkmanager.rs # src/modules/networkmanager.rs # src/modules/volume.rs
This commit is contained in:
commit
c42024d48a
GPG key ID:
3AFCC06481308BC6
159 changed files with 13519 additions and 5655 deletions
168
Cargo.toml
168
Cargo.toml
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "ironbar"
|
||||
version = "0.16.0-pre"
|
||||
edition = "2021"
|
||||
version = "0.16.1"
|
||||
edition = "2024"
|
||||
license = "MIT"
|
||||
description = "Customisable GTK Layer Shell wlroots/sway bar"
|
||||
repository = "https://github.com/jakestanger/ironbar"
|
||||
|
|
@ -10,36 +10,47 @@ keywords = ["gtk", "bar", "wayland", "wlroots", "gtk-layer-shell"]
|
|||
|
||||
[features]
|
||||
default = [
|
||||
"bindmode+all",
|
||||
"cli",
|
||||
"cairo",
|
||||
"clipboard",
|
||||
"clock",
|
||||
"config+all",
|
||||
"custom",
|
||||
"focused",
|
||||
"http",
|
||||
"ipc",
|
||||
"keyboard+all",
|
||||
"launcher",
|
||||
"label",
|
||||
"menu",
|
||||
"music+all",
|
||||
"network_manager",
|
||||
"notifications",
|
||||
"script",
|
||||
"sys_info",
|
||||
"tray",
|
||||
"upower",
|
||||
"volume",
|
||||
"workspaces+all"
|
||||
"workspaces+all",
|
||||
]
|
||||
|
||||
cli = ["dep:clap", "ipc"]
|
||||
ipc = ["dep:serde_json"]
|
||||
cli = ["ipc"]
|
||||
ipc = ["dep:serde_json", "dep:clap"]
|
||||
|
||||
http = ["dep:reqwest"]
|
||||
|
||||
bindmode = []
|
||||
"bindmode+all" = ["bindmode+sway", "bindmode+hyprland"]
|
||||
"bindmode+sway" = ["bindmode", "sway"]
|
||||
"bindmode+hyprland" = ["bindmode", "hyprland"]
|
||||
|
||||
"config+all" = [
|
||||
"config+json",
|
||||
"config+yaml",
|
||||
"config+toml",
|
||||
"config+corn",
|
||||
"config+ron",
|
||||
"config+json",
|
||||
"config+yaml",
|
||||
"config+toml",
|
||||
"config+corn",
|
||||
"config+ron",
|
||||
]
|
||||
"config+json" = ["universal-config/json"]
|
||||
"config+yaml" = ["universal-config/yaml"]
|
||||
|
|
@ -49,15 +60,26 @@ http = ["dep:reqwest"]
|
|||
|
||||
cairo = ["lua-src", "mlua", "cairo-rs"]
|
||||
|
||||
clipboard = ["nix"]
|
||||
clipboard = ["dep:rustix"]
|
||||
|
||||
clock = ["chrono"]
|
||||
|
||||
custom = []
|
||||
|
||||
focused = []
|
||||
|
||||
keyboard = ["dep:colpetto", "dep:evdev-rs", "dep:rustix", "futures-lite"]
|
||||
"keyboard+all" = ["keyboard", "keyboard+sway", "keyboard+hyprland"]
|
||||
"keyboard+sway" = ["keyboard", "sway"]
|
||||
"keyboard+hyprland" = ["keyboard", "hyprland"]
|
||||
|
||||
label = []
|
||||
|
||||
launcher = []
|
||||
|
||||
music = ["regex"]
|
||||
menu = []
|
||||
|
||||
music = ["dep:regex"]
|
||||
"music+all" = ["music", "music+mpris", "music+mpd"]
|
||||
"music+mpris" = ["music", "mpris"]
|
||||
"music+mpd" = ["music", "mpd-utils"]
|
||||
|
|
@ -66,109 +88,113 @@ network_manager = ["futures-lite", "futures-signals", "zbus"]
|
|||
|
||||
notifications = ["zbus"]
|
||||
|
||||
sys_info = ["sysinfo", "regex"]
|
||||
script = []
|
||||
|
||||
sys_info = ["dep:sysinfo"]
|
||||
|
||||
tray = ["system-tray"]
|
||||
|
||||
upower = ["upower_dbus", "zbus", "futures-lite"]
|
||||
upower = ["zbus", "futures-lite"]
|
||||
|
||||
volume = ["libpulse-binding"]
|
||||
|
||||
workspaces = ["futures-lite"]
|
||||
"workspaces+all" = ["workspaces", "workspaces+sway", "workspaces+hyprland"]
|
||||
"workspaces+sway" = ["workspaces", "swayipc-async"]
|
||||
"workspaces+all" = ["workspaces", "workspaces+sway", "workspaces+hyprland", "workspaces+niri"]
|
||||
"workspaces+sway" = ["workspaces", "sway"]
|
||||
"workspaces+hyprland" = ["workspaces", "hyprland"]
|
||||
"workspaces+niri" = ["workspaces", "niri"]
|
||||
|
||||
sway = ["swayipc-async", "futures-lite"]
|
||||
|
||||
niri = ["dep:serde_json"]
|
||||
|
||||
schema = ["dep:schemars"]
|
||||
|
||||
[dependencies]
|
||||
# core
|
||||
gtk = "0.18.1"
|
||||
gtk-layer-shell = "0.8.1"
|
||||
gtk = "0.18.2"
|
||||
gtk-layer-shell = "0.8.2"
|
||||
glib = "0.18.5"
|
||||
tokio = { version = "1.39.2", features = [
|
||||
"macros",
|
||||
"rt-multi-thread",
|
||||
"time",
|
||||
"process",
|
||||
"sync",
|
||||
"io-util",
|
||||
"net",
|
||||
tokio = { version = "1.46.1", features = [
|
||||
"macros",
|
||||
"rt-multi-thread",
|
||||
"time",
|
||||
"process",
|
||||
"sync",
|
||||
"io-util",
|
||||
"net",
|
||||
"fs"
|
||||
] }
|
||||
tracing = "0.1.40"
|
||||
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
|
||||
tracing-error = { version = "0.2.0" , default-features = false }
|
||||
tracing = "0.1.41"
|
||||
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
|
||||
tracing-error = { version = "0.2.1", default-features = false }
|
||||
tracing-appender = "0.2.3"
|
||||
strip-ansi-escapes = "0.2.0"
|
||||
color-eyre = "0.6.3"
|
||||
serde = { version = "1.0.204", features = ["derive"] }
|
||||
indexmap = "2.3.0"
|
||||
dirs = "5.0.1"
|
||||
color-eyre = "0.6.5"
|
||||
serde = { version = "1.0.219", features = ["derive"] }
|
||||
indexmap = "2.10.0"
|
||||
dirs = "6.0.0"
|
||||
walkdir = "2.5.0"
|
||||
notify = { version = "6.1.1", default-features = false }
|
||||
notify = { version = "8.1.0", default-features = false }
|
||||
wayland-client = "0.31.1"
|
||||
wayland-protocols-wlr = { version = "0.2.0", features = ["client"] }
|
||||
wayland-protocols-wlr = { version = "0.3.8", features = ["client"] }
|
||||
smithay-client-toolkit = { version = "0.18.1", default-features = false, features = [
|
||||
"calloop",
|
||||
"calloop",
|
||||
] }
|
||||
universal-config = { version = "0.5.0", default-features = false }
|
||||
ctrlc = "3.4.4"
|
||||
cfg-if = "1.0.0"
|
||||
universal-config = { version = "0.5.1", default-features = false }
|
||||
ctrlc = "3.4.7"
|
||||
cfg-if = "1.0.1"
|
||||
|
||||
# cli
|
||||
clap = { version = "4.5.13", optional = true, features = ["derive"] }
|
||||
|
||||
# ipc
|
||||
serde_json = { version = "1.0.122", optional = true }
|
||||
clap = { version = "4.5.40", optional = true, features = ["derive"] }
|
||||
|
||||
# http
|
||||
reqwest = { version = "0.12.5", default-features = false, features = ["default-tls", "http2"], optional = true }
|
||||
reqwest = { version = "0.12.22", default-features = false, features = ["default-tls", "http2"], optional = true }
|
||||
|
||||
# cairo
|
||||
lua-src = { version = "547.0.0", optional = true }
|
||||
mlua = { version = "0.9.9", optional = true, features = ["luajit"] }
|
||||
lua-src = { version = "548.1.1", optional = true }
|
||||
mlua = { version = "0.10.5", optional = true, features = ["luajit", "send"] }
|
||||
cairo-rs = { version = "0.18.5", optional = true, features = ["png"] }
|
||||
|
||||
# clipboard
|
||||
nix = { version = "0.29.0", optional = true, features = ["event", "fs"] }
|
||||
|
||||
# clock
|
||||
chrono = { version = "0.4.38", optional = true, default-features = false, features = ["clock", "unstable-locales"] }
|
||||
chrono = { version = "0.4.41", optional = true, default-features = false, features = ["clock", "unstable-locales"] }
|
||||
|
||||
# keyboard
|
||||
colpetto = { version = "0.6.0", features = ["tokio", "tracing"], optional = true }
|
||||
evdev-rs = { version = "0.6.1", optional = true }
|
||||
|
||||
# music
|
||||
mpd-utils = { version = "0.2.1", optional = true }
|
||||
mpris = { version = "2.0.1", optional = true }
|
||||
regex = { version = "1.11.1", default-features = false, features = [
|
||||
"std",
|
||||
], optional = true }
|
||||
|
||||
# network_manager
|
||||
futures-signals = { version = "0.3.33", optional = true }
|
||||
futures-signals = { version = "0.3.34", optional = true }
|
||||
|
||||
# sys_info
|
||||
sysinfo = { version = "0.29.11", optional = true }
|
||||
sysinfo = { version = "0.35.2", optional = true }
|
||||
|
||||
# tray
|
||||
system-tray = { version = "0.2.0", optional = true }
|
||||
|
||||
# upower
|
||||
upower_dbus = { version = "0.3.2", optional = true }
|
||||
system-tray = { version = "0.7.0", features = ["dbusmenu-gtk3"], optional = true }
|
||||
|
||||
# volume
|
||||
libpulse-binding = { version = "2.28.1", optional = true }
|
||||
|
||||
# workspaces
|
||||
swayipc-async = { version = "2.0.1", optional = true }
|
||||
hyprland = { version = "0.4.0-alpha.2", features = ["silent"], optional = true }
|
||||
futures-util = { version = "0.3.30", optional = true }
|
||||
libpulse-binding = { version = "2.30.1", optional = true }
|
||||
|
||||
# shared
|
||||
futures-lite = { version = "2.3.0", optional = true } # network_manager, upower, workspaces
|
||||
regex = { version = "1.10.6", default-features = false, features = [
|
||||
"std",
|
||||
], optional = true } # music, sys_info
|
||||
zbus = { version = "3.15.2", default-features = false, features = ["tokio"], optional = true } # network_manager, notifications, upower
|
||||
futures-lite = { version = "2.6.0", optional = true } # network_manager, upower, workspaces, keyboard
|
||||
zbus = { version = "5.7.1", default-features = false, features = ["blocking-api", "tokio"], optional = true } # network_manager, notifications, upower
|
||||
swayipc-async = { version = "2.1.0", optional = true } # workspaces, keyboard
|
||||
hyprland = { version = "0.4.0-beta.2", optional = true } # workspaces, keyboard
|
||||
rustix = { version = "1.0.7", default-features = false, features = ["std", "fs", "pipe", "event"], optional = true } # clipboard, input
|
||||
serde_json = { version = "1.0.140", optional = true } # ipc, niri
|
||||
|
||||
# schema
|
||||
schemars = { version = "0.8.21", optional = true }
|
||||
schemars = { version = "0.8.22", optional = true }
|
||||
|
||||
# -- PATCH --
|
||||
# temp fix for tracing-appender/time
|
||||
time = "0.3.36"
|
||||
[build-dependencies]
|
||||
clap = { version = "4.5.40", features = ["derive"] }
|
||||
clap_complete = "4.5.54"
|
||||
serde = { version = "1.0.219", features = ["derive"] }
|
||||
serde_json = "1.0.140"
|
||||
Loading…
Add table
Add a link
Reference in a new issue