summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/default.nix17
-rw-r--r--tv/2configs/git.nix7
-rw-r--r--tv/2configs/retiolum.nix3
3 files changed, 15 insertions, 12 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 39d0c4f6b..dbf311479 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
stockholm.file = "/home/tv/stockholm";
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs;
- ref = "e4fb65a3627f8c17a2f92c08bf302dc30f0a8db9";
+ ref = "1e1112edc57e93046f35707b874d2a4f3ff321e6";
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";
@@ -112,13 +112,14 @@ with import <stockholm/lib>;
};
}
- (let ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; in {
- environment.variables = {
- CURL_CA_BUNDLE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
- GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
- SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
- };
- })
+ {
+ 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;
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index d937be2c4..b6724f40e 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -32,6 +32,9 @@ let
get = {};
hack = {};
load-env = {};
+ loldns = {
+ cgit.desc = "toy DNS server";
+ };
make-snapshot = {};
much = {};
netcup = {
@@ -81,12 +84,12 @@ let
make-public-repo = name: { cgit ? {}, ... }: {
inherit cgit name;
public = true;
- hooks = optionalAttrs (config.krebs.build.host.name == "cd") {
+ hooks = optionalAttrs (config.krebs.build.host.name == "ni") {
post-receive = pkgs.git-hooks.irc-announce {
# TODO make nick = config.krebs.build.host.name the default
nick = config.krebs.build.host.name;
channel = "#retiolum";
- server = "cd.retiolum";
+ server = "ni.r";
verbose = true;
};
};
diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix
index ad1116d4f..a914dad43 100644
--- a/tv/2configs/retiolum.nix
+++ b/tv/2configs/retiolum.nix
@@ -7,9 +7,8 @@ with import <stockholm/lib>;
enable = true;
connectTo = filter (ne config.krebs.build.host.name) [
"gum"
+ "ni"
"prism"
- "echelon"
- "cd"
];
tincPackage = pkgs.tinc_pre;
};