From af95f7b7ec80811cd5662d6b08b45f0160c85d1d Mon Sep 17 00:00:00 2001 From: aspauldingcode Date: Sun, 29 Sep 2024 17:29:14 -0600 Subject: [PATCH 1/3] add JankyBorders option order and set below by default (values: above/below) --- modules/services/jankyborders/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/services/jankyborders/default.nix b/modules/services/jankyborders/default.nix index 92ec1a1f..0af6d153 100644 --- a/modules/services/jankyborders/default.nix +++ b/modules/services/jankyborders/default.nix @@ -80,6 +80,15 @@ in { ''; }; + order = mkOption { + type = types.str; + default = "below"; + example = "above"; + description = '' + Specifies whether borders should be drawn above or below windows. + ''; + }; + blur_radius = mkOption { type = types.float; default = 0.0; @@ -149,7 +158,8 @@ in { else "off" )) ++ (optionalArg "blacklist" (joinStrings cfg.blacklist)) - ++ (optionalArg "whitelist" (joinStrings cfg.whitelist)); + ++ (optionalArg "whitelist" (joinStrings cfg.whitelist)) + ++ (optionalArg "order" cfg.order); serviceConfig.KeepAlive = true; serviceConfig.RunAtLoad = true; }; From 5cd9995215f0bc183811f0e4be017afa9a9a5e56 Mon Sep 17 00:00:00 2001 From: "Alex S." Date: Wed, 2 Oct 2024 10:38:08 -0600 Subject: [PATCH 2/3] Update modules/services/jankyborders/default.nix Co-authored-by: Michael Hoang --- modules/services/jankyborders/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/jankyborders/default.nix b/modules/services/jankyborders/default.nix index 0af6d153..cb7ab1eb 100644 --- a/modules/services/jankyborders/default.nix +++ b/modules/services/jankyborders/default.nix @@ -81,7 +81,7 @@ in { }; order = mkOption { - type = types.str; + type = types.enum [ "above" "below" ]; default = "below"; example = "above"; description = '' From 2893a1bcf71891c1db934773bc3c7ed46b0a1448 Mon Sep 17 00:00:00 2001 From: aspauldingcode Date: Thu, 3 Oct 2024 08:01:15 -0600 Subject: [PATCH 3/3] push change to jankyborders test --- tests/services-jankyborders.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/services-jankyborders.nix b/tests/services-jankyborders.nix index 1f6adff2..5bde078e 100644 --- a/tests/services-jankyborders.nix +++ b/tests/services-jankyborders.nix @@ -12,8 +12,7 @@ in services.jankyborders.width = 5.0; services.jankyborders.hidpi = true; services.jankyborders.active_color = "0xFFFFFFFF"; - - + services.jankyborders.order = "below"; test = '' echo >&2 "checking jankyborders service in ~/Library/LaunchAgents" @@ -24,6 +23,6 @@ in grep "width=5.000000" ${config.out}/user/Library/LaunchAgents/org.nixos.jankyborders.plist grep "hidpi=on" ${config.out}/user/Library/LaunchAgents/org.nixos.jankyborders.plist grep "active_color=0xFFFFFFFF" ${config.out}/user/Library/LaunchAgents/org.nixos.jankyborders.plist - + grep "order=below" ${config.out}/user/Library/LaunchAgents/org.nixos.jankyborders.plist ''; }