diff options
| author | lassulus <lassulus@lassul.us> | 2017-09-06 11:07:59 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-09-06 11:07:59 +0200 |
| commit | 428a5f037ef8a5d6b0ef5bc0ea74dcd458fd5b16 (patch) | |
| tree | 0bcc67e7d0f4ff22ca7e4840608f72015a49fbdd /makefu/2configs/hw | |
| parent | 6218a259a9880368c71ecacddcf1e7c641bd5278 (diff) | |
| parent | a46564bf986829cd7372020ed4962af15a5c5983 (diff) | |
Merge remote-tracking branch 'gum/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 ]; +} |