flank update

common/global/default.nix

@@ -21,7 +21,7 @@
 
   boot = {
     tmp.useTmpfs = lib.mkDefault true;
-    kernelPackages = lib.mkDefault pkgs.linuxPackages_6_18;
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_6_12;
   };
 
   hardware.enableRedistributableFirmware = true;

common/global/nix.nix

@@ -44,6 +44,6 @@ in
 
     # Add each flake input as a registry and nix_path
     registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
-    nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
+    nix-path = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
   };
 }

common/optional/desktop.nix

@@ -0,0 +1,42 @@
+{ pkgs, ... }:
+{
+  boot = {
+    kernelPackages = pkgs.linuxPackages_6_18;
+    zfs.package = pkgs.zfs_2_4;
+  };
+
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+  };
+
+  # rtkit is optional but recommended for pipewire
+  security.rtkit.enable = true;
+
+  services = {
+    displayManager.sddm = {
+      enable = true;
+      wayland.enable = true;
+    };
+
+    desktopManager.plasma6.enable = true;
+
+    xserver = {
+      enable = true;
+      xkb = {
+        layout = "us";
+        variant = "";
+      };
+    };
+
+    pulseaudio.enable = false;
+
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      wireplumber.enable = true;
+    };
+  };
+}

common/optional/desktop/default.nix

@@ -1,17 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./kde.nix
-    ./pipewire.nix
-  ];
-
-  boot = {
-    kernelPackages = pkgs.linuxPackages_6_18;
-    zfs.package = pkgs.zfs_2_4;
-  };
-
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-  };
-}

common/optional/desktop/kde.nix

@@ -1,45 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [
-    aurorae # theme
-    elisa # music player
-    kate # text editor
-    kconfig # config editor
-    khelpcenter # help center
-    kinfocenter # system info
-    konsole # terminal
-    krdp # remote desktop
-    ktexteditor # thing for kate
-    okular # pdf reader
-    plasma-keyboard # used by plasma-keyboard KCM
-    plasma-sdk # plasma development tools
-    plasma-workspace-wallpapers # wallpapers
-    qrca # qr code scanner
-    qtvirtualkeyboard # virtual keyboard
-    union # theme
-  ];
-
-  # disable KDE PIM (Personal Information Management) applications
-  programs.kde-pim.enable = false;
-
-  services = {
-    # removes screen reader and speech dispatcher from the system
-    orca.enable = false;
-    speechd.enable = false;
-
-    displayManager.sddm = {
-      enable = true;
-      wayland.enable = true;
-    };
-
-    desktopManager.plasma6.enable = true;
-
-    xserver = {
-      enable = true;
-      xkb = {
-        layout = "us";
-        variant = "";
-      };
-    };
-  };
-}

common/optional/desktop/pipewire.nix

@@ -1,16 +0,0 @@
-{
-  # rtkit is optional but recommended for pipewire
-  security.rtkit.enable = true;
-
-  services = {
-    pulseaudio.enable = false;
-
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      wireplumber.enable = true;
-    };
-  };
-}

common/optional/steam.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
+    mangohud
     steam-run
   ];
   hardware.steam-hardware.enable = true;

common/optional/x86-64-v3/patches/cuda/default.nix

@@ -0,0 +1,19 @@
+{ prev }:
+let
+  buildRedistHook = prev.runCommand "buildRedistHook.bash" { } ''
+    cp ${prev.path}/pkgs/development/cuda-modules/buildRedist/buildRedistHook.bash "$out"
+    chmod u+w "$out"
+    patch "$out" < ${./propagated-build-output-arrays.patch}
+  '';
+in
+prev.cudaPackages_12_9.overrideScope (
+  _cudaFinal: cudaPrev: {
+    buildRedist =
+      args:
+      (cudaPrev.buildRedist args).overrideAttrs (old: {
+        nativeBuildInputs = map (
+          input: if builtins.baseNameOf input == "buildRedistHook.bash" then buildRedistHook else input
+        ) old.nativeBuildInputs;
+      });
+  }
+)

common/optional/x86-64-v3/patches/cuda/propagated-build-output-arrays.patch

@@ -0,0 +1,44 @@
+Subject: [PATCH] Preserve structured CUDA output arrays
+
+The multiple-outputs hook now accepts arrays. The old compatibility export
+collapses include and lib into one array element, breaking indirect expansion.
+Keep the array and iterate over each output when propagating to out.
+
+--- a/buildRedistHook.bash
++++ b/buildRedistHook.bash
+@@ -23,9 +23,6 @@
+ 
+   postInstallCheckHooks+=(checkCudaNonEmptyOutputs)
+   nixLog "added checkCudaNonEmptyOutputs to postInstallCheckHooks"
+-
+-  preFixupHooks+=(fixupPropagatedBuildOutputsForMultipleOutputs)
+-  nixLog "added fixupPropagatedBuildOutputsForMultipleOutputs to preFixupHooks"
+ 
+   postFixupHooks+=(fixupCudaPropagatedBuildOutputsToOut)
+   nixLog "added fixupCudaPropagatedBuildOutputsToOut to postFixupHooks"
+@@ -193,16 +190,6 @@
+   return 0
+ }
+ 
+-# TODO(@connorbaker): https://github.com/NixOS/nixpkgs/issues/323126.
+-# _multioutPropagateDev() currently expects a space-separated string rather than an array.
+-# NOTE: Because _multioutPropagateDev is a postFixup hook, we correct it in preFixup.
+-fixupPropagatedBuildOutputsForMultipleOutputs() {
+-  nixLog "converting propagatedBuildOutputs to a space-separated string"
+-  # shellcheck disable=SC2124
+-  export propagatedBuildOutputs="${propagatedBuildOutputs[@]}"
+-  return 0
+-}
+-
+ # The multiple outputs setup hook only propagates build outputs to dev.
+ # We want to propagate them to out as well, in case the user interpolates
+ # the package into a string -- in such a case, the dev output is not selected
+@@ -217,7 +204,7 @@
+   mkdir -p "${out:?}/nix-support"
+ 
+   # NOTE: We must use printWords to ensure the output is a single line.
+-  for output in $propagatedBuildOutputs; do
++  for output in "${propagatedBuildOutputs[@]}"; do
+     # Propagate the other components to the out output
+     nixLog "adding ${!output:?} to propagatedBuildInputs of ${out:?}"
+     printWords "${!output:?}" >>"${out:?}/nix-support/propagated-build-inputs"

common/optional/x86-64-v3/patches/default.nix

@@ -1,6 +1,8 @@
 _final: prev:
 (import ./abseil { inherit prev; })
 // {
+  cudaPackages_12_9 = import ./cuda { inherit prev; };
+  trunk = import ./trunk { inherit (prev) trunk jq; };
   gnutls = import ./gnutls { inherit (prev) gnutls; };
   prometheus = import ./prometheus { inherit (prev) prometheus; };
   zopfli = import ./zopfli { inherit (prev) zopfli; };

common/optional/x86-64-v3/patches/trunk/default.nix

@@ -0,0 +1,21 @@
+{ trunk, jq }:
+trunk.overrideAttrs (old: {
+  nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ jq ];
+
+  # Patch the bundled libdeflate before Cargo validates its vendor checksums.
+  postPatch = (old.postPatch or "") + ''
+    libdeflateVendors=( "$cargoDepsCopy"/source-*/libdeflate-sys-1.23.1 )
+    if [ "''${#libdeflateVendors[@]}" -ne 1 ] || [ ! -d "''${libdeflateVendors[0]}" ]; then
+      echo "Expected exactly one vendored libdeflate-sys 1.23.1" >&2
+      exit 1
+    fi
+    libdeflateVendor="''${libdeflateVendors[0]}"
+    patch -d "$libdeflateVendor/libdeflate" -p1 < ${./libdeflate-gcc16.patch}
+    libdeflateHeader=libdeflate/lib/x86/cpu_features.h
+    libdeflateChecksum=$(sha256sum "$libdeflateVendor/$libdeflateHeader" | cut -d ' ' -f 1)
+    jq --arg path "$libdeflateHeader" --arg hash "$libdeflateChecksum" \
+      '.files[$path] = $hash' "$libdeflateVendor/.cargo-checksum.json" \
+      > "$libdeflateVendor/.cargo-checksum.json.new"
+    mv "$libdeflateVendor/.cargo-checksum.json.new" "$libdeflateVendor/.cargo-checksum.json"
+  '';
+})

common/optional/x86-64-v3/patches/trunk/libdeflate-gcc16.patch

@@ -0,0 +1,33 @@
+From 2a3762cf736aff9aa5dda329fdec3c08a816eb9b Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Tue, 20 May 2025 21:18:28 +0100
+Subject: [PATCH] lib/x86/cpu_features.h: drop evex512 on gcc-16
+
+gcc-16 `master` branch dropped support for `evex512` as:
+    https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=c052a6f4a1c803cb92147ff98fb91cf3511e0856
+
+As a result libdeflate build started failing as:
+
+    In file included from /build/source/lib/adler32.c:28:
+    /build/source/lib/x86/adler32_template.h:135:12: error: attribute 'target' argument 'no-evex512' is unknown
+      135 | ADD_SUFFIX(reduce_to_32bits)(vec_t v_s1, vec_t v_s2, u32 *s1_p, u32 *s2_p)
+          |            ^~~~~~~~~~~~~~~~
+
+The change adds upper build to `evex512` for `gcc`.
+---
+ lib/x86/cpu_features.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/x86/cpu_features.h b/lib/x86/cpu_features.h
+index fbfdb0eb..f9d69d72 100644
+--- a/lib/x86/cpu_features.h
++++ b/lib/x86/cpu_features.h
+@@ -165,7 +165,7 @@ static inline u32 get_x86_cpu_features(void) { return 0; }
+ #  define HAVE_AVXVNNI(features)	((features) & X86_CPU_FEATURE_AVXVNNI)
+ #endif
+ 
+-#if (GCC_PREREQ(14, 0) || CLANG_PREREQ(18, 0, 18000000)) \
++#if ((GCC_PREREQ(14, 0) && !(GCC_PREREQ(16, 0))) || CLANG_PREREQ(18, 0, 18000000)) \
+ 	&& !defined(__EVEX512__) /* avoid subtracting the evex512 feature */
+ #  define EVEX512	",evex512"	/* needed to override potential -mno-evex512 */
+ #  define NO_EVEX512	",no-evex512"

flake.lock

@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1791569574,
-        "narHash": "sha256-5sViLmjhTCtBTvhjSXXvd5LDrAFMydFFKZQisjE8Vds=",
+        "lastModified": 1790989254,
+        "narHash": "sha256-ZN+riaeFuE+DZ5zfqJiXlM12jLwZzeIXiNkU1YeHMXI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6b88c12cc6d234de4888f5d21076fb11199d0844",
+        "rev": "acd21c5a3420a9d5fd0ed06299b10828267ef9ba",
         "type": "github"
       },
       "original": {
@@ -67,11 +67,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1791408935,
-        "narHash": "sha256-KBTqa8MARN8rBUaEAmcfWos4vEtJhG5l/Zy+FvvLkMY=",
+        "lastModified": 1790427786,
+        "narHash": "sha256-8+Ip0HFW2oZiRr0zCZmPPIHfTdxxHy4CmSF1uOkM3Bw=",
         "owner": "LLukas22",
         "repo": "Jellyswarrm",
-        "rev": "c38a7da6ee8bbbdc9e8a4fa994435ca967387c86",
+        "rev": "9e67c5ad12116add867ba6c1bf69f767879e9147",
         "type": "github"
       },
       "original": {
@@ -85,11 +85,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1791373788,
-        "narHash": "sha256-c3oMt0QoE+4yiRk6u1m2L9ogjaUw0uTGn9yk808KkgE=",
+        "lastModified": 1790948122,
+        "narHash": "sha256-fDMYyzY1lI5b8RuCMrvoaIgTeRwNnTG4dNk1ucROlQE=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "4bc63156b109ee7b4103e3ec30565c8c92bde435",
+        "rev": "0953bb1a609df63013176e3463393f8df993d3ef",
         "type": "github"
       },
       "original": {
@@ -114,11 +114,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1791589578,
-        "narHash": "sha256-1QTfBXQpu9+xvwr9ljd0RShNmImFDGzgfFPxlnuXtS0=",
+        "lastModified": 1791033472,
+        "narHash": "sha256-IRpPnIfZ0drkkyMtuuvXaada2RjH+G2WYv14Ap1W8q4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d4d44dc89bfa01e1f837eff0ca1d04255742273c",
+        "rev": "ad70d223e208533b7ee8cc8e336a34aad134ab19",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1791456040,
-        "narHash": "sha256-H83yz/do+hjOO0uujHyH8RgtIQP2v7Mw+cLwcZK/xKc=",
+        "lastModified": 1790822859,
+        "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e7439b6b14ad3cc35d05608ebca9bce01a25f5f8",
+        "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
         "type": "github"
       },
       "original": {
@@ -201,11 +201,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1791103873,
-        "narHash": "sha256-nFxM+pKoZ8LJAEnUXARyCaOAloWgaW9kZQOSjWzKcTE=",
+        "lastModified": 1790498116,
+        "narHash": "sha256-rs9meAYxW3zzrh43yaW7htrqCD+X9+pupDPHN86fumI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "dcd241ba97088c22569d1573286e1b9daad340c0",
+        "rev": "5efb5a6f4f5ab192817d28557dd4d650fa14d866",
         "type": "github"
       },
       "original": {

systems/brain/services/home_assistant.nix

@@ -13,10 +13,6 @@
   services = {
     home-assistant = {
       enable = true;
-      # Keep Home Assistant's Python dependencies on baseline x86-64.
-      package = pkgs.x86-v1.home-assistant.overrideAttrs (_: {
-        doInstallCheck = false;
-      });
       config = {
         homeassistant = {
           time_zone = "America/New_York";
@@ -83,7 +79,7 @@
         "isal"
         "modbus" # for victron modbus integration
       ];
-      customComponents = with pkgs.x86-v1.home-assistant-custom-components; [
+      customComponents = with pkgs.home-assistant-custom-components; [
         garmin_connect
       ];
 

systems/jeeves/services/gitea.nix

@@ -23,6 +23,7 @@ in
       };
       service.DISABLE_REGISTRATION = true;
       server = {
+        DOMAIN = "gitea.tmmworkshop.com";
         ROOT_URL = "https://gitea.tmmworkshop.com/";
         HTTP_PORT = 6443;
         BUILTIN_SSH_SERVER_USER = "gitea";

systems/rhapsody-in-green/default.nix

@@ -3,15 +3,17 @@
   imports = [
     "${inputs.self}/users/richie"
     "${inputs.self}/common/global"
-    "${inputs.self}/common/optional/desktop"
+    "${inputs.self}/common/optional/desktop.nix"
     "${inputs.self}/common/optional/docker.nix"
     "${inputs.self}/common/optional/steam.nix"
     "${inputs.self}/common/optional/syncthing_base.nix"
     "${inputs.self}/common/optional/systemd-boot.nix"
     "${inputs.self}/common/optional/tailscale.nix"
+    "${inputs.self}/common/optional/yubikey.nix"
     "${inputs.self}/common/optional/zfs"
     ./hardware.nix
     ./programs.nix
+    ./qmk.nix
     ./syncthing.nix
     inputs.nixos-hardware.nixosModules.framework-13-7040-amd
   ];

users/richie/home/gui/default.nix

@@ -21,7 +21,6 @@
     vlc
     # browser
     brave
-    firefox
     # dev tools
     gparted
     jetbrains.datagrip

users/richie/home/gui/llm_tools.nix

@@ -1,7 +1,9 @@
 { pkgs, ... }:
 {
   home.packages = [
+    pkgs.master.claude-code
     pkgs.master.codex
     pkgs.master.opencode
+    pkgs.master.pi-coding-agent
   ];
 }