summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2018-10-27 15:02:39 +0200
committertv <tv@krebsco.de>2018-10-27 15:02:39 +0200
commit212bc39249f9792cbedf2e9a6b3fed90c52c63e7 (patch)
treede2a5cf0be852b8beb8317481649460194f40d5b /tv
parent34e1f09bf5e233bee78ee63166d2a1d9944a51f9 (diff)
parent24f4e8dcf0eca55378fa018a9ed980625222653d (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/2configs/xserver/default.nix4
-rw-r--r--tv/krops.nix1
2 files changed, 3 insertions, 2 deletions
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 892b7e3b8..dbfa804d2 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -45,8 +45,8 @@ in {
displayManager.job.execCmd = mkForce "derp";
enable = true;
- display = 11;
- tty = 11;
+ display = mkForce 11;
+ tty = mkForce 11;
synaptics = {
enable = true;
diff --git a/tv/krops.nix b/tv/krops.nix
index 231486ab7..e922630f7 100644
--- a/tv/krops.nix
+++ b/tv/krops.nix
@@ -16,6 +16,7 @@
# usage: $(nix-build --no-out-link --argstr name HOSTNAME --argstr target PATH -A test)
test = { target }: pkgs.krops.writeTest "tv-krops-${name}-ci" {
+ force = true;
inherit source target;
};