mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
nixos/services.yubikey-agent: remove with lib;
This commit is contained in:
parent
cae64813e8
commit
1f4bd3abb7
1 changed files with 6 additions and 10 deletions
|
@ -1,21 +1,17 @@
|
||||||
# Global configuration for yubikey-agent.
|
# Global configuration for yubikey-agent.
|
||||||
|
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.yubikey-agent;
|
cfg = config.services.yubikey-agent;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
###### interface
|
###### interface
|
||||||
|
|
||||||
meta.maintainers = with maintainers; [
|
meta.maintainers = with lib.maintainers; [
|
||||||
philandstuff
|
philandstuff
|
||||||
rawkode
|
rawkode
|
||||||
];
|
];
|
||||||
|
@ -23,8 +19,8 @@ in
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
services.yubikey-agent = {
|
services.yubikey-agent = {
|
||||||
enable = mkOption {
|
enable = lib.mkOption {
|
||||||
type = types.bool;
|
type = lib.types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
description = ''
|
description = ''
|
||||||
Whether to start yubikey-agent when you log in. Also sets
|
Whether to start yubikey-agent when you log in. Also sets
|
||||||
|
@ -35,17 +31,17 @@ in
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
package = mkPackageOption pkgs "yubikey-agent" { };
|
package = lib.mkPackageOption pkgs "yubikey-agent" { };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
environment.systemPackages = [ cfg.package ];
|
environment.systemPackages = [ cfg.package ];
|
||||||
systemd.packages = [ cfg.package ];
|
systemd.packages = [ cfg.package ];
|
||||||
|
|
||||||
# This overrides the systemd user unit shipped with the
|
# This overrides the systemd user unit shipped with the
|
||||||
# yubikey-agent package
|
# yubikey-agent package
|
||||||
systemd.user.services.yubikey-agent = mkIf (config.programs.gnupg.agent.pinentryPackage != null) {
|
systemd.user.services.yubikey-agent = lib.mkIf (config.programs.gnupg.agent.pinentryPackage != null) {
|
||||||
path = [ config.programs.gnupg.agent.pinentryPackage ];
|
path = [ config.programs.gnupg.agent.pinentryPackage ];
|
||||||
wantedBy = [ "default.target" ];
|
wantedBy = [ "default.target" ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue