From 4abaa92681920cf7847d3ef1036d075d60da966d Mon Sep 17 00:00:00 2001
From: Frantisek Bohacek <rutherther@proton.me>
Date: Wed, 5 Jun 2024 09:35:22 +0200
Subject: [PATCH] chore: split dwl to flake packages

---
 flake.nix                                        |  1 +
 home/modules/profiles/desktop/dwl/default.nix    | 15 +--------------
 .../profiles/desktop => pkgs}/dwl/config.h       |  0
 pkgs/dwl/default.nix                             | 16 ++++++++++++++++
 4 files changed, 18 insertions(+), 14 deletions(-)
 rename {home/modules/profiles/desktop => pkgs}/dwl/config.h (100%)
 create mode 100644 pkgs/dwl/default.nix

diff --git a/flake.nix b/flake.nix
index 945a43f..4e8c2e0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,6 +69,7 @@
         sequence-detector = pkgs.callPackage ./pkgs/rutherther/sequence-detector.nix {};
         dwlmsg = pkgs.callPackage ./pkgs/dwlmsg.nix {};
         dwlb = pkgs.callPackage ./pkgs/dwlb.nix {};
+        dwl = pkgs.callPackage ./pkgs/dwl {};
       };
 
       installIsos = import ./nixos/isos {
diff --git a/home/modules/profiles/desktop/dwl/default.nix b/home/modules/profiles/desktop/dwl/default.nix
index 333f275..e67cb30 100644
--- a/home/modules/profiles/desktop/dwl/default.nix
+++ b/home/modules/profiles/desktop/dwl/default.nix
@@ -98,20 +98,7 @@ in {
       pkgs.wlopm
       pkgs.kanshi
 
-      ((pkgs.dwl.override {
-        conf = ./config.h;
-      }).overrideAttrs (oldAttrs: {
-        buildInputs = (oldAttrs.buildInputs or []) ++ [
-          pkgs.libdrm
-          pkgs.fcft
-        ];
-        src = pkgs.fetchFromGitHub {
-          owner = "Rutherther";
-          repo = "dwl";
-          rev = "8c82c67f151c78b6bbe895f4831b20e6d7875450";
-          hash = "sha256-02j6T66gzYXkFql2NffujNJPQsaEFm00i+o4aazCn8U=";
-        };
-      }))
+      inputs.self.packages.${pkgs.system}.dwl
     ];
 
     programs = {
diff --git a/home/modules/profiles/desktop/dwl/config.h b/pkgs/dwl/config.h
similarity index 100%
rename from home/modules/profiles/desktop/dwl/config.h
rename to pkgs/dwl/config.h
diff --git a/pkgs/dwl/default.nix b/pkgs/dwl/default.nix
new file mode 100644
index 0000000..de68b15
--- /dev/null
+++ b/pkgs/dwl/default.nix
@@ -0,0 +1,16 @@
+{ dwl, libdrm, fcft, fetchFromGitHub }:
+
+((dwl.override {
+  conf = ./config.h;
+}).overrideAttrs (oldAttrs: {
+  buildInputs = (oldAttrs.buildInputs or []) ++ [
+    libdrm
+    fcft
+  ];
+  src = fetchFromGitHub {
+    owner = "Rutherther";
+    repo = "dwl";
+    rev = "8c82c67f151c78b6bbe895f4831b20e6d7875450";
+    hash = "sha256-02j6T66gzYXkFql2NffujNJPQsaEFm00i+o4aazCn8U=";
+  };
+}))
-- 
2.48.1