From a490d5a5efcdddca66b3b57348d1fd83711792eb Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Sat, 3 Aug 2024 00:10:57 +0200
Subject: [PATCH] Use nixpkgs swayfx

---
 flake.lock  | 58 +----------------------------------------------------
 flake.nix   |  8 ++++----
 overlay.nix |  3 ++-
 3 files changed, 7 insertions(+), 62 deletions(-)

diff --git a/flake.lock b/flake.lock
index 61f31ff..0221628 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1078,22 +1078,6 @@
       }
     },
     "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1713128889,
-        "narHash": "sha256-aB90ZqzosyRDpBh+rILIcyP5lao8SKz8Sr2PSWvZrzk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "2748d22b45a99fb2deafa5f11c7531c212b2cefa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_11": {
       "locked": {
         "lastModified": 1718530797,
         "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
@@ -1307,7 +1291,6 @@
         "nur": "nur",
         "secrets": "secrets",
         "sops-nix": "sops-nix",
-        "swayfx": "swayfx",
         "youmubot": "youmubot"
       }
     },
@@ -1394,24 +1377,6 @@
         "type": "github"
       }
     },
-    "scenefx": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_10"
-      },
-      "locked": {
-        "lastModified": 1715160751,
-        "narHash": "sha256-S8m7phTU7QYgAq4B0hjH5WdtTjHDcNVhYfPFdhbty+A=",
-        "owner": "wlrfx",
-        "repo": "scenefx",
-        "rev": "2ec3505248e819191c37cb831197629f373326fb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "wlrfx",
-        "repo": "scenefx",
-        "type": "github"
-      }
-    },
     "secrets": {
       "inputs": {
         "flake-utils": "flake-utils_9"
@@ -1453,27 +1418,6 @@
         "type": "github"
       }
     },
-    "swayfx": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "scenefx": "scenefx"
-      },
-      "locked": {
-        "lastModified": 1715273144,
-        "narHash": "sha256-x8z/sjtJPojvaXiOUDvADiSU/QmSo8cqKQ1X4g+5dw4=",
-        "owner": "WillPower3309",
-        "repo": "swayfx",
-        "rev": "3c621dec7d653231f960d377fcb3ceeed55953e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "WillPower3309",
-        "repo": "swayfx",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -1631,7 +1575,7 @@
       "inputs": {
         "crane": "crane_5",
         "flake-utils": "flake-utils_10",
-        "nixpkgs": "nixpkgs_11"
+        "nixpkgs": "nixpkgs_10"
       },
       "locked": {
         "lastModified": 1722866694,
diff --git a/flake.nix b/flake.nix
index 652dfc1..7842027 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,10 +35,10 @@
     # ---
     # Imported apps
     youmubot.url = "github:natsukagami/youmubot";
-    swayfx = {
-      url = github:WillPower3309/swayfx;
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # swayfx = {
+    #   url = github:WillPower3309/swayfx;
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
     mpd-mpris = {
       url = github:natsukagami/mpd-mpris;
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/overlay.nix b/overlay.nix
index 2e4f5dc..98a07ab 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -139,7 +139,8 @@ let
   overlay-asahi = inputs.nixos-m1.overlays.default;
 in
 [
-  inputs.swayfx.overlays.default
+  # inputs.swayfx.inputs.scenefx.overlays.override
+  # inputs.swayfx.overlays.override
   inputs.mpd-mpris.overlays.default
   inputs.youmubot.overlays.default