summaryrefslogtreecommitdiffstats
path: root/tv/2configs/default.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-04-28 14:18:00 +0200
committerlassulus <lassulus@lassul.us>2019-04-28 14:18:00 +0200
commit915e4b843790d3e71bdccea124d4832ca042e456 (patch)
treea375c5be89afe8ff04ffa4f1e45c8bcd388590af /tv/2configs/default.nix
parent710609af31b72abf805370f3fe322daa41c1a55b (diff)
parent73e89ece549bad03d97326cc94e9ba59a762d298 (diff)
Merge remote-tracking branch 'ni/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;