diff options
| author | Nicolas Berbiche <nic.berbiche@gmail.com> | 2020-08-18 18:49:15 -0400 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2020-09-04 16:45:42 +0200 |
| commit | 182454fe6b2342011ac3ae7c93cf5fb0ccd17bd7 (patch) | |
| tree | 58d3703d01ef836e03d4bec656195761b183bf4b | |
| parent | a063b73d5cf2d741f5f873897974d1a4c3e36d3d (diff) | |
kanshi: fix exec configuration
Also add a test case for the exec option.
PR #1446
| -rw-r--r-- | modules/services/kanshi.nix | 2 | ||||
| -rw-r--r-- | tests/modules/services/kanshi/basic-configuration.conf | 1 | ||||
| -rw-r--r-- | tests/modules/services/kanshi/basic-configuration.nix | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/modules/services/kanshi.nix b/modules/services/kanshi.nix index e54b83aa4c5..4e5e5f104e6 100644 --- a/modules/services/kanshi.nix +++ b/modules/services/kanshi.nix @@ -120,7 +120,7 @@ let '' profile ${name} { ${concatStringsSep "\n " (map outputStr outputs)} - '' + optionalString (exec != null) " ${exec}" + '' + '' + optionalString (exec != null) " exec ${exec}\n" + '' } ''; in { diff --git a/tests/modules/services/kanshi/basic-configuration.conf b/tests/modules/services/kanshi/basic-configuration.conf index 905a539d0db..9d6442b985b 100644 --- a/tests/modules/services/kanshi/basic-configuration.conf +++ b/tests/modules/services/kanshi/basic-configuration.conf @@ -2,6 +2,7 @@ profile desktop { output "eDP-1" disable output "Iiyama North America PLE2483H-DP" enable position 0,0 output "Iiyama North America PLE2483H-DP 1158765348486" enable mode 1920x1080 position 1920,0 scale 2.100000 transform flipped-270 + exec echo "1 two 3" } profile nomad { diff --git a/tests/modules/services/kanshi/basic-configuration.nix b/tests/modules/services/kanshi/basic-configuration.nix index 08a2c167ea7..15fbbb9ceb1 100644 --- a/tests/modules/services/kanshi/basic-configuration.nix +++ b/tests/modules/services/kanshi/basic-configuration.nix @@ -11,6 +11,7 @@ }]; }; desktop = { + exec = ''echo "1 two 3"''; outputs = [ { criteria = "eDP-1"; |