summaryrefslogtreecommitdiffstats
path: root/tv/2configs/default.nix
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2019-04-28 15:05:34 +0200
committerjeschli <jeschli@gmail.com>2019-04-28 15:05:34 +0200
commite45b3492b3961685936378a160adb225789e51d9 (patch)
treecc0480e485ab78d1f52f80ec36987b9a57e925f7 /tv/2configs/default.nix
parent97d4f9a771a9bbb1b45085569028db2d7dfbd610 (diff)
parent915e4b843790d3e71bdccea124d4832ca042e456 (diff)
Merge branch 'master' of prism.r:stockholm
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;