diff options
| author | makefu <github@syntax-fehler.de> | 2021-02-15 19:09:42 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2021-02-15 19:09:42 +0100 |
| commit | 9b0c37aa8d2da888ca4075365249f0e6109b4fb7 (patch) | |
| tree | 3b7b267cb109c6aa6b7d8d036fd962791b7bfb03 /tv/2configs | |
| parent | 424bed37941a2d0db083e76ef5183fbf2cb950c2 (diff) | |
| parent | dbc0e3d5dee0ffdfcbdfbf394590cd340bb5c469 (diff) | |
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'tv/2configs')
| -rw-r--r-- | tv/2configs/hw/AO753.nix | 3 | ||||
| -rw-r--r-- | tv/2configs/hw/w110er.nix | 3 | ||||
| -rw-r--r-- | tv/2configs/hw/x220.nix | 7 | ||||
| -rw-r--r-- | tv/2configs/nginx/public_html.nix | 6 |
4 files changed, 15 insertions, 4 deletions
diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix index a91a5e5..469f5c6 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 7d837ea..693cef5 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 aadfc66..ecbb84a 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; } diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix index a37498b..43d7189 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"; |