From 99b7c4f2501fdbae0e6325a3f3185996ceb4f162 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Wed, 9 Jul 2025 21:05:06 +0200
Subject: [PATCH] quickshell: switch to nixpkgs quickshell

---
 flake.lock                          | 21 ---------------------
 flake.nix                           |  7 -------
 modules/style/quickshell/module.nix |  5 +----
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/flake.lock b/flake.lock
index e937319..8d887e8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -876,26 +876,6 @@
         "type": "github"
       }
     },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751880110,
-        "narHash": "sha256-5fQ2cetL3rTHqXe2VM3puawL/8u5j6ujBr6Gdt7Iues=",
-        "ref": "refs/heads/master",
-        "rev": "5d7e07508ae3e5487edb1ac5a152120434f091d5",
-        "revCount": 607,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/quickshell/quickshell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/quickshell/quickshell"
-      }
-    },
     "root": {
       "inputs": {
         "determinate": "determinate",
@@ -903,7 +883,6 @@
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "nixpkgs": "nixpkgs_2",
-        "quickshell": "quickshell",
         "rust-overlay": "rust-overlay_2",
         "schizofox": "schizofox",
         "systems": "systems_2",
diff --git a/flake.nix b/flake.nix
index 64f5561..a20d88f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,13 +67,6 @@
       inputs.systems.follows = "systems";
     };
 
-    quickshell = {
-      url = "git+https://git.outfoxxed.me/quickshell/quickshell";
-      # THIS IS IMPORTANT
-      # Mismatched system dependencies will lead to crashes and other issues.
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     # The things rust is making me do...
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
diff --git a/modules/style/quickshell/module.nix b/modules/style/quickshell/module.nix
index 9fa7a30..c0635cc 100644
--- a/modules/style/quickshell/module.nix
+++ b/modules/style/quickshell/module.nix
@@ -1,12 +1,9 @@
 {
   config,
   lib,
-  inputs,
   pkgs,
   ...
 }: let
-  inherit (inputs) quickshell;
-
   inherit (lib.modules) mkIf;
   inherit (lib.options) mkEnableOption;
 
@@ -16,7 +13,7 @@ in {
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-      quickshell.packages.${pkgs.stdenv.system}.default
+      quickshell
       qt6.qtimageformats
       qt6.qt5compat
       qt6.qtmultimedia