diff --git a/flake.lock b/flake.lock index e29f5a4..e328700 100644 --- a/flake.lock +++ b/flake.lock @@ -20,15 +20,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1786862985, - "narHash": "sha256-kSR/jfpR4cE26YRZ8exQkoRbEA30vyWimajwZANYYaE=", - "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1055335.e5bdc4a41d4c/nixexprs.tar.zst?lastModified=1786862985&rev=e5bdc4a41d4c072fe1e3787eaa0320a384741d44" + "lastModified": 1785747939, + "narHash": "sha256-D740uKsMbgsfK2oaDenJLLPIZfq7W0/g4KN/Fls8eKs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "104240a772428cc2e20d8fd86c9ddbb886bbaff2", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst" + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "root": { diff --git a/flake.nix b/flake.nix index 785a77e..5633e8c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst"; + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; @@ -49,6 +49,7 @@ desktopItem = pkgs.makeDesktopItem { inherit name; desktopName = name; + icon = name; exec = name; }; in diff --git a/src/app/mod.rs b/src/app/mod.rs index db11f02..7b9c9ca 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -1,6 +1,4 @@ -use iced::{Color, Task, application, theme, widget}; - -type Element<'a> = iced::Element<'a, Message, iced::Theme, iced::Renderer>; +use iced::{Color, Element, Renderer, Task, Theme, application, theme, widget}; enum Message {} @@ -13,12 +11,12 @@ impl State { fn update(&mut self, message: Message) -> Task { Task::none() } - fn view(&self) -> Element<'_> { + fn view(&self) -> Element<'_, Message, Theme, Renderer> { widget::text("hiiiiiii").into() } } -pub fn run() -> Result<(), iced::Error> { +pub fn run() -> Result<(), impl std::error::Error> { application(State::new, State::update, State::view) .theme(theme::Theme::custom( "high-contrast-dark",