From e0cb068a4bbad0beda3b5c8c8a25aa37df631d40 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Apr 2023 01:18:48 +0200 Subject: slylandro: Remove hidpi specific settings for now This reverts commit c88fd9eaa12c8a3c06502b09c2056d3c91421952. The hardware.video.hidpi.enable option was removed a while ago[1] because it's not clear what a single boolean option should mean, so it doesn't make sense anymore to make any of our options depend on it. Forthermore, I'm experimenting with different Wayland compositors at the moment and most of the stuff that I did here is for Xorg. I expect most of the stuff to be gone when I'm settled with a Wayland setup that works for me. [1]: https://github.com/NixOS/nixpkgs/pull/222689 Signed-off-by: aszlig --- pkgs/aszlig/psi/config.patch | 8 ++++---- pkgs/aszlig/psi/default.nix | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'pkgs/aszlig') diff --git a/pkgs/aszlig/psi/config.patch b/pkgs/aszlig/psi/config.patch index ea45fbd5..0fe49d66 100644 --- a/pkgs/aszlig/psi/config.patch +++ b/pkgs/aszlig/psi/config.patch @@ -131,10 +131,10 @@ index f4b71f53..387793a0 100644 - Sans Serif,11,-1,5,50,0,0,0,0,0 - Sans Serif,11,-1,5,50,0,0,0,0,0 - Sans Serif,9,-1,5,50,0,0,0,0,0 -+ Monospace,@faceSize@,-1,5,50,0,0,0,0,0 -+ Monospace,@faceSize@,-1,5,50,0,0,0,0,0 -+ Monospace,@faceSize@,-1,5,50,0,0,0,0,0 -+ Monospace,@faceSize@,-1,5,50,0,0,0,0,0 ++ Monospace,12,-1,5,50,0,0,0,0,0 ++ Monospace,12,-1,5,50,0,0,0,0,0 ++ Monospace,12,-1,5,50,0,0,0,0,0 ++ Monospace,12,-1,5,50,0,0,0,0,0 diff --git a/pkgs/aszlig/psi/default.nix b/pkgs/aszlig/psi/default.nix index 9ca2693f..9f0f12b8 100644 --- a/pkgs/aszlig/psi/default.nix +++ b/pkgs/aszlig/psi/default.nix @@ -6,7 +6,6 @@ , jid ? "something@example.org" , resource ? "psi-aszlig" -, faceSize ? 12 }: let @@ -56,7 +55,7 @@ in stdenv.mkDerivation rec { ./keep-urgency-hint.patch (substituteAll { src = ./config.patch; - inherit jid resource faceSize; + inherit jid resource; }) ]; -- cgit 1.4.1