From cfabf76584e9468251535319ba393f70b5b7889e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 17 Jul 2024 12:33:13 +0200 Subject: [PATCH 1/2] nix: bump nixpkgs, fix wlr-randr cross Contains https://github.com/NixOS/nixpkgs/pull/327863 --- nix/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 51e9c48..ef8202a 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -3,12 +3,12 @@ "branch": "nixos-unstable", "description": "Nix Packages collection", "homepage": null, - "owner": "NixOS", + "owner": "flokli", "repo": "nixpkgs", - "rev": "9e3825de8dbe84ae96c09000bc73ea1b82e7529b", - "sha256": "0jqhxwmqa5mriwmp41wjsi3c6srp9njk9qrv531d7f1dyzz0hnwh", + "rev": "d7c6aaa12742fc4b7b7151885c24b96a90159baf", + "sha256": "1847wrkm765fj92jjs8b4vabqj34rnxzkxp3hi9l5iyl4ycs7qar", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/9e3825de8dbe84ae96c09000bc73ea1b82e7529b.tar.gz", + "url": "https://github.com/flokli/nixpkgs/archive/d7c6aaa12742fc4b7b7151885c24b96a90159baf.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } From 0edd702c3a530c514075b8d9e7b870f41a01de1d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 17 Jul 2024 13:00:34 +0200 Subject: [PATCH 2/2] nix/configuration: rotate output by 180 These displays are all mounted upside-down, for now just hardcode this. The proper fix would be to control these with https://wayland.app/protocols/wlr-output-management-unstable-v1 and decide where to put it. --- nix/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nix/configuration.nix b/nix/configuration.nix index daad010..0899806 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -70,7 +70,10 @@ services.cage = { enable = true; user = "kiosk"; - program = "${pkgs.fossbeamer}/bin/fossbeamer --default-config=${../default-config.json} https://example.com"; + program = pkgs.writers.writeBash "run-cage-program" '' + ${pkgs.wlr-randr}/bin/wlr-randr --output HDMI-A-1 --transform 180 + ${pkgs.fossbeamer}/bin/fossbeamer --default-config=${../default-config.json} https://wip.bar + ''; environment = { GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with pkgs.gst_all_1;[ gstreamer