From bcf9a24332a04ddcef154b792697320d40829820 Mon Sep 17 00:00:00 2001 From: Brenton Simpson Date: Mon, 1 Jan 2024 16:18:45 -0800 Subject: handheld-daemon: init at 0.2.7 --- .../modules/services/hardware/handheld-daemon.nix | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 nixos/modules/services/hardware/handheld-daemon.nix (limited to 'nixos/modules/services/hardware') diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix new file mode 100644 index 000000000000..a513ed7ddf8e --- /dev/null +++ b/nixos/modules/services/hardware/handheld-daemon.nix @@ -0,0 +1,43 @@ +{ config +, lib +, pkgs +, ... +}: +with lib; let + cfg = config.services.handheldDaemon; +in +{ + options.services.handheldDaemon = { + enable = mkEnableOption "Enable Handheld Daemon"; + + user = mkOption { + type = types.str; + description = lib.mdDoc '' + The user to run Handheld Daemon with. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.handheld-daemon ]; + services.udev.packages = [ pkgs.handheld-daemon ]; + systemd.packages = [ pkgs.handheld-daemon ]; + + systemd.services.handheldDaemon = { + description = "Handheld Daemon"; + + wantedBy = [ "multi-user.target" ]; + + restartIfChanged = true; + + serviceConfig = { + ExecStart = "${ pkgs.handheld-daemon }/bin/hhd --user ${ cfg.user }"; + Nice = "-12"; + Restart = "on-failure"; + RestartSec = "10"; + }; + }; + }; + + meta.maintainers = [ maintainers.appsforartists ]; +} -- cgit 1.4.1 From f571033ce013a416c744bd3d3ffc0fe525dbe3a9 Mon Sep 17 00:00:00 2001 From: Brenton Simpson Date: Sat, 20 Jan 2024 17:56:44 -0800 Subject: handheld-daemon: use kebab-case instead of camelCase for service name --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 +- nixos/modules/services/hardware/handheld-daemon.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'nixos/modules/services/hardware') diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 3ddc2f781bd9..994f64215461 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -22,7 +22,7 @@ In addition to numerous new and upgraded packages, this release has the followin -- [Handheld Daemon](https://github.com/hhd-dev/hhd), support for gaming handhelds like the Legion Go, ROG Ally, and GPD Win. Available as [services.handheldDaemon](#opt-services.handheldDaemon.enable). +- [Handheld Daemon](https://github.com/hhd-dev/hhd), support for gaming handhelds like the Legion Go, ROG Ally, and GPD Win. Available as [services.handheld-daemon](#opt-services.handheld-daemon.enable). - [Guix](https://guix.gnu.org), a functional package manager inspired by Nix. Available as [services.guix](#opt-services.guix.enable). diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix index a513ed7ddf8e..81859bf5b122 100644 --- a/nixos/modules/services/hardware/handheld-daemon.nix +++ b/nixos/modules/services/hardware/handheld-daemon.nix @@ -4,10 +4,10 @@ , ... }: with lib; let - cfg = config.services.handheldDaemon; + cfg = config.services.handheld-daemon; in { - options.services.handheldDaemon = { + options.services.handheld-daemon = { enable = mkEnableOption "Enable Handheld Daemon"; user = mkOption { @@ -23,7 +23,7 @@ in services.udev.packages = [ pkgs.handheld-daemon ]; systemd.packages = [ pkgs.handheld-daemon ]; - systemd.services.handheldDaemon = { + systemd.services.handheld-daemon = { description = "Handheld Daemon"; wantedBy = [ "multi-user.target" ]; -- cgit 1.4.1 From b960a217bd351378b01a27f37df9d4b0028570b0 Mon Sep 17 00:00:00 2001 From: Brenton Simpson Date: Mon, 22 Jan 2024 11:12:04 -0800 Subject: handheld-daemon: touchup code style to better match nixpkgs Co-authored-by: h7x4 Co-authored-by: Luke Granger-Brown Co-authored-by: Bruno BELANYI --- nixos/modules/services/hardware/handheld-daemon.nix | 9 +++++---- pkgs/by-name/ha/handheld-daemon/package.nix | 16 ++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'nixos/modules/services/hardware') diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix index 81859bf5b122..e8a7a39f441d 100644 --- a/nixos/modules/services/hardware/handheld-daemon.nix +++ b/nixos/modules/services/hardware/handheld-daemon.nix @@ -9,6 +9,7 @@ in { options.services.handheld-daemon = { enable = mkEnableOption "Enable Handheld Daemon"; + package = mkPackageOption pkgs "handheld-daemon" { }; user = mkOption { type = types.str; @@ -19,9 +20,9 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.handheld-daemon ]; - services.udev.packages = [ pkgs.handheld-daemon ]; - systemd.packages = [ pkgs.handheld-daemon ]; + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; systemd.services.handheld-daemon = { description = "Handheld Daemon"; @@ -31,7 +32,7 @@ in restartIfChanged = true; serviceConfig = { - ExecStart = "${ pkgs.handheld-daemon }/bin/hhd --user ${ cfg.user }"; + ExecStart = "${ lib.getExe cfg.package } --user ${ cfg.user }"; Nice = "-12"; Restart = "on-failure"; RestartSec = "10"; diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index 7df459cc9add..bb0c9d65bfe1 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -9,28 +9,28 @@ python3.pkgs.buildPythonApplication rec { pname = "handheld-daemon"; version = "1.1.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; - rev = "abe34c6841476f5b41afe30ee18ff3e510402d68"; + rev = "v${version}"; hash = "sha256-ovLC1BQ98jUaDEMPBzWma4TYSzTF+yE/cMemFdJmqlE="; }; - pythonPath = with python3.pkgs; [ - evdev - pyyaml - rich - ]; - propagatedBuildInputs = with python3.pkgs; [ + evdev hidapi kmod + pyyaml + rich setuptools toybox ]; + # This package doesn't have upstream tests. + doCheck = false; + # handheld-daemon contains a fork of the python module `hid`, so this hook # is borrowed from the `hid` derivation. postPatch = '' -- cgit 1.4.1