summaryrefslogtreecommitdiffstats
path: root/tv/2configs/default.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2019-05-10 21:02:33 +0200
committermakefu <github@syntax-fehler.de>2019-05-10 21:02:33 +0200
commit45f2d6af58967d42dc0cd6b11daacb7878b300a8 (patch)
treeeb2ea5c218c3613168226cb8bf4b095fb2aac074 /tv/2configs/default.nix
parentc07c0412418e3979e609fd5200a34dd1830e9334 (diff)
parent222160fc3a195415e859048bdef21f703154b3ee (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs/default.nix')
-rw-r--r--tv/2configs/default.nix10
1 files changed, 1 insertions, 9 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index ac0a6af4d..4fc755c43 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -17,6 +17,7 @@ with import <stockholm/lib>;
./bash
./htop.nix
./nginx
+ ./pki
./ssh.nix
./sshd.nix
./vim.nix
@@ -91,15 +92,6 @@ with import <stockholm/lib>;
}
{
- environment.variables =
- flip genAttrs (_: "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt") [
- "CURL_CA_BUNDLE"
- "GIT_SSL_CAINFO"
- "SSL_CERT_FILE"
- ];
- }
-
- {
services.cron.enable = false;
services.nscd.enable = false;
services.ntp.enable = false;