Merge pull request #7486 from oxij/actkbd-and-media-keys
add actkbd; nixos: add support for volume control with media keys
This commit is contained in:
commit
9807dbc142
@ -149,6 +149,7 @@
|
|||||||
./services/games/minecraft-server.nix
|
./services/games/minecraft-server.nix
|
||||||
./services/games/minetest-server.nix
|
./services/games/minetest-server.nix
|
||||||
./services/hardware/acpid.nix
|
./services/hardware/acpid.nix
|
||||||
|
./services/hardware/actkbd.nix
|
||||||
./services/hardware/amd-hybrid-graphics.nix
|
./services/hardware/amd-hybrid-graphics.nix
|
||||||
./services/hardware/bluetooth.nix
|
./services/hardware/bluetooth.nix
|
||||||
./services/hardware/freefall.nix
|
./services/hardware/freefall.nix
|
||||||
|
@ -33,6 +33,16 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enableMediaKeys = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = ''
|
||||||
|
Whether to enable volume and capture control with keyboard media keys.
|
||||||
|
|
||||||
|
Enabling this will turn on <option>services.actkbd</option>.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
extraConfig = mkOption {
|
extraConfig = mkOption {
|
||||||
type = types.lines;
|
type = types.lines;
|
||||||
default = "";
|
default = "";
|
||||||
@ -80,6 +90,23 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.actkbd = mkIf config.sound.enableMediaKeys {
|
||||||
|
enable = true;
|
||||||
|
bindings = [
|
||||||
|
# "Mute" media key
|
||||||
|
{ keys = [ 113 ]; events = [ "key" ]; command = "${alsaUtils}/bin/amixer -q set Master toggle"; }
|
||||||
|
|
||||||
|
# "Lower Volume" media key
|
||||||
|
{ keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1- unmute"; }
|
||||||
|
|
||||||
|
# "Raise Volume" media key
|
||||||
|
{ keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1+ unmute"; }
|
||||||
|
|
||||||
|
# "Mic Mute" media key
|
||||||
|
{ keys = [ 190 ]; events = [ "key" ]; command = "${alsaUtils}/bin/amixer -q set Capture toggle"; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
130
nixos/modules/services/hardware/actkbd.nix
Normal file
130
nixos/modules/services/hardware/actkbd.nix
Normal file
@ -0,0 +1,130 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
cfg = config.services.actkbd;
|
||||||
|
|
||||||
|
configFile = pkgs.writeText "actkbd.conf" ''
|
||||||
|
${concatMapStringsSep "\n"
|
||||||
|
({ keys, events, attributes, command, ... }:
|
||||||
|
''${concatMapStringsSep "+" toString keys}:${concatStringsSep "," events}:${concatStringsSep "," attributes}:${command}''
|
||||||
|
)
|
||||||
|
cfg.bindings}
|
||||||
|
${cfg.extraConfig}
|
||||||
|
'';
|
||||||
|
|
||||||
|
bindingCfg = { config, ... }: {
|
||||||
|
options = {
|
||||||
|
|
||||||
|
keys = mkOption {
|
||||||
|
type = types.listOf types.int;
|
||||||
|
description = "List of keycodes to match.";
|
||||||
|
};
|
||||||
|
|
||||||
|
events = mkOption {
|
||||||
|
type = types.listOf (types.enum ["key" "rep" "rel"]);
|
||||||
|
default = [ "key" ];
|
||||||
|
description = "List of events to match.";
|
||||||
|
};
|
||||||
|
|
||||||
|
attributes = mkOption {
|
||||||
|
type = types.listOf types.str;
|
||||||
|
default = [ "exec" ];
|
||||||
|
description = "List of attributes.";
|
||||||
|
};
|
||||||
|
|
||||||
|
command = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "";
|
||||||
|
description = "What to run.";
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
in
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
###### interface
|
||||||
|
|
||||||
|
options = {
|
||||||
|
|
||||||
|
services.actkbd = {
|
||||||
|
|
||||||
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = ''
|
||||||
|
Whether to enable the <command>actkbd</command> key mapping daemon.
|
||||||
|
|
||||||
|
Turning this on will start an <command>actkbd</command>
|
||||||
|
instance for every evdev input that has at least one key
|
||||||
|
(which is okay even for systems with tiny memory footprint,
|
||||||
|
since actkbd normally uses <100 bytes of memory per
|
||||||
|
instance).
|
||||||
|
|
||||||
|
This allows binding keys globally without the need for e.g.
|
||||||
|
X11.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
bindings = mkOption {
|
||||||
|
type = types.listOf (types.submodule bindingCfg);
|
||||||
|
default = [];
|
||||||
|
example = lib.literalExample ''
|
||||||
|
[ { keys = [ 113 ]; events = [ "key" ]; command = "''${pkgs.alsaUtils}/bin/amixer -q set Master toggle"; }
|
||||||
|
]
|
||||||
|
'';
|
||||||
|
description = ''
|
||||||
|
Key bindings for <command>actkbd</command>.
|
||||||
|
|
||||||
|
See <command>actkbd</command> <filename>README</filename> for documentation.
|
||||||
|
|
||||||
|
The example shows a piece of what <option>sound.enableMediaKeys</option> does when enabled.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
extraConfig = mkOption {
|
||||||
|
type = types.lines;
|
||||||
|
default = "";
|
||||||
|
description = ''
|
||||||
|
Literal contents to append to the end of actkbd configuration file.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
###### implementation
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
|
services.udev.packages = lib.singleton (pkgs.writeTextFile {
|
||||||
|
name = "actkbd-udev-rules";
|
||||||
|
destination = "/etc/udev/rules.d/61-actkbd.rules";
|
||||||
|
text = ''
|
||||||
|
ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_KEY}=="1", TAG+="systemd", ENV{SYSTEMD_WANTS}+="actkbd@$env{DEVNAME}.service"
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
|
||||||
|
systemd.services."actkbd@" = {
|
||||||
|
enable = true;
|
||||||
|
restartIfChanged = true;
|
||||||
|
unitConfig = {
|
||||||
|
Description = "actkbd on %I";
|
||||||
|
ConditionPathExists = "%I";
|
||||||
|
};
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "forking";
|
||||||
|
ExecStart = "${pkgs.actkbd}/bin/actkbd -D -c ${configFile} -d %I";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
34
pkgs/tools/system/actkbd/default.nix
Normal file
34
pkgs/tools/system/actkbd/default.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{ fetchurl, stdenv }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "actkbd-0.2.8";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${name}.tar.bz2";
|
||||||
|
sha256 = "1ipb7k5q7k7p54is96ij2n74jfa6xc0llb9lpjwxhsqviqxn9slm";
|
||||||
|
};
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
substituteInPlace Makefile \
|
||||||
|
--replace /usr/local $out \
|
||||||
|
--replace /etc $out/etc
|
||||||
|
'';
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mkdir -p $out/share/doc/actkbd
|
||||||
|
cp -r README samples $out/share/doc/actkbd
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "A keyboard shortcut daemon";
|
||||||
|
longDescription = ''
|
||||||
|
actkbd is a simple daemon that binds actions to keyboard events
|
||||||
|
directly on evdev interface (that is, no X11 required). It
|
||||||
|
recognises key combinations and can handle press, repeat and
|
||||||
|
release events.
|
||||||
|
'';
|
||||||
|
license = licenses.gpl2;
|
||||||
|
homepage = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/";
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
}
|
@ -475,6 +475,8 @@ let
|
|||||||
|
|
||||||
actdiag = pythonPackages.actdiag;
|
actdiag = pythonPackages.actdiag;
|
||||||
|
|
||||||
|
actkbd = callPackage ../tools/system/actkbd { };
|
||||||
|
|
||||||
adom = callPackage ../games/adom { };
|
adom = callPackage ../games/adom { };
|
||||||
|
|
||||||
advancecomp = callPackage ../tools/compression/advancecomp {};
|
advancecomp = callPackage ../tools/compression/advancecomp {};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user