Whatever it takes to build my system again

Get scx module from NixOS/nixpkgs#358339

Signed-off-by: John Titor <[email protected]>

flake.nix

@@ -7,6 +7,8 @@
     nixpkgs-edge.url = "nixpkgs/nixos-unstable-small"; # For latest packages
     nixpkgs-master.url = "nixpkgs/master"; # Testing branch of nixpkgs
     nixpkgs-cava-fix.url = "github:nixos/nixpkgs/staging-next-24.11";
+    nixpkgs-scx-test.url = "github:nixos/nixpkgs/refs/pull/358339/merge";
+    nixpkgs-libreoffice-pin.url = "nixpkgs/8487207876bffcf99e92aea3b853998bbeb474f0";
 
     flake-parts = {
       url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management

modules-overlays/default.nix

@@ -1,20 +1,21 @@
 {
   lib,
   pkgs,
+  pkgs-edge,
   pkgs-master,
   inputs,
   ...
 }: {
   imports = [
     #./amdgpu.nix # import modules here to test
-    "${inputs.nixpkgs-master}/nixos/modules/services/scheduling/scx.nix"
+    "${inputs.nixpkgs-scx-test}/nixos/modules/services/scheduling/scx.nix"
   ];
 
   nixpkgs.overlays = [
     (final: prev: {
       cava = inputs.nixpkgs-cava-fix.legacyPackages.${pkgs.system}.cava;
-      mission-center = pkgs-master.mission-center;
-      libreoffice-fresh = inputs.nixpkgs-cava-fix.legacyPackages.${pkgs.system}.libreoffice-fresh;
+      mission-center = pkgs-edge.mission-center;
+      libreoffice-fresh = inputs.nixpkgs-libreoffice-pin.legacyPackages.${pkgs.system}.libreoffice-fresh;
     })
   ];
 }

system/nix-settings.nix

@@ -35,8 +35,7 @@
   environment.sessionVariables.NIXPKGS_ALLOW_UNFREE = "1";
   nixpkgs.config.android_sdk.accept_license = true;
 
-  programs.ssh.knownHosts."darwin-build-box.nix-community.org".publicKey =
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFz8FXSVEdf8FvDMfboxhB5VjSe7y2WgSa09q1L4t099";
+  programs.ssh.knownHosts."darwin-build-box.nix-community.org".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFz8FXSVEdf8FvDMfboxhB5VjSe7y2WgSa09q1L4t099";
 
   nix = {
     distributedBuilds = true;
@@ -51,7 +50,7 @@
           "aarch64-darwin"
           "x86_64-darwin"
         ];
-        supportedFeatures = [ "big-parallel" "nixos-test" "benchmark" ];
+        supportedFeatures = ["big-parallel" "nixos-test" "benchmark"];
       }
     ];
   };

system/services/default.nix

@@ -27,13 +27,11 @@
   };
 
   # Enable scx extra schedulers, only available for linux-cachyos
-  services.scx.enable = false;
-  services.scx.package = pkgs.scx.full;
-  # rustland is better and causes less lag in high load, even better than bpfland
-  services.scx.scheduler = "scx_rustland";
-  services.scx.extraArgs = [
-    "--verbose"
-  ];
+  services.scx.enable = true;
+  services.scx.package = pkgs-master.scx.full;
+  # lavd is better for gaming
+  # rustland is better for general workloads
+  services.scx.scheduler = "scx_lavd";
 
   # Accounts daemon is needed to remember passwords and other account information
   # by display manager and other services