diff --git a/modules/security/default.nix b/modules/security/default.nix index 8ed8a84..d7a3433 100644 --- a/modules/security/default.nix +++ b/modules/security/default.nix @@ -15,6 +15,12 @@ in { options = { + security.enableAccessibilityAccess = mkOption { + type = types.bool; + default = false; + description = "Wether to configure programs that are allowed control through the accessibility APIs."; + }; + security.accessibilityPrograms = mkOption { type = types.listOf types.path; default = []; @@ -25,7 +31,7 @@ in config = { - system.activationScripts.accessibility.text = '' + system.activationScripts.accessibility.text = mkIf cfg.enableAccessibilityAccess '' # Set up programs that require accessibility permissions echo "setting up accessibility programs..." >&2 diff --git a/modules/services/khd/default.nix b/modules/services/khd/default.nix index ee27bad..8a322fb 100644 --- a/modules/services/khd/default.nix +++ b/modules/services/khd/default.nix @@ -25,12 +25,6 @@ in description = "This option specifies the khd package to use."; }; - services.khd.enableAccessibilityAccess = mkOption { - type = types.bool; - default = false; - description = "Whether to enable accessibility permissions for the khd daemon."; - }; - services.khd.khdConfig = mkOption { type = types.lines; default = ""; @@ -48,7 +42,7 @@ in services.khd.khdConfig = mkIf cfg.i3Keybindings i3Config; - security.accessibilityPrograms = mkIf cfg.enableAccessibilityAccess [ "${cfg.package}/bin/khd" ]; + security.accessibilityPrograms = [ "${cfg.package}/bin/khd" ]; environment.etc."khdrc".text = cfg.khdConfig; diff --git a/modules/services/kwm/default.nix b/modules/services/kwm/default.nix index 0dfa741..e6231b2 100644 --- a/modules/services/kwm/default.nix +++ b/modules/services/kwm/default.nix @@ -23,12 +23,6 @@ in description = "This option specifies the kwm package to use"; }; - services.kwm.enableAccessibilityAccess = mkOption { - type = types.bool; - default = false; - description = "Whether to enable accessibility permissions for the kwm daemon."; - }; - services.kwm.kwmConfig = mkOption { type = types.lines; default = ""; @@ -38,7 +32,7 @@ in config = mkIf cfg.enable { - security.accessibilityPrograms = mkIf cfg.enableAccessibilityAccess [ "${cfg.package}/kwm" ]; + security.accessibilityPrograms = [ "${cfg.package}/kwm" ]; environment.etc."kwmrc".text = cfg.kwmConfig;