From 03f1aea069f11a2dbf32381aa6dc73e23fcb1f2b Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Mon, 11 Feb 2019 21:23:07 +0100 Subject: [PATCH] autorandr: add support for xrandr scale and dpi --- modules/programs/autorandr.nix | 73 ++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/modules/programs/autorandr.nix b/modules/programs/autorandr.nix index 05a086eb..e24edbbd 100644 --- a/modules/programs/autorandr.nix +++ b/modules/programs/autorandr.nix @@ -114,6 +114,61 @@ let for the documentation of the transform matrix. ''; }; + + dpi = mkOption { + type = types.nullOr types.ints.positive; + description = "Output DPI configuration."; + default = null; + example = 96; + }; + + scale = mkOption { + type = types.nullOr (types.submodule { + options = { + method = mkOption { + type = types.enum ["factor" "pixel" ]; + description = "Output scaling method."; + default = "factor"; + example = "pixel"; + }; + + x = mkOption { + type = types.either types.float types.ints.positive; + description = "Horizontal scaling factor/pixels."; + }; + + y = mkOption { + type = types.either types.float types.ints.positive; + description = "Vertical scaling factor/pixels."; + }; + }; + }); + description = '' + Output scale configuration. + + Either configure by pixels or a scaling factor. When using pixel method the + + xrandr + 1 + + option + --scale-from + will be used; when using factor method the option + --scale + will be used. + + This option is a shortcut version of the transform option and they are mutually + exclusive. + ''; + default = null; + example = literalExample '' + { + method = "factor"; + x = 1.25; + y = 1.25; + } + ''; + }; }; }; @@ -181,10 +236,15 @@ let output ${name} ${optionalString (config.position != "") "pos ${config.position}"} ${optionalString config.primary "primary"} + ${optionalString (config.dpi != null) "dpi ${toString config.dpi}"} ${optionalString (config.gamma != "") "gamma ${config.gamma}"} ${optionalString (config.mode != "") "mode ${config.mode}"} ${optionalString (config.rate != "") "rate ${config.rate}"} ${optionalString (config.rotate != null) "rotate ${config.rotate}"} + ${optionalString (config.scale != null) ( + (if config.scale.method == "factor" then "scale" else "scale-from") + + " ${toString config.scale.x}x${toString config.scale.y}" + )} ${optionalString (config.transform != null) ( "transform " + concatMapStringsSep "," toString (flatten config.transform) )} @@ -264,6 +324,19 @@ in }; config = mkIf cfg.enable { + assertions = flatten (mapAttrsToList ( + profile: { config, ... }: mapAttrsToList ( + output: opts: { + assertion = opts.scale == null || opts.transform == null; + message = '' + Cannot use the profile output options 'scale' and 'transform' simultaneously. + Check configuration for: programs.autorandr.profiles.${profile}.config.${output} + ''; + }) + config + ) + cfg.profiles); + home.packages = [ pkgs.autorandr ]; xdg.configFile = mkMerge ([ (mapAttrs' (hookToFile "postswitch.d") cfg.hooks.postswitch)