chris/lumina-iced
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

update nix flake and cargo deps

Browse source
This commit is contained in:
Chris Cochrun 2025-04-23 13:19:48 -05:00
parent 60f69cf312
commit a10264e081
4 changed files with 405 additions and 273 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

590
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

4
Cargo.toml
View file

@ -1,14 +1,14 @@
[package] [package]
name = "lumina" name = "lumina"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2024"
description = "A cli presentation system" description = "A cli presentation system"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
clap = { version = "4.5.20", features = ["debug", "derive"] } clap = { version = "4.5.20", features = ["debug", "derive"] }
libcosmic = { git = "https://github.com/pop-os/libcosmic", features = ["debug", "winit", "tokio", "rfd", "dbus-config", "a11y", "wgpu", "multi-window", "single-instance"] } libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = ["debug", "winit", "tokio", "rfd", "dbus-config", "a11y", "wgpu", "multi-window", "single-instance" ] }
lexpr = "0.2.7" lexpr = "0.2.7"
miette = { version = "7.2.0", features = ["fancy"] } miette = { version = "7.2.0", features = ["fancy"] }
pretty_assertions = "1.4.1" pretty_assertions = "1.4.1"

46
flake.lock
View file

@ -6,11 +6,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1732084544, "lastModified": 1745303921,
"narHash": "sha256-0p50xdUCAvKWh3s7seOiGN4BaXwPAk852gYvNc13hWc=", "narHash": "sha256-zYucemS2QvJUR5GKJ/u3eZAoe82AKhcxMtNVZDERXsw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "6120ce1d29263ed58981e7e223e55942702de853", "rev": "14850d5984f3696a2972f85f19085e5fb46daa95",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -42,11 +42,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1721727458, "lastModified": 1743800763,
"narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", "narHash": "sha256-YFKV+fxEpMgP5VsUcM6Il28lI0NlpM7+oB1XxbBAYCw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", "rev": "ed0232117731a4c19d3ee93aa0c382a8fe754b01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,11 +57,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731676054, "lastModified": 1744932701,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,23 +73,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 1744868846,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",
"path": "/nix/store/hfz1qqd0z8amlgn8qwich1dvkmldik36-source", "owner": "NixOS",
"type": "path" "repo": "nixpkgs",
"rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"type": "indirect" "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1745234285,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "rev": "c11863f1e964833214b767f4a369c6e6a7aba141",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +114,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732050317, "lastModified": 1745247864,
"narHash": "sha256-G5LUEOC4kvB/Xbkglv0Noi04HnCfryur7dVjzlHkgpI=", "narHash": "sha256-QA1Ba8Flz5K+0GbG03HwiX9t46mh/jjKgwavbuKtwMg=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "c0bbbb3e5d7d1d1d60308c8270bfd5b250032bb4", "rev": "31dbec70c68e97060916d4754c687a3e93c2440f",
"type": "github" "type": "github"
}, },
"original": { "original": {

38
src/main.rs
View file

@ -225,9 +225,7 @@ impl cosmic::Application for App {
Some(&self.nav_model) Some(&self.nav_model)
} }
fn nav_bar( fn nav_bar(&self) -> Option<Element<cosmic::Action<Message>>> {
&self,
) -> Option<Element<cosmic::app::Message<Message>>> {
if !self.core().nav_bar_active() { if !self.core().nav_bar_active() {
return None; return None;
} }
@ -235,27 +233,25 @@ impl cosmic::Application for App {
let nav_model = self.nav_model()?; let nav_model = self.nav_model()?;
let mut nav = cosmic::widget::nav_bar(nav_model, |id| { let mut nav = cosmic::widget::nav_bar(nav_model, |id| {
cosmic::app::Message::Cosmic( cosmic::Action::Cosmic(cosmic::app::Action::NavBar(id))
cosmic::app::cosmic::Message::NavBar(id),
)
}) })
.on_dnd_enter(|entity, data| { .on_dnd_enter(|entity, data| {
debug!("entered"); debug!("entered");
cosmic::app::Message::App(Message::DndEnter(entity, data)) cosmic::Action::App(Message::DndEnter(entity, data))
}) })
.on_dnd_leave(|entity| { .on_dnd_leave(|entity| {
debug!("left"); debug!("left");
cosmic::app::Message::App(Message::DndLeave(entity)) cosmic::Action::App(Message::DndLeave(entity))
}) })
.drag_id(DragId::new()) .drag_id(DragId::new())
.on_context(|id| { .on_context(|id| {
cosmic::app::Message::Cosmic( cosmic::Action::Cosmic(
cosmic::app::cosmic::Message::NavBarContext(id), cosmic::app::Action::NavBarContext(id),
) )
}) })
.on_dnd_drop::<ServiceItem>(|entity, data, action| { .on_dnd_drop::<ServiceItem>(|entity, data, action| {
debug!("dropped"); debug!("dropped");
cosmic::app::Message::App(Message::DndDrop( cosmic::Action::App(Message::DndDrop(
entity, data, action, entity, data, action,
)) ))
}) })
@ -423,9 +419,9 @@ impl cosmic::Application for App {
match self.song_editor.update(message) { match self.song_editor.update(message) {
song_editor::Action::Task(task) => { song_editor::Action::Task(task) => {
task.map(|m| { task.map(|m| {
cosmic::app::Message::App( cosmic::Action::App(Message::SongEditor(
Message::SongEditor(m), m,
) ))
}) })
} }
song_editor::Action::UpdateSong(song) => { song_editor::Action::UpdateSong(song) => {
@ -451,7 +447,7 @@ impl cosmic::Application for App {
// debug!(?x); // debug!(?x);
// cosmic::app::Message::App(Message::None) // cosmic::app::Message::App(Message::None)
presenter::Action::Task(task) => task.map(|m| { presenter::Action::Task(task) => task.map(|m| {
cosmic::app::Message::App(Message::Present(m)) cosmic::Action::App(Message::Present(m))
}), }),
presenter::Action::None => Task::none(), presenter::Action::None => Task::none(),
} }
@ -465,9 +461,9 @@ impl cosmic::Application for App {
} }
library::Action::Task(task) => { library::Action::Task(task) => {
return task.map(|message| { return task.map(|message| {
cosmic::app::Message::App( cosmic::Action::App(Message::Library(
Message::Library(message), message,
) ))
}); });
} }
library::Action::None => return Task::none(), library::Action::None => return Task::none(),
@ -519,7 +515,7 @@ impl cosmic::Application for App {
); );
spawn_window.map(|id| { spawn_window.map(|id| {
cosmic::app::Message::App(Message::WindowOpened( cosmic::Action::App(Message::WindowOpened(
id, None, id, None,
)) ))
}) })
@ -770,13 +766,13 @@ where
self.windows.push(id); self.windows.push(id);
_ = self.set_window_title("Lumina Presenter".to_owned(), id); _ = self.set_window_title("Lumina Presenter".to_owned(), id);
spawn_window.map(|id| { spawn_window.map(|id| {
cosmic::app::Message::App(Message::WindowOpened(id, None)) cosmic::Action::App(Message::WindowOpened(id, None))
}) })
} }
fn add_library(&mut self) -> Task<Message> { fn add_library(&mut self) -> Task<Message> {
Task::perform(async move { Library::new().await }, |x| { Task::perform(async move { Library::new().await }, |x| {
cosmic::app::Message::App(Message::AddLibrary(x)) cosmic::Action::App(Message::AddLibrary(x))
}) })
} }