From 0306aa6381dda2fd856f8bc6f78a2c81f9b5d35a Mon Sep 17 00:00:00 2001
From: iiogama <iiogama@0x212.org>
Date: Sat, 6 Jan 2024 09:21:03 -0800
Subject: [PATCH] Removed config.h patch from dwl for initial testing.

---
 dwl-build_error.log        | 15 +++++++++++++++
 nixos/gui.nix              |  9 +++++----
 nixos/patches/dwl/config.h |  4 ++--
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 dwl-build_error.log

diff --git a/dwl-build_error.log b/dwl-build_error.log
new file mode 100644
index 0000000..50719f0
--- /dev/null
+++ b/dwl-build_error.log
@@ -0,0 +1,15 @@
+error: builder for '/nix/store/kdnn9827xdjh7zwfcahajjzh8qpqlrn4-dwl-0.4.drv' failed with exit code 2;
+       last 10 log lines:
+       > dwl.c:407:44: error: 'tags' undeclared here (not in a function); did you mean 'tag'?
+       >   407 | struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
+       >       |                                            ^~~~
+       > dwl.c:68:41: note: in definition of macro 'LENGTH'
+       >    68 | #define LENGTH(X)               (sizeof X / sizeof X[0])
+       >       |                                         ^
+       > config.h:21:12: warning: 'log_level' defined but not used [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wunused-variable-Wunused-variable8;;]
+       >    21 | static int log_level = WLR_ERROR;
+       >       |            ^~~~~~~~~
+       > make: *** [Makefile:60: dwl.o] Error 1
+       For full logs, run 'nix log /nix/store/kdnn9827xdjh7zwfcahajjzh8qpqlrn4-dwl-0.4.drv'.
+error: 1 dependencies of derivation '/nix/store/lk9g5kw1yh15p2p5iw4a0wps6jq560in-system-path.drv' failed to build
+error: 1 dependencies of derivation '/nix/store/id6523vap8cxfd7ds9yi9h49b08avwxf-nixos-system-buckwheat-24.05.20231219.54aac08.drv' failed to build
diff --git a/nixos/gui.nix b/nixos/gui.nix
index 96d4282..c38b02c 100644
--- a/nixos/gui.nix
+++ b/nixos/gui.nix
@@ -99,11 +99,12 @@
     xsel
 
     # Packages for Wayland
-    (dwl.overrideAttrs (oldAttrs: rec { 
-      configFile = writeText "config.def.h" (builtins.readFile ./patches/dwl/config.h);
-      postPatch = "${oldAttrs.postPatch}\n cp ${configFile} config.def.h";
-    }))
+    #(dwl.overrideAttrs (oldAttrs: rec { 
+    #  configFile = writeText "config.def.h" (builtins.readFile ./patches/dwl/config.h);
+    #  postPatch = "${oldAttrs.postPatch}\n cp ${configFile} config.def.h";
+    #}))
     bemenu
+    dwl
     foot
   ];
 }
diff --git a/nixos/patches/dwl/config.h b/nixos/patches/dwl/config.h
index 76e436b..c5ae7a6 100644
--- a/nixos/patches/dwl/config.h
+++ b/nixos/patches/dwl/config.h
@@ -123,14 +123,14 @@ static const Key keys[] = {
 	/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
 	/* modifier                  key                 function        argument */
 	{ MODKEY,                    XKB_KEY_p,          spawn,          {.v = menucmd} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return,     spawn,          {.v = termcmd} },
+	{ MODKEY,                    XKB_KEY_Return,     spawn,          {.v = termcmd} },
 	{ MODKEY,                    XKB_KEY_j,          focusstack,     {.i = +1} },
 	{ MODKEY,                    XKB_KEY_k,          focusstack,     {.i = -1} },
 	{ MODKEY,                    XKB_KEY_i,          incnmaster,     {.i = +1} },
 	{ MODKEY,                    XKB_KEY_d,          incnmaster,     {.i = -1} },
 	{ MODKEY,                    XKB_KEY_h,          setmfact,       {.f = -0.05} },
 	{ MODKEY,                    XKB_KEY_l,          setmfact,       {.f = +0.05} },
-	{ MODKEY,                    XKB_KEY_Return,     zoom,           {0} },
+	{ MODKEY|WLR_MODIFER_SHIFT,  XKB_KEY_Return,     zoom,           {0} },
 	{ MODKEY,                    XKB_KEY_Tab,        view,           {0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C,          killclient,     {0} },
 	{ MODKEY,                    XKB_KEY_t,          setlayout,      {.v = &layouts[0]} },