From a914be9bcac3789362e31f62c6846e28627566a1 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Mon, 13 Jan 2025 10:31:25 -0500
Subject: [PATCH] flake: use qtile overlay

---
 flake.lock             | 21 +++++++++++++++++++++
 flake.nix              |  5 +++++
 overlays/overrides.nix | 17 -----------------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 18d8876..bec172e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -912,6 +912,26 @@
         "url": "ssh://git@github.com/Infinidoge/universe-private"
       }
     },
+    "qtile": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1736685332,
+        "narHash": "sha256-iA3/Qbz1q06iAp8W/CP01guC5PESb/0Wyvlloura5OM=",
+        "owner": "qtile",
+        "repo": "qtile",
+        "rev": "50754b552ceb076e705815a01056920e2f7e37f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "qtile",
+        "repo": "qtile",
+        "type": "github"
+      }
+    },
     "rocksdb": {
       "flake": false,
       "locked": {
@@ -954,6 +974,7 @@
         "nixpkgs": "nixpkgs",
         "nixvim": "nixvim",
         "private": "private",
+        "qtile": "qtile",
         "rust-overlay": "rust-overlay",
         "stable": "stable",
         "systems": "systems_2",
diff --git a/flake.nix b/flake.nix
index b6c75ed..dca9fc1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,6 +63,9 @@
     ## Vencord
     vencord = { url = "github:Vendicated/Vencord"; flake = false; };
 
+    ## Qtile
+    qtile.url = "github:qtile/qtile";
+
     ### Cleanup ###
     ## Common
     blank.url = "github:divnix/blank";
@@ -104,6 +107,7 @@
     nixvim.inputs.nix-darwin.follows = "blank";
     nixvim.inputs.nixpkgs.follows = "nixpkgs";
     nixvim.inputs.treefmt-nix.follows = "treefmt-nix";
+    qtile.inputs.nixpkgs.follows = "nixpkgs";
     rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
     universe-cli.inputs.devshell.follows = "devshell";
@@ -176,6 +180,7 @@
                   # --- Domain-Specific Overlays
                   inputs.agenix.overlays.default
                   inputs.nix-minecraft.overlay
+                  inputs.qtile.overlays.default
                   inputs.rust-overlay.overlays.default
                   inputs.universe-cli.overlays.default
                 ];
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 4c12c15..2bfc4af 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -59,28 +59,11 @@ in
   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
     (pythonFinal: pythonPrev: {
       inherit (final) jupyterlab-vim jupyterlab-myst;
-
-      qtile = pythonPrev.qtile.overrideAttrs (oldAttrs: {
-        version = "0.0.0+unstable-2024-11-28";
-        src = oldAttrs.src.override {
-          rev = "4897d0d15d4403de00d19c570d60178541c7c582";
-          hash = "sha256-k0kxvPUOEb6/1HnihRhPcULO+AI8PPvtX3SBt3EImI8=";
-        };
-      });
       qtile-extras = pythonPrev.qtile-extras.overridePythonAttrs {
         doCheck = false;
       };
-
-      # https://github.com/NixOS/nixpkgs/pull/356680/
-      term-image = pythonPrev.term-image.overridePythonAttrs {
-        pythonRelaxDeps = [ "pillow" ];
-      };
     })
   ];
 
-  qtile = prev.qtile.overrideAttrs {
-    version = final.python3Packages.qtile.version;
-  };
-
   python-grip = fork.python3Packages.grip;
 }