Update

5 files changed, 25 insertions, 43 deletions

diff --git a/pkgs/dwm/default.nix b/pkgs/dwm/default.nix
index 9e963b5..421455e 100644
--- a/pkgs/dwm/default.nix
+++ b/pkgs/dwm/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://github.com/LukeSmithXYZ/dwm";
-    rev = "484720bbba3e2b175b71dba283c3a84b13e71eea";
-    sha256 = "1w19zy3c9nckrh9jwj30ijv7gl0miyiw4m287n5bxmm98zly264p";
+    rev = "28d87d439359096e2f03f2e8582a481269de06be";
+    sha256 = "1fi0q68zqcmnx4spvjaqlv0k43ij96bz3545qdlc077qhzw2lxxh";
   };
 
   buildInputs = [ libX11 libXinerama libXft ];
diff --git a/pkgs/dwm/dwm-apps.diff b/pkgs/dwm/dwm-apps.diff
index 9204fcb..3e29c5a 100644
--- a/pkgs/dwm/dwm-apps.diff
+++ b/pkgs/dwm/dwm-apps.diff
@@ -1,39 +1,21 @@
 diff --git a/config.h b/config.h
-index 6c880c2..0d9eaf8 100644
+index 780550a..e4d4716 100644
 --- a/config.h
 +++ b/config.h
-@@ -51,6 +51,7 @@ static const Rule rules[] = {
- 	{ NULL,       NULL,       "Event Tester",   0,            0,          0,           0,         1,        -1 },
- 	{ NULL,      "spterm",    NULL,       	    SPTAG(0),     0,          1,           1,         0,        -1 },
- 	{ NULL,      "spcalc",    NULL,       	    SPTAG(1),     0,          1,           1,         0,        -1 },
-+  { NULL,      "telegram-desktop",  NULL,     0,            1,          1,           0,         0,        -1 },
+@@ -55,6 +55,7 @@ static const Rule rules[] = {
+ 	{ NULL,       NULL,       "Event Tester",   0,            0,  		  0,           0,         1,        -1 },
+ 	{ NULL,      "spterm",    NULL,       	    SPTAG(0),     0,  		  1,           1,         0,        -1 },
+ 	{ NULL,      "spcalc",    NULL,       	    SPTAG(1),     0,  		  1,           1,         0,        -1 },
++  { NULL,      "telegram-desktop",  NULL,     0,            1,        1,           0,         0,        -1 },
  };
-
+ 
  /* layout(s) */
 @@ -102,7 +103,7 @@ static const Layout layouts[] = {
-
+ 
  /* commands */
  static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 -static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
 +static const char *dmenucmd[] = { "dmenu_run", "-i", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, "-c", "-bw", "2", "-l", "15", NULL };
- static const char *termcmd[]  = { "st", NULL };
-
+ static const char *termcmd[]  = { TERMINAL, NULL };
+ 
  #include <X11/XF86keysym.h>
-@@ -154,7 +155,7 @@ static Key keys[] = {
- 	{ MODKEY|ShiftMask,		XK_bracketleft,		spawn,		SHCMD("mpc seek -60") },
- 	{ MODKEY,			XK_bracketright,	spawn,		SHCMD("mpc seek +10") },
- 	{ MODKEY|ShiftMask,		XK_bracketright,	spawn,		SHCMD("mpc seek +60") },
--	{ MODKEY,			XK_backslash,		view,		{0} },
-+	{ MODKEY,			XK_backslash,		spawn,		SHCMD("telegram-desktop") },
- 	/* { MODKEY|ShiftMask,		XK_backslash,		spawn,		SHCMD("") }, */
-
- 	{ MODKEY,			XK_a,		togglegaps,	{0} },
-@@ -174,7 +175,7 @@ static Key keys[] = {
- 	{ MODKEY,			XK_h,		setmfact,	{.f = -0.05} },
- 	/* J and K are automatically bound above in STACKEYS */
- 	{ MODKEY,			XK_l,		setmfact,      	{.f = +0.05} },
--	{ MODKEY,			XK_semicolon,	shiftview,	{ .i = 1 } },
-+	{ MODKEY,			XK_semicolon,	spawn,	SHCMD("alacritty -e emacs -nw") },
- 	{ MODKEY|ShiftMask,		XK_semicolon,	shifttag,	{ .i = 1 } },
- 	{ MODKEY,			XK_apostrophe,	togglescratch,	{.ui = 1} },
- 	/* { MODKEY|ShiftMask,		XK_apostrophe,	spawn,		SHCMD("") }, */
diff --git a/pkgs/dwm/dwm-center.diff b/pkgs/dwm/dwm-center.diff
index ce14f9d..1bacb63 100644
--- a/pkgs/dwm/dwm-center.diff
+++ b/pkgs/dwm/dwm-center.diff
@@ -1,23 +1,23 @@
 diff --git a/config.h b/config.h
-index 771e7a1..6c880c2 100644
+index 747d9a0..780550a 100644
 --- a/config.h
 +++ b/config.h
-@@ -45,12 +45,12 @@ static const Rule rules[] = {
+@@ -49,12 +49,12 @@ static const Rule rules[] = {
  	 *	WM_CLASS(STRING) = instance, class
  	 *	WM_NAME(STRING) = title
  	*/
 -	/* class    instance      title       	 tags mask    isfloating   isterminal  noswallow  monitor */
 -	{ "Gimp",     NULL,       NULL,       	    1 << 8,       0,           0,         0,        -1 },
--	{ "St",       NULL,       NULL,       	    0,            0,           1,         0,        -1 },
+-	{ TERMCLASS,   NULL,       NULL,       	    0,            0,           1,         0,        -1 },
 -	{ NULL,       NULL,       "Event Tester",   0,            0,           0,         1,        -1 },
 -	{ NULL,      "spterm",    NULL,       	    SPTAG(0),     1,           1,         0,        -1 },
 -	{ NULL,      "spcalc",    NULL,       	    SPTAG(1),     1,           1,         0,        -1 },
-+	/* class    instance      title       	 tags mask    iscentered  isfloating   isterminal  noswallow  monitor */
-+	{ "Gimp",     NULL,       NULL,       	    1 << 8,       0,          0,           0,         0,        -1 },
-+	{ "St",       NULL,       NULL,       	    0,            0,          0,           1,         0,        -1 },
-+	{ NULL,       NULL,       "Event Tester",   0,            0,          0,           0,         1,        -1 },
-+	{ NULL,      "spterm",    NULL,       	    SPTAG(0),     0,          1,           1,         0,        -1 },
-+	{ NULL,      "spcalc",    NULL,       	    SPTAG(1),     0,          1,           1,         0,        -1 },
++	/* class    instance      title       	 tags mask    iscentered	isfloating   isterminal  noswallow  monitor */
++	{ "Gimp",     NULL,       NULL,       	    1 << 8,       0,  		  0,           0,         0,        -1 },
++	{ TERMCLASS,   NULL,       NULL,       	    0,            0,  		  0,           1,         0,        -1 },
++	{ NULL,       NULL,       "Event Tester",   0,            0,  		  0,           0,         1,        -1 },
++	{ NULL,      "spterm",    NULL,       	    SPTAG(0),     0,  		  1,           1,         0,        -1 },
++	{ NULL,      "spcalc",    NULL,       	    SPTAG(1),     0,  		  1,           1,         0,        -1 },
  };
  
  /* layout(s) */
diff --git a/pkgs/dwmblocks/default.nix b/pkgs/dwmblocks/default.nix
index fbe3d8d..a8cee04 100644
--- a/pkgs/dwmblocks/default.nix
+++ b/pkgs/dwmblocks/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://github.com/LukeSmithXYZ/dwmblocks";
-    rev = "8b313712dc8000ce65b229e3089f429bc9fc8cd9";
-    sha256 = "1a4i4bbmw9f9wljk8g979ypsnr7199wxx8dj1vadcq4k33szgzyj";
+    rev = "6bbb413fd7fb31b052945061305bf9ac87f0f6fd";
+    sha256 = "0h62avawlkbxjkhjsbzp5afrd5jbjjvnzq73nh3p53p1zpjc18wb";
   };
 
   inherit patches;
diff --git a/pkgs/larbs-mail/mailbox-script.nix b/pkgs/larbs-mail/mailbox-script.nix
index 0cc9441..2571a53 100644
--- a/pkgs/larbs-mail/mailbox-script.nix
+++ b/pkgs/larbs-mail/mailbox-script.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "https://github.com/LukeSmithxyz/voidrice";
-    rev = "3936ffe5e2b494e65fc5a44927fe67311c8c51ae";
-    sha256 = "1casynk0fvjfz9jv8hdgi7dpmq26cz6hmsr028w65rj993m33cfx";
+    rev = "b768fc601e9b587aa800cd0656a8eee170bd1c93";
+    sha256 = "1i35n0qfh0llfg1b8la9yj7qsycwlmipgfp6k1yz9r27gjll768z";
   };
 
   installPhase = ''