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
117 changes: 117 additions & 0 deletions Cargo.lock

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

6 changes: 6 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ members = [
"leaper-db",
"leaper-executor",
"leaper-launcher",
"leaper-lock",
"leaper-macros",
"leaper-mode",
"leaper-power",
Expand All @@ -20,9 +21,13 @@ name = "leaper"
[workspace.dependencies]
iced = "0.13"
iced_layershell = "0.13.7"
iced_sessionlock = "0.13.7"
iced_aw = { version = "0.12.2", default-features = false }
iced_fonts = { version = "0.2.1", features = ["nerd"] }

nonstick = "0.1.1"
nix = "0.30.1"

image = "0.25.8"
ez-pixmap = "0.2.2"

Expand Down Expand Up @@ -53,6 +58,7 @@ shlex = "1.3.0"
serde = "1.0"
toml = "0.9.8"
heck = "0.5.0"
chrono = "0.4.42"

smart-default = "0.7"
derive_more = "2.0.1"
Expand Down
7 changes: 6 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
(craneLib.fileset.commonCargoSources ./leaper-launcher)
(craneLib.fileset.commonCargoSources ./leaper-power)
(craneLib.fileset.commonCargoSources ./leaper-runner)
(craneLib.fileset.commonCargoSources ./leaper-lock)
(craneLib.fileset.commonCargoSources ./leaper-executor)
(craneLib.fileset.commonCargoSources ./leaper-style)
(craneLib.fileset.commonCargoSources ./leaper-tracing)
Expand Down Expand Up @@ -103,7 +104,10 @@
src = fileSet;

buildInputs =
libs;
libs
++ (with pkgs; [
linux-pam
]);
passthru.runtimeLibsPath = libsPath;

postFixup = ''
Expand Down Expand Up @@ -293,6 +297,7 @@
};
};
};
security.pam.services.leaper-lock = {};
};
};
};
Expand Down
8 changes: 6 additions & 2 deletions leaper-launcher/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,16 @@ impl LeaperMode for LeaperLauncher {
.font(iced_fonts::REQUIRED_FONT_BYTES)
.font(iced_fonts::NERD_FONT_BYTES)
.executor::<LeaperExecutor>()
.run_with(move || Self::init(project_dirs, config))?;
.run_with(move || Self::init(project_dirs, config, ()))?;

Ok(())
}

fn init(_project_dirs: ProjectDirs, config: LeaperModeConfig) -> (Self, Self::Task)
fn init(
_project_dirs: ProjectDirs,
config: LeaperModeConfig,
_args: Self::InitArgs,
) -> (Self, Self::Task)
where
Self: Sized,
{
Expand Down
32 changes: 32 additions & 0 deletions leaper-lock/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[package]
name = "leaper-lock"
version.workspace = true
edition.workspace = true
authors.workspace = true
license.workspace = true
repository.workspace = true
homepage.workspace = true

[package.metadata.cargo-machete]
ignored = ["thiserror"]

[dependencies]
macros = { path = "../leaper-macros", package = "leaper-macros" }
mode = { path = "../leaper-mode", package = "leaper-mode" }
style = { path = "../leaper-style", package = "leaper-style" }

iced.workspace = true
iced_sessionlock.workspace = true

tokio.workspace = true

nonstick.workspace = true
nix = { workspace = true, features = ["user"] }

directories.workspace = true

chrono.workspace = true

tracing.workspace = true

thiserror.workspace = true
Loading