summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-09-04 14:35:56 +0200
committerlassulus <lassulus@lassul.us>2017-09-06 11:05:45 +0200
commit3e429bdead5eb70ca288f9a3898ff2fb5a5c161e (patch)
tree6b9bb4bd031c6cd1b8367574e0309d4c0c1e7d09
parent9646fa5cf7e90aef951d79948675ffb2f521fd52 (diff)
ma hw: add tpm to x2x0
-rw-r--r--makefu/1systems/x/config.nix2
-rw-r--r--makefu/2configs/hw/tp-x2x0.nix3
-rw-r--r--makefu/2configs/hw/tpm.nix6
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 ];
+}