From 8852d10f6d0fb7634ae1ca8962fbad1b1f131ac4 Mon Sep 17 00:00:00 2001
From: Ulysse Cura <ulysse.cura@google.com>
Date: Sun, 21 Jun 2026 11:21:51 +0200
Subject: [PATCH] Followed quarto patched variable style for other packages.

---
 packages.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages.nix b/packages.nix
index 8bf3345..b61f392 100644
--- a/packages.nix
+++ b/packages.nix
@@ -29,6 +29,14 @@
           --replace-fail "syntax-highlighting" "highlight-style"
       '';
     });
+    patchedPicoSdk = (pkgs.pico-sdk.override {
+      withSubmodules = true;
+    });
+    patchedElementDesktop = (pkgs.element-desktop.overrideAttrs (oldAttrs: {
+      desktopItems =  [
+        ((builtins.elemAt oldAttrs.desktopItems 0).override { startupWMClass = "element"; })
+      ];
+    }));
   in with pkgs; [
     # System
     gsettings-desktop-schemas
@@ -52,9 +60,7 @@
     scrcpy
     android-tools
     kicad
-    (pico-sdk.override {
-      withSubmodules = true;
-    })
+    patchedPicoSdk
     picotool
     gnumake
     cmake
@@ -72,11 +78,7 @@
 
 
     # Communication
-    (element-desktop.overrideAttrs (oldAttrs: {
-      desktopItems =  [
-        ((builtins.elemAt oldAttrs.desktopItems 0).override { startupWMClass = "element"; })
-      ];
-    }))
+    patchedElementDesktop
     discord
 
     # Music