diff options
| author | makefu <github@syntax-fehler.de> | 2017-09-04 14:35:56 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-09-04 14:35:56 +0200 |
| commit | 5898caa146e216a1e5462dddb943abe07aea1b4d (patch) | |
| tree | a42612c31e8d5e163efbc44d7c13a1843523dc1b | |
| parent | 8caeb60777b230ccf0db1a00c9c225e63425a81c (diff) | |
ma hw: add tpm to x2x0
| -rw-r--r-- | makefu/1systems/x/config.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/hw/tp-x2x0.nix | 3 | ||||
| -rw-r--r-- | makefu/2configs/hw/tpm.nix | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 03ba1268e..faa29f3db 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -20,6 +20,7 @@ with import <stockholm/lib>; # Testing # <stockholm/makefu/2configs/deployment/gitlab.nix> + # <stockholm/makefu/2configs/deployment/wiki-irc-bot> # <stockholm/makefu/2configs/torrent.nix> # <stockholm/makefu/2configs/lanparty/lancache.nix> @@ -33,7 +34,6 @@ with import <stockholm/lib>; <stockholm/makefu/2configs/tinc/retiolum.nix> # applications - <stockholm/makefu/2configs/tpm.nix> <stockholm/makefu/2configs/exim-retiolum.nix> <stockholm/makefu/2configs/mail-client.nix> <stockholm/makefu/2configs/printer.nix> 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 ]; +} |