performance: adjust perf module for refactor

Signed-off-by: Kajus Naujokaitis <kajus.naujokaitis@unikie.com>

Author: kajusnau

modules/common/services/performance/default.nix

@@ -16,8 +16,6 @@ let
   });
 
   inherit (lib)
-    getExe
-    getExe'
     literalExpression
     mkIf
     mkOption
@@ -96,6 +94,7 @@ in
         config
         lib
         mkTunedScript
+        tunedNoDesktop
         ;
     })
     (import ./guests.nix {
@@ -104,6 +103,7 @@ in
         config
         lib
         mkTunedScript
+        tunedNoDesktop
         ;
     })
   ];
@@ -145,32 +145,5 @@ in
         message = "Enabling the generic VM performance profile ('ghaf.services.performance.vm.enable') requires the 'host' and 'vm' profiles to be disabled.";
       }
     ];
-    services.system76-scheduler = {
-      useStockConfig = false;
-      settings = {
-        processScheduler = {
-          pipewireBoost.enable = false;
-          # cosmic-comp still lacks integration with s76-scheduler
-          foregroundBoost.enable = false;
-          useExecsnoop = true;
-        };
-        cfsProfiles.enable = false;
-      };
-    };
-    services.tuned.package = tunedNoDesktop;
-    systemd.services = mkIf config.ghaf.profiles.debug.enable {
-      tuned = {
-        serviceConfig.ExecStart = [
-          ""
-          "${getExe pkgs.tuned} -P -l -D"
-        ];
-      };
-      tuned-ppd = {
-        serviceConfig.ExecStart = [
-          ""
-          "${getExe' pkgs.tuned "tuned-ppd"} -l -D"
-        ];
-      };
-    };
   };
 }

modules/common/services/performance/guests.nix

@@ -5,6 +5,7 @@
   config,
   lib,
   mkTunedScript,
+  tunedNoDesktop,
   ...
 }:
 let
@@ -222,15 +223,22 @@ in
     (mkIf cfg.gui.enable {
       services.system76-scheduler = {
         inherit (cfg.gui.scheduler) enable;
+        useStockConfig = false;
         settings = {
           processScheduler = {
             refreshInterval = 30;
+            pipewireBoost.enable = false;
+            # cosmic-comp still lacks integration with s76-scheduler
+            foregroundBoost.enable = false;
+            useExecsnoop = true;
           };
+          cfsProfiles.enable = false;
         };
         assignments = guiVmSchedulerAssignments;
       };
       services.tuned = {
         inherit (cfg.gui.tuned) enable;
+        package = tunedNoDesktop;
         ppdSupport = true;
         settings.profile_dirs = "/etc/tuned/profiles,${
           concatMapStringsSep "," (script: "${script}") (lib.attrValues guiProfileScripts)

modules/common/services/performance/host.nix

@@ -5,6 +5,7 @@
   config,
   lib,
   mkTunedScript,
+  tunedNoDesktop,
   ...
 }:
 let
@@ -328,6 +329,7 @@ in
       };
       services.tuned = {
         inherit (cfg.host.tuned) enable;
+        package = tunedNoDesktop;
 
         settings.profile_dirs = "/etc/tuned/profiles,${
           concatMapStringsSep "," (script: "${script}") (lib.attrValues hostProfileScripts)