summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-08-11 12:12:13 +0200
committermakefu <github@syntax-fehler.de>2020-08-11 12:12:13 +0200
commit4cb0ff12ba563693b6be7aac3c7cc8c6ce7a003c (patch)
tree2eceb32d72c1799938bce57240566ba576c2c3b4 /tv/2configs
parent93606315b99a2540c5859d93eb2377ae32fa6506 (diff)
parentf556a302f62434e0a47ef23db7e569bdb9c489f6 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/binary-cache/default.nix8
-rw-r--r--tv/2configs/default.nix1
2 files changed, 7 insertions, 2 deletions
diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
index 39c944b1a..866434cb5 100644
--- a/tv/2configs/binary-cache/default.nix
+++ b/tv/2configs/binary-cache/default.nix
@@ -9,8 +9,12 @@
};
systemd.services.nix-serve = {
- requires = ["secret.service"];
- after = ["secret.service"];
+ after = [
+ config.krebs.secret.files.binary-cache-seckey.service
+ ];
+ partOf = [
+ config.krebs.secret.files.binary-cache-seckey.service
+ ];
};
krebs.secret.files.binary-cache-seckey = {
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 72c48da2c..4d27b0eac 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -36,6 +36,7 @@ with import <stockholm/lib>;
};
}
{
+ i18n.defaultLocale = mkDefault "C.UTF-8";
security.hideProcessInformation = true;
security.sudo.extraConfig = ''
Defaults env_keep+="SSH_CLIENT XMONAD_SPAWN_WORKSPACE"