From 4899b6658f35d39c3698107295c4342de0e1cd70 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 27 Mar 2018 21:42:50 +0200
Subject: [PATCH] khd: don't depend on kwm directly

Iff the kwm service is enabled the commands will still be in the default PATH.
---
 modules/services/khd/default.nix | 2 +-
 modules/services/kwm/default.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/services/khd/default.nix b/modules/services/khd/default.nix
index f3f8e921..45a389d9 100644
--- a/modules/services/khd/default.nix
+++ b/modules/services/khd/default.nix
@@ -46,7 +46,7 @@ in
     environment.etc."khdrc".text = cfg.khdConfig;
 
     launchd.user.agents.khd = {
-      path = [ cfg.package pkgs.kwm config.environment.systemPath ];
+      path = [ cfg.package config.environment.systemPath ];
 
       serviceConfig.ProgramArguments = [ "${cfg.package}/bin/khd" ]
         ++ optionals (cfg.khdConfig != "") [ "-c" "/etc/khdrc" ];
diff --git a/modules/services/kwm/default.nix b/modules/services/kwm/default.nix
index f9fe4a24..1d09e238 100644
--- a/modules/services/kwm/default.nix
+++ b/modules/services/kwm/default.nix
@@ -33,6 +33,8 @@ in
 
     security.accessibilityPrograms = [ "${cfg.package}/kwm" ];
 
+    environment.systemPackages = [ cfg.package ];
+
     environment.etc."kwmrc".text = cfg.kwmConfig;
 
     launchd.user.agents.kwm = {