From 1f4bd3abb7469d1a601173f24fff535075540b31 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:39 +0100 Subject: [PATCH] nixos/services.yubikey-agent: remove `with lib;` --- .../modules/services/security/yubikey-agent.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix index c746730ca51d..872e605f6881 100644 --- a/nixos/modules/services/security/yubikey-agent.nix +++ b/nixos/modules/services/security/yubikey-agent.nix @@ -1,21 +1,17 @@ # Global configuration for yubikey-agent. - { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.yubikey-agent; in { ###### interface - meta.maintainers = with maintainers; [ + meta.maintainers = with lib.maintainers; [ philandstuff rawkode ]; @@ -23,8 +19,8 @@ in options = { services.yubikey-agent = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' 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 ]; systemd.packages = [ cfg.package ]; # This overrides the systemd user unit shipped with the # 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 ]; wantedBy = [ "default.target" ]; };