Merge remote-tracking branch 'nextgum/master'

2 files changed, 26 insertions, 10 deletions

diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index 861a9327e..6bcd09826 100644
--- a/makefu/2configs/gui/base.nix
+++ b/makefu/2configs/gui/base.nix
@@ -66,7 +66,7 @@ in
       cat |derp <<EOF
       XTerm*background: black
       XTerm*foreground: white
-      XTerm*FaceName  : xft:xos4 Terminus:pixelsize=11
+      XTerm*FaceName  : xft:Terminus:pixelsize=12
 
       URxvt*termName:         rxvt
       URxvt*saveLines:            10000
@@ -78,7 +78,7 @@ in
       URxvt.background: black
       URxvt.urgentOnBell: true
       URxvt.visualBell: false
-      URxvt.font : xft:xos4 Terminus:size=11
+      URxvt.font : xft:Terminus:size=12
 
 
       ! blue
diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix
index 7db749227..6da1a37e7 100644
--- a/makefu/2configs/gui/wbob-kiosk.nix
+++ b/makefu/2configs/gui/wbob-kiosk.nix
@@ -4,22 +4,38 @@
   imports = [
       ./base.nix
   ];
-  users.users.makefu.packages = [ pkgs.chromium ];
+  users.users.makefu = {
+    packages = [ pkgs.chromium ];
+    extraGroups = [ "audio" "pulse" ];
+  };
   services.xserver = {
-    layout = lib.mkForce "de";
-    xkbVariant = lib.mkForce "";
 
     windowManager = lib.mkForce {
       awesome.enable = false;
       default = "none";
     };
-    desktopManager.xfce.enable = true;
+    desktopManager.xfce = {
+      extraSessionCommands = ''
+        ${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms
+        ${pkgs.xlibs.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1
+      '';
+      enable = true;
+    };
 
     # xrandrHeads = [ "HDMI1" "HDMI2" ];
     # prevent screen from turning off, disable dpms
-    displayManager.sessionCommands = ''
-      xset -display :0 s off -dpms
-      xrandr --output HDMI2 --right-of HDMI1
-    '';
   };
+
+  systemd.services.xset-off = {
+    after = [ "display-manager.service" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      ExecStart = "${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms";
+      RemainAfterExit = "yes";
+      TimeoutSec = "5s";
+      RestartSec="5s";
+      Restart = "on-failure";
+    };
+  };
+
 }