Merge remote-tracking branch 'tv/master'

8 files changed, 35 insertions, 18 deletions

diff --git a/tv/1systems/au/config.nix b/tv/1systems/au/config.nix
index 3891b7570..d9ba53912 100644
--- a/tv/1systems/au/config.nix
+++ b/tv/1systems/au/config.nix
@@ -16,4 +16,7 @@
   networking.interfaces.wwp0s29u1u4i6.useDHCP = true;
 
   system.stateVersion = "20.03";
+
+  tv.hw.screens.primary.width = 1920;
+  tv.hw.screens.primary.height = 1080;
 }
diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index f9c3860ed..f0ef6f9b0 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -7,10 +7,6 @@ with import <stockholm/lib>;
     <stockholm/tv>
     <stockholm/tv/2configs/hw/w110er.nix>
     <stockholm/tv/2configs/exim-retiolum.nix>
-    <stockholm/tv/2configs/gitrepos.nix>
-    <stockholm/tv/2configs/mail-client.nix>
-    <stockholm/tv/2configs/man.nix>
-    <stockholm/tv/2configs/nginx/public_html.nix>
     <stockholm/tv/2configs/pulse.nix>
     <stockholm/tv/2configs/retiolum.nix>
     <stockholm/tv/2configs/xserver>
@@ -38,14 +34,4 @@ with import <stockholm/lib>;
 
   networking.wireless.enable = true;
 
-  services.printing.enable = true;
-
-  services.udev.extraRules = ''
-    SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"
-    SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0"
-
-    # for jack
-    KERNEL=="rtc0", GROUP="audio"
-    KERNEL=="hpet", GROUP="audio"
-  '';
 }
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;
 }
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";
diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix
index 5be1beef8..9f2f8e606 100644
--- a/tv/3modules/default.nix
+++ b/tv/3modules/default.nix
@@ -5,6 +5,7 @@
     ./ejabberd
     ./focus.nix
     ./hosts.nix
+    ./hw.nix
     ./im.nix
     ./iptables.nix
     ./slock.nix
diff --git a/tv/3modules/hw.nix b/tv/3modules/hw.nix
new file mode 100644
index 000000000..6eb722d2f
--- /dev/null
+++ b/tv/3modules/hw.nix
@@ -0,0 +1,16 @@
+let
+  lib = import <stockholm/lib>;
+  local.types.screen = lib.types.submodule {
+    options.width = lib.mkOption {
+      type = lib.types.uint;
+    };
+    options.height = lib.mkOption {
+      type = lib.types.uint;
+    };
+  };
+in {
+  options.tv.hw.screens = lib.mkOption {
+    type = lib.types.attrsOf local.types.screen;
+    default = {};
+  };
+}