From b20aa356c91400e0cc30b413276e19d3006c1d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Fri, 30 Aug 2024 00:35:12 +0200
Subject: [PATCH] fix(nvidia): Bump sway to unstable to prevent flickering

Seems the flickering was *way* worse with the 4060ti.
---
 flake.lock                                | 17 ++++++++++
 flake.nix                                 |  1 +
 nixos-config/hosts/yui/nvidia/default.nix | 39 ++++++++++++++++++++++-
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/flake.lock b/flake.lock
index c38245e4..142317f4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -364,6 +364,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1724819573,
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1714562304,
@@ -423,6 +439,7 @@
         "nixos-anywhere": "nixos-anywhere",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "nurpkgs": "nurpkgs",
         "sops-nix": "sops-nix"
       }
diff --git a/flake.nix b/flake.nix
index 96a5a1d9..f053669b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
   inputs = {
     # NixOS related inputs
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     sops-nix = {
diff --git a/nixos-config/hosts/yui/nvidia/default.nix b/nixos-config/hosts/yui/nvidia/default.nix
index ce3882f7..d26380f5 100644
--- a/nixos-config/hosts/yui/nvidia/default.nix
+++ b/nixos-config/hosts/yui/nvidia/default.nix
@@ -1,4 +1,7 @@
-{ config, lib, ... }:
+{ pkgs, flake-inputs, config, lib, ... }:
+let
+  unstable = flake-inputs.nixpkgs-unstable.legacyPackages.${pkgs.system};
+in
 {
   imports = [ ./vaapi.nix ];
 
@@ -29,6 +32,40 @@
     };
   };
 
+  nixpkgs.overlays = [
+    (final: _prev: {
+      sway-unwrapped = unstable.sway-unwrapped.overrideAttrs (attrs: {
+        version = "0-unstable-2024-08-28";
+        src = final.fetchFromGitHub {
+          owner = "swaywm";
+          repo = "sway";
+          rev = "980a4e02113789d0cca94aa023557c6f6e87ec73";
+          hash = "sha256-qciZeQghlLV5aMuOnex3LvFU9vTa941RMlUkdvj0QTU=";
+        };
+        buildInputs = attrs.buildInputs ++ [ final.wlroots ];
+        mesonFlags =
+          let
+            inherit (lib.strings) mesonEnable mesonOption;
+          in
+          [
+            (mesonOption "sd-bus-provider" "libsystemd")
+            (mesonEnable "tray" attrs.trayEnabled)
+          ];
+      });
+
+      wlroots = unstable.wlroots.overrideAttrs (_attrs: {
+        version = "0-unstable-2024-08-29";
+        src = final.fetchFromGitLab {
+          domain = "gitlab.freedesktop.org";
+          owner = "wlroots";
+          repo = "wlroots";
+          rev = "beb9a9ad0a38867154b7606911c33ffa5ecf759f";
+          hash = "sha256-ZlNFxwj3c5zKiSfokA27zhJ+Yar8cma4fj6N/ulI0VM=";
+        };
+      });
+    })
+  ];
+
   boot = {
     kernelParams = [
       "nvidia-drm.fbdev=1"