diff options
| author | tv <tv@krebsco.de> | 2018-10-27 15:02:39 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-10-27 15:02:39 +0200 |
| commit | 648285767aa63e618db8ed23ca5d88443e07dca0 (patch) | |
| tree | 98ea2a94e0064d25e013ac1b10eef95b0a943412 /tv | |
| parent | 8f5dc7af96cd1211982ed0cf325d3b89b2bd1646 (diff) | |
| parent | 383c1dba38f8f61b61e5325b2cb57578766027a8 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/xserver/default.nix | 4 | ||||
| -rw-r--r-- | tv/krops.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index 892b7e3..dbfa804 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 231486a..e922630 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; }; |