From e9c95cfc45aff2dcf6e47e3404351cec67bca120 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Fri, 15 May 2026 02:08:01 -0700
Subject: [PATCH] Use upstream hyprexpo flake package

---
 nixos/flake.lock                    | 22 +++++++--
 nixos/flake.nix                     |  2 +-
 nixos/flake/per-system.nix          | 10 +---
 nixos/hyprland.nix                  | 10 +---
 nixos/packages/hyprexpo/default.nix | 75 -----------------------------
 5 files changed, 21 insertions(+), 98 deletions(-)
 delete mode 100644 nixos/packages/hyprexpo/default.nix

diff --git a/nixos/flake.lock b/nixos/flake.lock
index 340fc1e9..232337a9 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -753,13 +753,27 @@
       }
     },
     "hyprexpo": {
-      "flake": false,
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ],
+        "nixpkgs": [
+          "hyprexpo",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprexpo",
+          "hyprland",
+          "systems"
+        ]
+      },
       "locked": {
-        "lastModified": 1778829240,
-        "narHash": "sha256-r+gsmmJM8cXuq1TDuaBUjl5g1HYMA357Rl+NH6svV8E=",
+        "lastModified": 1778831952,
+        "narHash": "sha256-Hp1ip+DnnXIJ1Ezvvyn4t6CVmvlSaExwgnJXFdohMYw=",
         "owner": "colonelpanic8",
         "repo": "hyprexpo",
-        "rev": "67adc97d818cf13fef7fa4a6ad7e94ab7d0c002a",
+        "rev": "b5f1e72e1db92a4326f9b376f39f1d6a85b9a758",
         "type": "github"
       },
       "original": {
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 5ce01ed7..4b08af95 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -117,7 +117,7 @@
 
     hyprexpo = {
       url = "github:colonelpanic8/hyprexpo";
-      flake = false;
+      inputs.hyprland.follows = "hyprland";
     };
 
     Hyprspace = {
diff --git a/nixos/flake/per-system.nix b/nixos/flake/per-system.nix
index 701de0b7..ff00ef39 100644
--- a/nixos/flake/per-system.nix
+++ b/nixos/flake/per-system.nix
@@ -26,15 +26,7 @@
     hyprlang = inputs.hyprlang.packages.${system}.hyprlang;
     hyprutils = inputs.hyprutils.packages.${system}.hyprutils;
   };
-  hyprexpo = pkgs.callPackage ../packages/hyprexpo {
-    src = inputs.hyprexpo;
-    hyprland = inputs.hyprland.packages.${system}.hyprland;
-    aquamarine = inputs.aquamarine.packages.${system}.aquamarine;
-    hyprcursor = inputs.hyprcursor.packages.${system}.hyprcursor;
-    hyprgraphics = inputs.hyprgraphics.packages.${system}.hyprgraphics;
-    hyprlang = inputs.hyprlang.packages.${system}.hyprlang;
-    hyprutils = inputs.hyprutils.packages.${system}.hyprutils;
-  };
+  hyprexpo = inputs.hyprexpo.packages.${system}.hyprexpo;
   tangledConfig = dotfilesOrgApi.org-agenda-custom-config;
 
   # Import container build logic
diff --git a/nixos/hyprland.nix b/nixos/hyprland.nix
index 82d715e0..362ba93a 100644
--- a/nixos/hyprland.nix
+++ b/nixos/hyprland.nix
@@ -115,15 +115,7 @@
         ./packages/hyprwobbly-safe-geometry-and-idle-timer.patch
       ];
   });
-  hyprexpo = pkgs.callPackage ./packages/hyprexpo {
-    src = inputs.hyprexpo;
-    hyprland = baseHyprlandPackage;
-    aquamarine = inputs.aquamarine.packages.${system}.aquamarine;
-    hyprcursor = inputs.hyprcursor.packages.${system}.hyprcursor;
-    hyprgraphics = inputs.hyprgraphics.packages.${system}.hyprgraphics;
-    hyprlang = inputs.hyprlang.packages.${system}.hyprlang;
-    hyprutils = inputs.hyprutils.packages.${system}.hyprutils;
-  };
+  hyprexpo = inputs.hyprexpo.packages.${system}.hyprexpo;
   hyprlandPluginPackages =
     [
       inputs.hyprNStack.packages.${system}.hyprNStack
diff --git a/nixos/packages/hyprexpo/default.nix b/nixos/packages/hyprexpo/default.nix
deleted file mode 100644
index c1880876..00000000
--- a/nixos/packages/hyprexpo/default.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  stdenv,
-  lib,
-  cmake,
-  pkg-config,
-  aquamarine,
-  cairo,
-  glslang,
-  hyprland,
-  hyprcursor,
-  hyprgraphics,
-  hyprlang,
-  hyprutils,
-  libdrm,
-  libGL,
-  libinput,
-  libxcb,
-  libxcb-errors,
-  libxcb-wm,
-  libxkbcommon,
-  lua,
-  pango,
-  pixman,
-  systemd,
-  wayland,
-  src,
-}:
-stdenv.mkDerivation {
-  pname = "hyprexpo";
-  version = "unstable-${src.shortRev or "unknown"}";
-  inherit src;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    aquamarine
-    cairo
-    glslang
-    hyprland
-    hyprcursor
-    hyprgraphics
-    hyprlang
-    hyprutils
-    libdrm
-    libGL
-    libinput
-    libxcb
-    libxcb-errors
-    libxcb-wm
-    libxkbcommon
-    lua
-    pango
-    pixman
-    systemd
-    wayland
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 libhyprexpo.so "$out/lib/libhyprexpo.so"
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Hyprland workspace overview plugin";
-    homepage = "https://github.com/colonelpanic8/hyprexpo";
-    license = lib.licenses.bsd3;
-    platforms = lib.platforms.linux;
-  };
-}