diff options
author | tv <tv@krebsco.de> | 2017-09-07 22:51:48 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2017-09-07 22:51:48 +0200 |
commit | e4969bf3e77a5d3bc39625ad784227438640d126 (patch) | |
tree | f6fbc14e2b675a512ec698cbdae33fa3fd8d25ca /makefu/2configs/hw | |
parent | 66738262eeb30e29f2743d0e0424d10722f5e2af (diff) | |
parent | 46a3f4c24315836c1d82711d98f4d69be67d883d (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs/hw')
-rw-r--r-- | makefu/2configs/hw/tp-x2x0.nix | 3 | ||||
-rw-r--r-- | makefu/2configs/hw/tpm.nix | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix index 02bd8bb01..81c4bf4c8 100644 --- a/makefu/2configs/hw/tp-x2x0.nix +++ b/makefu/2configs/hw/tp-x2x0.nix @@ -2,6 +2,9 @@ with import <stockholm/lib>; { + imports = [ + ./tpm.nix + ]; networking.wireless.enable = lib.mkDefault true; hardware.enableAllFirmware = true; diff --git a/makefu/2configs/hw/tpm.nix b/makefu/2configs/hw/tpm.nix new file mode 100644 index 000000000..29e19e916 --- /dev/null +++ b/makefu/2configs/hw/tpm.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + services.tcsd.enable = true; + # see https://wiki.archlinux.org/index.php/Trusted_Platform_Module + environment.systemPackages = with pkgs; [ opencryptoki tpm-tools ]; +} |