simon/nixos-config
simon/nixos-config
1
1
Fork 0
Code Issues 8 Pull requests Actions Projects Activity

nitrokey: Fix module

Browse source 
For some reason, using the // atribute set merge operator does not work
here.
This commit is contained in:
Simon Bruder 2024-01-22 00:09:37 +01:00
parent 54218c7278
commit 04a0a6e5ff
Signed by: simon
GPG key ID: 347FF8699CDA0776
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/nitrokey.nix
View file

@ -1,16 +1,19 @@
# SPDX-FileCopyrightText: 2023 Simon Bruder <simon@sbruder.de> # SPDX-FileCopyrightText: 2023-2024 Simon Bruder <simon@sbruder.de>
# #
# SPDX-License-Identifier: AGPL-3.0-or-later # SPDX-License-Identifier: AGPL-3.0-or-later
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ lib.mkMerge [
hardware.nitrokey.enable = true; {
} // (lib.mkIf config.sbruder.gui.enable { hardware.nitrokey.enable = true;
environment.systemPackages = with pkgs; [ }
# both depend on pypemicro, which is not needed, but nixpkgs requires it (lib.mkIf config.sbruder.gui.enable {
# (even though it could have been optional: https://github.com/NixOS/nixpkgs/pull/183099#discussion_r933226708) environment.systemPackages = with pkgs; [
#nitrokey-app2 # both depend on pypemicro, which is not needed, but nixpkgs requires it
#pynitrokey # (even though it could have been optional: https://github.com/NixOS/nixpkgs/pull/183099#discussion_r933226708)
]; #nitrokey-app2
}) #pynitrokey
];
})
]