bump

flake.nix

@@ -57,7 +57,7 @@
     , ...
     } @ inputs:
     let
-      mypkgs = import ./packages;
+      pkgs = import nixpkgs { system = "x86_64-linux"; };
       deploy = import lib/deploy.nix;
 
       inherit (inputs.nixpkgs.lib) composeManyExtensions;
@@ -77,6 +77,28 @@
       vscode-server =
         vscode-server.nixosModules.home;
 
+      nixpkgs_patched_src = pkgs.applyPatches {
+        name = "nixpkgs-patched-${nixpkgs.shortRev}";
+        src = nixpkgs;
+        patches = [
+          (pkgs.fetchpatch {
+            url =
+              "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/362454.patch";
+            sha256 = "sha256-31V/s2lWkh7uFeHRm++6pBC3o3kB9O6JJS62NMJJh3k=";
+          })
+        ];
+      };
+
+      patchedPkgs = forAllSystems (system:
+        let
+          pkgs = import nixpkgs_patched_src {
+            inherit system;
+            config.allowUnfree = true;
+          };
+        in
+        pkgs // { inherit (nixpkgs) lib; }
+      );
+
       forAllSystems = f: builtins.listToAttrs (map
         (name: { inherit name; value = f name; })
         [
@@ -87,13 +109,11 @@
     in
     {
       lib = { inherit forAllSystems hardware deploy; };
+
       colmena = {
         meta = {
           description = "My personal machines";
-          nixpkgs = import nixpkgs {
-            system = "x86_64-linux";
-            overlays = [ (composeManyExtensions localOverlays) ];
-          };
+          nixpkgs = patchedPkgs.x86_64-linux;
           specialArgs = {
             inherit inputs;
             inherit consts;
@@ -136,7 +156,7 @@
         imports = builtins.attrValues self.nixosModules;
         nixpkgs.overlays = [
           (composeManyExtensions localOverlays)
-          (_: mypkgs)
+          # (_: mypkgs)
         ];
       };
 
@@ -147,7 +167,7 @@
           in
           pkgs.mkShell {
             packages = with pkgs; [
-              nixVersions.nix_2_18
+              nixVersions.nix_2_24
               colmena.packages.${system}.colmena
             ];
 
@@ -160,14 +180,13 @@
       nixosConfigurations = import
         ./machines
         colmena
-        nixpkgs
+        (patchedPkgs.x86_64-linux)
         hardware
         self.nixosModule
         inputs
         consts;
 
-      packages = forAllSystems
-        (system: mypkgs nixpkgs.legacyPackages.${system});
+      packages = (patchedPkgs.x86_64-linux);
 
       githubActions =
         let

home/development.nix

@@ -8,9 +8,6 @@
   };
 
   home.packages = with pkgs; [
-    # nix deploy
-    colmena
-
     # for vscode-server..
     openssl
     pkg-config
@@ -27,7 +24,7 @@
     rustup
 
     # saas crap
-    #runpodctl
+    runpodctl
   ] ++ lib.optionals (pkgs.system == "x86_64-linux") [
     # evm tooling
     solc

machines/default.nix

@@ -1,14 +1,16 @@
-colmena: nixpkgs: hardware: nixosModule: inputs: consts:
+colmena: pkgs: hardware: nixosModule: inputs: consts:
 
 with hardware;
 
 let
-  sys = system: mods: nixpkgs.lib.nixosSystem {
-    inherit system;
-    modules = [{ _module.args = inputs; } nixosModule] ++ mods;
-    extraModules = [ colmena.nixosModules.deploymentOptions ];
-    specialArgs = { inherit inputs; inherit consts; };
-  };
+  inherit (inputs.nixpkgs) lib;
+  sys = system: mods:
+    lib.nixosSystem {
+      inherit system;
+      modules = [{ _module.args = inputs; } nixosModule] ++ mods;
+      extraModules = [ colmena.nixosModules.deploymentOptions ];
+      specialArgs = { inherit inputs; inherit consts; };
+    };
 in
 {
   nixhost = sys "x86_64-linux" [ physical ./x86/nixhost ];

machines/x86/trex/default.nix

@@ -34,17 +34,18 @@
 
   system.stateVersion = "24.11";
 
-  boot.supportedFilesystems = [ "ext4" "vfat" "xfs" "zfs" "bcachefs" ];
+  boot.supportedFilesystems = [ "ext4" "vfat" "xfs" "zfs" ];
   boot = {
     kernelModules = [
       "ipmi_devintf"
       "ipmi_si"
     ];
-    kernelPackages = pkgs.linuxPackages_latest;
     kernelParams = [
       "amd_iommu=on"
       "pci=realloc=off" # fixes: only 7 of 8 pex downstream work
       "pcie=pcie_bus_perf"
+      "zswap.enabled=1"
+      # "zswap.compressor=zstd"
     ];
     initrd.kernelModules = [ "mlx5_core" "lm92" ];
     blacklistedKernelModules = [ "nouveau" "amdgpu" "i915" ];

profiles/common.nix

@@ -20,13 +20,16 @@
     # "192.168.23.14" = [ "jellyfin" ];
   };
 
-  # environment.etc.nixpkgs.source = toString pkgs.nixpkgs_src;
+  nixpkgs.config.permittedInsecurePackages = [
+    "aspnetcore-runtime-6.0.36"
+    "aspnetcore-runtime-wrapped-6.0.36"
+    "dotnet-sdk-6.0.428"
+    "dotnet-sdk-wrapped-6.0.428"
+  ];
 
   services.dbus.packages = [ pkgs.gcr ];
 
   environment.systemPackages = with pkgs; [
-    #kitty.terminfo
-    #alacritty.terminfo
     ethtool
     iotop
     rsync
@@ -37,7 +40,6 @@
 
   services.irqbalance.enable = lib.mkDefault true;
   services.fwupd.enable = true;
-  # programs.mosh.enable = true;
 
   nix.optimise.automatic = true;
   nix.extraOptions = ''
@@ -56,7 +58,6 @@
     #   enableGlobalCompInit = false;
   };
 
-  # Enable the OpenSSH daemon.
   services.openssh = {
     enable = true;
     extraConfig = ''
@@ -97,7 +98,6 @@
   };
 
   nix = {
-
     settings = {
       trusted-users = [ "grw" ];
       substituters = [

profiles/logserver.nix

@@ -47,9 +47,6 @@
       smartctl = {
         enable = true;
       };
-      tor = {
-        enable = true;
-      };
     };
 
     scrapeConfigs = [

profiles/uefi-boot.nix

@@ -4,7 +4,7 @@
 
   boot = {
     tmp.useTmpfs = true;
-    kernelPackages = pkgs.lib.mkDefault pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.lib.mkDefault pkgs.linuxPackages_6_11;
     zfs = {
       package = pkgs.zfs_unstable;
     };

services/buildfarm-executor.nix

@@ -24,7 +24,7 @@
         hostName = "trex.satanic.link";
         sshUser = "grw";
         protocol = "ssh-ng";
-        maxJobs = 16;
+        maxJobs = 4;
         speedFactor = 128;
         supportedFeatures = [ "kvm" "nixos-test" "big-parallel" ];
         systems = [