[Optimizations] move service optimizations into a dedicated file

Optimize Xorg and systemd with optimizePkg with default options
This commit is contained in:
Antoine Viallon 2023-05-05 11:42:52 +02:00
parent deccde8589
commit 776c6e3060
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
2 changed files with 28 additions and 18 deletions

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, myLib, ... }:
{ config, pkgs, options, lib, myLib, ... }:
with lib;
let
cfg = config.aviallon.optimizations;
@ -98,7 +98,6 @@ in {
fastStdenv = super.overrideCC super.gccStdenv (super.buildPackages.gcc_latest.overrideAttrs (old:
let
optimizedAttrs = {}
#// _optimizeAttrs { level = "general"; cpuArch = null; cpuTune = null; }
// {
configureFlags = [
"--with-cpu-64=${generalCfg.cpuArch}" "--with-arch-64=${generalCfg.cpuArch}"
@ -130,18 +129,6 @@ in {
lto = false;
} super.myFFmpeg;
man-db_optimized = optimizePkg {
level = "moderately-unsafe";
lto = true;
recursive = 1;
} super.man-db;
mandoc_optimized = optimizePkg {
level = "moderately-unsafe";
lto = true;
recursive = 1;
} super.mandoc;
jetbrains = super.jetbrains // {
jdk = optimizePkg {
lto = true;
@ -151,9 +138,5 @@ in {
})
];
documentation.man.man-db.package = pkgs.man-db_optimized;
documentation.man.mandoc.package = pkgs.mandoc_optimized;
};
}

View file

@ -0,0 +1,27 @@
{ config, options, pkgs, lib, ... }:
with lib;
let
cfg = config.aviallon.optimizations;
optimizePkg = cfg.optimizePkg;
xorg = pkgs.xorg // {
xorgserver = optimizePkg { } pkgs.xorg.xorgserver;
};
man-db = optimizePkg { level = "moderately-unsafe"; } pkgs.man-db;
mandoc = optimizePkg { level = "moderately-unsafe"; } pkgs.mandoc;
in {
config = mkIf cfg.enable {
documentation.man.man-db.package = man-db;
documentation.man.mandoc.package = mandoc;
systemd.package = optimizePkg { } options.systemd.package.default;
services.xserver.modules = mkBefore [ (hiPrio xorg.xorgserver.out) ];
services.xserver.excludePackages = [ pkgs.xorg.xorgserver ];
services.xserver.displayManager.xserverBin = mkForce "${xorg.xorgserver.out}/bin/X";
environment.systemPackages = [
(hiPrio config.systemd.package)
(hiPrio xorg.xorgserver.out)
];
};
}