From 8abf715ca9dd7145b6dbf1ee809ff1a5a631cbbd Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Tue, 14 Dec 2021 15:15:56 +0100
Subject: [PATCH] Prevent merge conflicts with upstream in overlays

---
 overlays/overrides.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index d2d7793c..5c114143 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -6,15 +6,16 @@ channels: final: prev: {
     cachix
     dhall
     discord
-    element-desktop-wayland
+    element-desktop
     rage
-    neovim-unwrapped
     nixpkgs-fmt
     qutebrowser
     signal-desktop
-    tdesktop
     starship
     deploy-rs
+
+    element-desktop-wayland
+    neovim-unwrapped
     tdesktop
     xdg-desktop-portal
     xdg-desktop-portal-gtk