From 4ed8d17b7e1f42c0bcf307bea9750d40d1a2be0d Mon Sep 17 00:00:00 2001
From: Zynh Ludwig <zynh0722@gmail.com>
Date: Fri, 13 Dec 2024 04:17:01 -0800
Subject: [PATCH] dwl: external config

---
 flake.lock      | 22 ++++++++++++++++++++--
 flake.nix       |  1 +
 modules/dwl.nix |  7 +++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index a768a1d..ee05ce7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -651,6 +651,7 @@
         "repo-clone": "repo-clone",
         "sops-nix": "sops-nix",
         "umu": "umu_2",
+        "zdwl": "zdwl",
         "zdwm": "zdwm"
       }
     },
@@ -729,13 +730,13 @@
         "revCount": 867,
         "submodules": true,
         "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/"
+        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
       },
       "original": {
         "dir": "packaging/nix",
         "submodules": true,
         "type": "git",
-        "url": "https://github.com/Open-Wine-Components/umu-launcher/"
+        "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
       }
     },
     "xwayland-satellite-stable": {
@@ -771,6 +772,23 @@
         "type": "github"
       }
     },
+    "zdwl": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1734081909,
+        "narHash": "sha256-1gzw818Kqkn5JORht910b3kK3F2BZstzxdRFTaEAB5M=",
+        "ref": "0.7",
+        "rev": "49888cdcbbace159bc020e3f4be228e63e0c7bad",
+        "revCount": 1250,
+        "type": "git",
+        "url": "https://git.zynh.me/Zynh0722/dwl"
+      },
+      "original": {
+        "ref": "0.7",
+        "type": "git",
+        "url": "https://git.zynh.me/Zynh0722/dwl"
+      }
+    },
     "zdwm": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index d485155..4907c11 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,6 +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; };
     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 034a474..0bde8cb 100644
--- a/modules/dwl.nix
+++ b/modules/dwl.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, inputs, ... }:
 
 let
   cfg = config.snowhawk.dwl;
@@ -9,7 +9,9 @@ in
 
     package = lib.mkOption {
       type = with lib.types; package;
-      default = pkgs.dwl;
+      default = pkgs.dwl.overrideAttrs (old: {
+        src = inputs.zdwl;
+      });
       apply = p: p.overrideAttrs {
         postInstall = ''
           mkdir -p $out/share/wayland-sessions
@@ -27,6 +29,7 @@ in
       enable = true;
       sessionPackages = [ cfg.package ];
       defaultSession = "dwl";
+      # TODO: greetd?
       sddm = {
         enable = lib.mkDefault true;
         wayland.enable = lib.mkDefault true;