summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-23 21:11:11 +0200
committermakefu <github@syntax-fehler.de>2017-07-23 21:11:11 +0200
commit1e3931d983127bb2cf5fc93471bacfc9770e5b08 (patch)
tree9308da0abd27ad72547bc765e9a4100ccc71630b /tv/2configs
parentfd7d1531acd5345136dad71bdcd1050176d88cd6 (diff)
parent1bf9e1e1eea95ea9efeb72a48e19a6df11881a7f (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/nginx/krebs-pages.nix13
-rw-r--r--tv/2configs/vim.nix1
2 files changed, 14 insertions, 0 deletions
diff --git a/tv/2configs/nginx/krebs-pages.nix b/tv/2configs/nginx/krebs-pages.nix
new file mode 100644
index 000000000..4dd643db7
--- /dev/null
+++ b/tv/2configs/nginx/krebs-pages.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+{
+ services.nginx = {
+ virtualHosts.krebs-pages = {
+ serverAliases = [
+ "krebs.${config.krebs.build.host.name}.r"
+ ];
+ extraConfig = ''
+ root ${pkgs.krebs-pages};
+ '';
+ };
+ };
+}
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 7849b6f2d..f0b1cf520 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -230,6 +230,7 @@ let {
''write\(Ba\|Da\)sh[^ \t\r\n]*[ \t\r\n]*"[^"]*"''
''[a-z]*Phase[ \t\r\n]*=''
];
+ yaml = {};
vim.extraStart =
''write[^ \t\r\n]*[ \t\r\n]*"\(\([^"]*\.\)\?vimrc\|[^"]*\.vim\)"'';
xdefaults = {};