From 39ac8c80f0582a112f6c010da89ebb12b9604c9b Mon Sep 17 00:00:00 2001
From: Zynh Ludwig <zynh0722@gmail.com>
Date: Fri, 13 Dec 2024 05:24:50 -0800
Subject: [PATCH] zdwl: flakening

---
 builders.nix    |  2 ++
 flake.lock      | 45 ++++++++++++++++++++++++++++++++++++++++-----
 flake.nix       |  2 +-
 modules/dwl.nix |  6 ++----
 4 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/builders.nix b/builders.nix
index 1871e09..c2f3273 100644
--- a/builders.nix
+++ b/builders.nix
@@ -10,6 +10,8 @@ let
       inputs.niri.overlays.niri
       # inputs.lix-module.overlays.default
 
+      inputs.zdwl.overlays.default
+
       (final: prev: {
         tmux = prev.tmux.overrideAttrs (old: rec {
           version = "3.5";
diff --git a/flake.lock b/flake.lock
index ee05ce7..0013ff0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -166,6 +166,24 @@
         "type": "github"
       }
     },
+    "flake-parts_4": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-schemas": {
       "locked": {
         "lastModified": 1721999734,
@@ -572,6 +590,18 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1733096140,
+        "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1733384649,
@@ -773,13 +803,18 @@
       }
     },
     "zdwl": {
-      "flake": false,
+      "inputs": {
+        "flake-parts": "flake-parts_4",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1734081909,
-        "narHash": "sha256-1gzw818Kqkn5JORht910b3kK3F2BZstzxdRFTaEAB5M=",
+        "lastModified": 1734097112,
+        "narHash": "sha256-orgIP31BsPt/sefmoOA8UDs91WPgYWtgxm0RpO8uVKw=",
         "ref": "0.7",
-        "rev": "49888cdcbbace159bc020e3f4be228e63e0c7bad",
-        "revCount": 1250,
+        "rev": "389d476f5b6c544874e6d01cd23d7c1ad213f1c9",
+        "revCount": 1259,
         "type": "git",
         "url": "https://git.zynh.me/Zynh0722/dwl"
       },
diff --git a/flake.nix b/flake.nix
index 4907c11..b8cb92f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
 
     repo-clone.url = "git+https://git.zynh.me/Zynh0722/repo-clone";
     zdwm = { url = "git+https://git.zynh.me/Zynh0722/dwm?ref=preanybar-systray"; flake = false; };
-    zdwl = { url = "git+https://git.zynh.me/Zynh0722/dwl?ref=0.7"; flake = false; };
+    zdwl = { url = "git+https://git.zynh.me/Zynh0722/dwl?ref=0.7"; inputs.nixpkgs.follows = "nixpkgs"; };
     fish_theme = { url = "git+https://git.zynh.me/Zynh0722/omf-theme"; flake = false; };
     backgrounds = { url = "git+https://git.zynh.me/Zynh0722/backgrounds"; inputs.nixpkgs.follows = "nixpkgs"; };
     umu = { url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; };
diff --git a/modules/dwl.nix b/modules/dwl.nix
index 131df2d..1226a2f 100644
--- a/modules/dwl.nix
+++ b/modules/dwl.nix
@@ -9,9 +9,7 @@ in
 
     package = lib.mkOption {
       type = with lib.types; package;
-      default = pkgs.dwl.overrideAttrs (old: {
-        src = inputs.zdwl;
-      });
+      default = inputs.zdwl.packages."x86_64-linux".default;
       apply = p: p.overrideAttrs {
         postInstall = ''
           mkdir -p $out/share/wayland-sessions
@@ -64,7 +62,7 @@ in
 
       wl-clipboard
       wmenu
-      foot
+      kitty
       cfg.package
     ];
   };