server-lto

homes/x86_64-linux/matt@matt-nixos/default.nix

@@ -168,7 +168,7 @@ in
   home.packages = with pkgs; [
     pkgs.${namespace}.bolt-launcher
     pkgs.${namespace}.discord-krisp
-    pkgs.${namespace}.librepods
+    # pkgs.${namespace}.librepods
 
     bottles
     compose2nix

packages/linux-cachyos/config-nix/cachyos-server-znver4.x86_64-linux.nix

@@ -0,0 +1 @@
+import ./cachyos-server-lto.x86_64-linux.nix // { "CONFIG_X86_64_VERSION" = "ZEN4"; }

packages/linux-cachyos/default.nix

@@ -61,6 +61,46 @@ let
     description = "Linux EEVDF-BORE scheduler Kernel by CachyOS built with LLVM and Thin LTO";
   };
 
+  serverLtoKernelAttrs = {
+    taste = "linux-cachyos-server";
+    configPath = ./config-nix/cachyos-lto.x86_64-linux.nix;
+
+    # Pass the unified arguments (including the resolved 'self') to llvm-pkgs
+    inherit (import ./lib/llvm-pkgs.nix (args // { inherit self; })) callPackage;
+    useLTO = "thin";
+
+    packagesExtend = import ./lib/llvm-module-overlay.nix args;
+
+    zfsOverride = {
+      inherit (pkgs)
+        autoreconfHook269
+        util-linux
+        coreutils
+        perl
+        udevCheckHook
+        zlib
+        libuuid
+        python3
+        attr
+        openssl
+        libtirpc
+        nfs-utils
+        gawk
+        gnugrep
+        gnused
+        systemd
+        smartmontools
+        sysstat
+        pkg-config
+        curl
+        pam
+        nix-update-script
+        ;
+    };
+
+    description = "Linux EEVDF-BORE scheduler Kernel by CachyOS built with LLVM and Thin LTO";
+  };
+
   # Evaluation hack
   brokenReplacement = pkgs.hello.overrideAttrs (prevAttrs: {
     meta = prevAttrs.meta // {
@@ -160,6 +200,15 @@ in
     description = "Linux EEVDF scheduler Kernel by CachyOS targeted for Servers";
   };
 
+  cachyos-server-lto = mkCachyKernel serverLtoKernelAttrs;
+
+  cachyos-server-lto-znver4 = mkCachyKernel (
+    serverLtoKernelAttrs
+    // {
+      configPath = ./config-nix/cachyos-znver4.x86_64-linux.nix;
+    }
+  );
+
   cachyos-hardened = mkCachyKernel {
     taste = "linux-cachyos-hardened";
     configPath = ./config-nix/cachyos-hardened.x86_64-linux.nix;

systems/x86_64-linux/matt-nixos/boot.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 let
-  kernel = pkgs.linuxPackages_cachyos;
+  kernel = pkgs.linuxPackages_cachyos-lto-znver4;
   pkgsVersion = pkgs; # .unstable;
 in
 {

systems/x86_64-linux/matt-nixos/default.nix

@@ -71,13 +71,13 @@
     VISUAL = "${lib.getExe' pkgs.vscodium "codium"} --wait";
   };
 
-  security.wrappers.librepods = {
-    source = "${pkgs.${namespace}.librepods}/bin/librepods";
-    owner = "matt";
-    group = "users";
-    setuid = false;
-    capabilities = "cap_net_admin+p";
-  };
+  # security.wrappers.librepods = {
+  #   source = "${pkgs.${namespace}.librepods}/bin/librepods";
+  #   owner = "matt";
+  #   group = "users";
+  #   setuid = false;
+  #   capabilities = "cap_net_admin+p";
+  # };
 
   specialisation = {
     "cosmic".configuration = {