diff --git a/nixos/modules/services/hardware/asusd.nix b/nixos/modules/services/hardware/asusd.nix index d1f4f3f22a7e..440f32c2b669 100644 --- a/nixos/modules/services/hardware/asusd.nix +++ b/nixos/modules/services/hardware/asusd.nix @@ -21,6 +21,11 @@ in supports multiple aura devices since version 6.0.0. '' ) + (lib.mkRemovedOptionModule [ + "services" + "asusd" + "enableUserService" + ] "The asusd user service is no longer required.") ]; options = { @@ -51,14 +56,6 @@ in package = lib.mkPackageOption pkgs "asusctl" { }; - enableUserService = lib.mkOption { - type = bool; - default = false; - description = '' - Activate the asusd-user service. - ''; - }; - animeConfig = lib.mkOption { type = nullOr configType; default = null; @@ -145,8 +142,6 @@ in services.dbus.packages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; services.supergfxd.enable = lib.mkDefault true; - - systemd.user.services.asusd-user.enable = cfg.enableUserService; }; meta.maintainers = pkgs.asusctl.meta.maintainers; diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index 3f3f831d726b..e74c15e6d837 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -18,16 +18,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "asusctl"; - version = "6.3.2"; + version = "6.3.3"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; tag = finalAttrs.version; - hash = "sha256-6dZkQ8cPL8dbtvfuc/a5G1BxEaZyNbvy3eRBctFFwVU="; + hash = "sha256-nc6pGxLutxKyd4LiI23e7UfWK45aQiLQRKL6zX7rVO0="; }; - cargoHash = "sha256-FlEuv/iaNlfXLhHRSmZedPwroCozaEqIvYRqbgJhgEw="; + cargoHash = "sha256-LZsSnIGTemu+SvJxszPWkA5EIdu8XzruZXaYIibV31Q="; postPatch = '' files=" @@ -49,9 +49,6 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace data/asusd.service \ --replace-fail /usr/bin/asusd $out/bin/asusd \ --replace-fail /bin/sleep ${lib.getExe' coreutils "sleep"} - substituteInPlace data/asusd-user.service \ - --replace-fail /usr/bin/asusd-user $out/bin/asusd-user \ - --replace-fail /usr/bin/sleep ${lib.getExe' coreutils "sleep"} substituteInPlace Makefile \ --replace-fail /usr/bin/grep ${lib.getExe gnugrep}