From 05d8afb09ad54187ea96d31cec990c2da319331a Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Thu, 4 Jan 2024 14:33:50 +0100
Subject: [PATCH] chore(yabai): overlay 6.0.2 -> 6.0.4

---
 machines/common/darwin/default.nix | 13 +------------
 pkgs/overlays.nix                  |  7 +++++++
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/machines/common/darwin/default.nix b/machines/common/darwin/default.nix
index 4cb2793..ff31650 100644
--- a/machines/common/darwin/default.nix
+++ b/machines/common/darwin/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
+{lib, ...}: {
   # manipulate the global /etc/zshenv for PATH, etc.
   programs.zsh.enable = true;
 
@@ -17,13 +13,6 @@
   services = {
     yabai = {
       enable = true;
-      package = pkgs.yabai.overrideAttrs (prev: {
-        version = "6.0.2";
-        src = pkgs.fetchzip {
-          inherit (prev.src) url;
-          hash = "sha256-aFM0rtHrHsLEziDWhRwqeCy70dSAOAX4HDpqHqvnoWs=";
-        };
-      });
       enableScriptingAddition = true;
       logFile = "/var/tmp/yabai.log";
       config = {
diff --git a/pkgs/overlays.nix b/pkgs/overlays.nix
index fddf401..37ef775 100644
--- a/pkgs/overlays.nix
+++ b/pkgs/overlays.nix
@@ -2,6 +2,13 @@
   inputs.swayfx.overlays.default
   inputs.nix-vscode-extensions.overlays.default
   (final: prev: {
+    yabai = prev.yabai.overrideAttrs (old: rec {
+      version = "6.0.4";
+      src = prev.fetchzip {
+        url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
+        hash = "sha256-gxQBZ/7I2TVjoG5a8ea2+W4OwI9pJFbGSbZzcL5JY4Q=";
+      };
+    });
     nur = import inputs.nur {
       nurpkgs = prev;
       pkgs = prev;