From bb5446ecfff591874303cde18e5432d0a43688bf Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 4 Sep 2017 10:12:30 +0200
Subject: ma x: use new dnscrypt client

---
 makefu/1systems/x/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/1systems/x')

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 8e8c8a736..d6a595c99 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -12,7 +12,7 @@ with import <stockholm/lib>;
       <stockholm/makefu/2configs/extra-fonts.nix>
       <stockholm/makefu/2configs/tools/all.nix>
       <stockholm/makefu/2configs/laptop-backup.nix>
-      <stockholm/makefu/2configs/dnscrypt.nix>
+      <stockholm/makefu/2configs/dnscrypt/client.nix>
       <stockholm/makefu/2configs/avahi.nix>
 
       # Debugging
-- 
cgit v1.3.1


From 8566c70dd0c9097ed5dbf7e8ae12292e9459157a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 4 Sep 2017 10:12:51 +0200
Subject: ma x: enable tpm

---
 makefu/1systems/x/config.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'makefu/1systems/x')

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index d6a595c99..03ba1268e 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -33,6 +33,7 @@ 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>
@@ -54,6 +55,7 @@ with import <stockholm/lib>;
       # Services
       <stockholm/makefu/2configs/git/brain-retiolum.nix>
       <stockholm/makefu/2configs/tor.nix>
+      <stockholm/makefu/2configs/vpn/vpngate.nix>
       <stockholm/makefu/2configs/steam.nix>
       # <stockholm/makefu/2configs/buildbot-standalone.nix>
 
-- 
cgit v1.3.1


From 5898caa146e216a1e5462dddb943abe07aea1b4d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 4 Sep 2017 14:35:56 +0200
Subject: ma hw: add tpm to x2x0

---
 makefu/1systems/x/config.nix   | 2 +-
 makefu/2configs/hw/tp-x2x0.nix | 3 +++
 makefu/2configs/hw/tpm.nix     | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 makefu/2configs/hw/tpm.nix

(limited to 'makefu/1systems/x')

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 ];
+}
-- 
cgit v1.3.1