From fa483b82ab35c670de12a022d7c57237c3b31008 Mon Sep 17 00:00:00 2001
From: Alexander <a@akho.ru>
Date: Tue, 20 Jul 2021 01:16:14 +0000
Subject: [PATCH] xcape: run xcape after setxkbmap (#2198) (#2199)

Co-authored-by: Alexander Khodyrev <a@akho.name>
---
 modules/services/xcape.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/services/xcape.nix b/modules/services/xcape.nix
index 6b29d26e..72b8303b 100644
--- a/modules/services/xcape.nix
+++ b/modules/services/xcape.nix
@@ -59,11 +59,16 @@ in {
     ];
 
     systemd.user.services.xcape = {
-      Unit = {
-        Description = "xcape";
-        After = [ "graphical-session-pre.target" ];
-        PartOf = [ "graphical-session.target" ];
-      };
+      Unit = mkMerge [
+        {
+          Description = "xcape";
+          After = [ "graphical-session-pre.target" ];
+          PartOf = [ "graphical-session.target" ];
+        }
+        (mkIf (config.home.keyboard != null && config.home.keyboard != { }) {
+          After = [ "graphical-session-pre.target" "setxkbmap.service" ];
+        })
+      ];
 
       Service = {
         Type = "forking";