From 2ff744d3e932372e401a49e38f14cec9a699279d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 11 Feb 2021 23:21:11 +0100
Subject: tv public_html: move to /srv

---
 tv/2configs/nginx/public_html.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tv/2configs')

diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix
index a37498ba3..43d7189ef 100644
--- a/tv/2configs/nginx/public_html.nix
+++ b/tv/2configs/nginx/public_html.nix
@@ -12,9 +12,9 @@ with import <stockholm/lib>;
         "${config.krebs.build.host.name}.hkw"
         "${config.krebs.build.host.name}.r"
       ];
-      locations."~ ^/~(.+?)(/.*)?\$".extraConfig = ''
-        alias /home/$1/public_html$2;
-      '';
+      locations."~ ^/~([a-z]+)(?:/(.*))?\$" = {
+        alias = "/srv/$1/public_html/$2";
+      };
     };
   };
   tv.iptables.input-internet-accept-tcp = singleton "http";
-- 
cgit v1.2.3


From e249b2d8d4c9368a911ac1d5d7492c14a9602c05 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 15 Feb 2021 14:00:47 +0100
Subject: tv config: define primary screens

---
 tv/2configs/hw/AO753.nix  | 3 +++
 tv/2configs/hw/w110er.nix | 3 +++
 tv/2configs/hw/x220.nix   | 7 ++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'tv/2configs')

diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix
index a91a5e518..469f5c6f8 100644
--- a/tv/2configs/hw/AO753.nix
+++ b/tv/2configs/hw/AO753.nix
@@ -44,4 +44,7 @@ with import <stockholm/lib>;
   '';
 
   krebs.nixpkgs.allowUnfreePredicate = pkg: packageName pkg == "broadcom-sta";
+
+  tv.hw.screens.primary.width = 1366;
+  tv.hw.screens.primary.height = 768;
 }
diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix
index 7d837eabc..693cef5ac 100644
--- a/tv/2configs/hw/w110er.nix
+++ b/tv/2configs/hw/w110er.nix
@@ -59,4 +59,7 @@ with import <stockholm/lib>;
   services.xserver = {
     videoDriver = "intel";
   };
+
+  tv.hw.screens.primary.width = 1366;
+  tv.hw.screens.primary.height = 768;
 }
diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index aadfc6691..ecbb84a44 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -1,4 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, ... }: let
+  lib = import <stockholm/lib>;
+in
 {
   imports = [
     ../smartd.nix
@@ -74,4 +76,7 @@
   services.xserver = {
     videoDriver = "intel";
   };
+
+  tv.hw.screens.primary.width = lib.mkDefault 1366;
+  tv.hw.screens.primary.height = lib.mkDefault 768;
 }
-- 
cgit v1.2.3