From 4ddc0a4acd93253c133db410d79260d5c86f2591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Sat, 25 May 2024 13:38:40 -0300
Subject: [PATCH] sway: don't require rebuilding sway dependencies

---
 overlays/default.nix  | 10 ++++++----
 system/greetd.nix     |  3 ++-
 user/sway/default.nix |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/overlays/default.nix b/overlays/default.nix
index c5d145d..060a0c0 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -44,10 +44,12 @@
           --replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY
       '';
     });
-    sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
-      patches = old.patches
-        ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
-    });
+    mySway = prev.sway.override {
+      sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
+        patches = old.patches
+          ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
+      });
+    };
     mangohud = prev.mangohud.overrideAttrs (o: {
       patches = o.patches ++ [
         (prev.fetchpatch {
diff --git a/system/greetd.nix b/system/greetd.nix
index 72b82c1..4c6e31a 100644
--- a/system/greetd.nix
+++ b/system/greetd.nix
@@ -17,6 +17,7 @@ in
     # enable sway window manager
     programs.sway = {
       enable = true;
+      package = pkgs.mySway;
       wrapperFeatures.gtk = true;
     };
 
@@ -59,7 +60,7 @@ in
         enable = true;
         settings = {
           initial_session = {
-            command = "${pkgs.sway}/bin/sway";
+            command = desktop;
             user = "lelgenio";
           };
           default_session = {
diff --git a/user/sway/default.nix b/user/sway/default.nix
index f832aaa..7719370 100644
--- a/user/sway/default.nix
+++ b/user/sway/default.nix
@@ -21,6 +21,7 @@ in
 
     wayland.windowManager.sway = {
       enable = true;
+      package = pkgs.mySway;
       config = {
         bars = [ ];
 
@@ -105,7 +106,7 @@ in
     xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json;
 
     home.packages = with pkgs; [
-      sway
+      mySway
       swaybg
       swaylock
       wdisplays