diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix
index b4d8468a2375..6eeaffce1b15 100644
--- a/nixos/modules/services/audio/hqplayerd.nix
+++ b/nixos/modules/services/audio/hqplayerd.nix
@@ -56,22 +56,6 @@ in
           Open TCP port 8088 in the firewall for the server.
         '';
       };
-
-      user = mkOption {
-        type = types.str;
-        default = "hqplayer";
-        description = ''
-          User account under which hqplayerd runs.
-        '';
-      };
-
-      group = mkOption {
-        type = types.str;
-        default = "hqplayer";
-        description = ''
-          Group account under which hqplayerd runs.
-        '';
-      };
     };
   };
 
@@ -100,68 +84,44 @@ in
 
     systemd = {
       tmpfiles.rules = [
-        "d ${configDir}      0755 ${cfg.user} ${cfg.group} - -"
-        "d ${stateDir}       0755 ${cfg.user} ${cfg.group} - -"
-        "d ${stateDir}/home  0755 ${cfg.user} ${cfg.group} - -"
+        "d ${configDir}      0755 hqplayer hqplayer - -"
+        "d ${stateDir}       0755 hqplayer hqplayer - -"
+        "d ${stateDir}/home  0755 hqplayer hqplayer - -"
       ];
 
+      packages = [ pkg ];
+
       services.hqplayerd = {
-        description = "HQPlayer daemon";
         wantedBy = [ "multi-user.target" ];
-        requires = [ "network-online.target" "sound.target" "systemd-udev-settle.service" ];
-        after = [ "network-online.target" "sound.target" "systemd-udev-settle.service" "local-fs.target" "remote-fs.target" "systemd-tmpfiles-setup.service" ];
+        after = [ "systemd-tmpfiles-setup.service" ];
 
         environment.HOME = "${stateDir}/home";
 
         unitConfig.ConditionPathExists = [ configDir stateDir ];
 
-        preStart =
-          let
-            blankCfg = pkgs.writeText "hqplayerd.xml" ''
-              <?xml version="1.0" encoding="utf-8"?>
-              <xml>
-              </xml>
-            '';
-          in
-          ''
-            cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}"
-            chmod -R u+wX "${stateDir}/web"
+        preStart = ''
+          cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}"
+          chmod -R u+wX "${stateDir}/web"
 
-            if [ ! -f "${configDir}/hqplayerd.xml" ]; then
-              echo "creating blank config file"
-              install -m 0644 "${blankCfg}" "${configDir}/hqplayerd.xml"
-            fi
-          '' + optionalString (cfg.auth.username != null && cfg.auth.password != null) ''
-            ${pkg}/bin/hqplayerd -s ${cfg.auth.username} ${cfg.auth.password}
-          '';
-
-        serviceConfig = {
-          ExecStart = "${pkg}/bin/hqplayerd";
-
-          User = cfg.user;
-          Group = cfg.group;
-
-          Restart = "on-failure";
-          RestartSec = 5;
-
-          Nice = -10;
-          IOSchedulingClass = "realtime";
-          LimitMEMLOCK = "1G";
-          LimitNICE = -10;
-          LimitRTPRIO = 98;
-        };
+          if [ ! -f "${configDir}/hqplayerd.xml" ]; then
+            echo "creating initial config file"
+            install -m 0644 "${pkg}/etc/hqplayer/hqplayerd.xml" "${configDir}/hqplayerd.xml"
+          fi
+        '' + optionalString (cfg.auth.username != null && cfg.auth.password != null) ''
+          ${pkg}/bin/hqplayerd -s ${cfg.auth.username} ${cfg.auth.password}
+        '';
       };
     };
 
-    users.groups = mkIf (cfg.group == "hqplayer") {
+    users.groups = {
       hqplayer.gid = config.ids.gids.hqplayer;
     };
 
-    users.users = mkIf (cfg.user == "hqplayer") {
+    users.users = {
       hqplayer = {
         description = "hqplayer daemon user";
         extraGroups = [ "audio" ];
-        group = cfg.group;
+        group = "hqplayer";
         uid = config.ids.uids.hqplayer;
       };
     };
diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix
index 76f8bde3e4ed..14fe83ea5cb3 100644
--- a/pkgs/servers/hqplayerd/default.nix
+++ b/pkgs/servers/hqplayerd/default.nix
@@ -53,32 +53,37 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp ./usr/bin/hqplayerd $out/bin
 
+    # main configuration
+    mkdir -p $out/etc/hqplayer
+    cp ./etc/hqplayer/hqplayerd.xml $out/etc/hqplayer/
+
     # udev rules
     mkdir -p $out/etc/udev/rules.d
-    cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d
+    cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d/
 
     # kernel module cfgs
     mkdir -p $out/etc/modules-load.d
-    cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d
+    cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d/
 
     # systemd service file
     mkdir -p $out/lib/systemd/system
-    cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system
+    cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system/
 
     # documentation
     mkdir -p $out/share/doc/hqplayerd
-    cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd
+    cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd/
 
     # misc service support files
     mkdir -p $out/var/lib/hqplayer
-    cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer/web
+    cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer
 
     runHook postInstall
   '';
 
   postInstall = ''
     substituteInPlace $out/lib/systemd/system/hqplayerd.service \
-      --replace /usr/bin/hqplayerd $out/bin/hqplayerd
+      --replace /usr/bin/hqplayerd $out/bin/hqplayerd \
+      --replace "NetworkManager-wait-online.service" ""
   '';
 
   postFixup = ''