pass-secret-service: Add dbus file, assert

Add the dbus service file in the package folder to XDG_DATA_HOME, as
well as adding an assertion to ensure both it and `gnome-keyring` aren't
enabled at the same time.
This commit is contained in:
Cynthia Fox 2023-05-05 10:01:37 -04:00
parent 38271ead8e
commit 9d79f9676d
No known key found for this signature in database
GPG key ID: 5960278CE235F821
2 changed files with 36 additions and 18 deletions

View file

@ -28,6 +28,10 @@ in {
assertions = [
(lib.hm.assertions.assertPlatform "services.gnome-keyring" pkgs
lib.platforms.linux)
{
assertion = !config.services.pass-secret-store.enable;
message = "Only one libsecret service can be enabled at a time.";
}
];
systemd.user.services.gnome-keyring = {

View file

@ -5,8 +5,7 @@ with lib;
let
cfg = config.services.pass-secret-service;
serviceArgs =
optionalString (cfg.storePath != null) "--path ${cfg.storePath}";
busName = "org.freedesktop.secrets";
in {
meta.maintainers = with maintainers; [ cab404 cyntheticfox ];
@ -16,11 +15,13 @@ in {
package = mkPackageOption pkgs "pass-secret-service" { };
storePath = mkOption {
type = with types; nullOr str;
default = null;
defaultText = "~/.password-store";
type = types.str;
default = "";
defaultText = "$HOME/.password-store";
example = "/home/user/.local/share/password-store";
description = "Absolute path to password store.";
description = ''
Absolute path to password store.
'';
};
};
@ -28,21 +29,34 @@ in {
assertions = [
(hm.assertions.assertPlatform "services.pass-secret-service" pkgs
platforms.linux)
{
assertion = !config.services.gnome-keyring.enable;
message = "Only one secrets service per user can be enabled at a time";
}
];
systemd.user.services.pass-secret-service = {
Unit = {
AssertFileIsExecutable = "${cfg.package}/bin/pass_secret_service";
Description = "Pass libsecret service";
Documentation = "https://github.com/mdellweg/pass_secret_service";
PartOf = [ "default.target" ];
systemd.user.services.pass-secret-service =
let binPath = "${cfg.package}/bin/pass_secret_service";
in {
Unit = {
AssertFileIsExecutable = "${binPath}";
Description = "Pass libsecret service";
Documentation = "https://github.com/mdellweg/pass_secret_service";
PartOf = [ "default.target" ];
};
Service = {
Type = "dbus";
ExecStart = "${binPath} ${
optionalString (cfg.storePath != "") "--path ${cfg.storePath}"
}";
BusName = busName;
};
Install.WantedBy = [ "default.target" ];
};
Service = {
ExecStart = "${cfg.package}/bin/pass_secret_service ${serviceArgs}";
};
Install = { WantedBy = [ "default.target" ]; };
};
xdg.dataFile."dbus-1/services/${busName}.service".source =
"${cfg.package}/share/dbus-1/services/${busName}.service";
};
}