Clean up

4 files changed, 6 insertions, 36 deletions

diff --git a/platforms/linux/xorg/config.h b/platforms/linux/xorg/config.h
index dd7c1a2..497c3b5 100644
--- a/platforms/linux/xorg/config.h
+++ b/platforms/linux/xorg/config.h
@@ -70,10 +70,10 @@ static const int resizehints = 1;    /* 1 means respect size hints in tiled resi
 #include "vanitygaps.c"
 static const Layout layouts[] = {
 	/* symbol     arrange function */
+	{ "[@]",	spiral },		/* Fibonacci spiral */
  	{ "[]=",	tile },			/* Default: Master on left, slaves on right */
 	{ "TTT",	bstack },		/* Master on top, slaves on bottom */
 
-	{ "[@]",	spiral },		/* Fibonacci spiral */
 	{ "[\\]",	dwindle },		/* Decreasing in size right and leftward */
 
 	{ "H[]",	deck },			/* Master on left, slaves in monocle-like mode on right */
@@ -147,9 +147,9 @@ static Key keys[] = {
 	{ MODKEY|ShiftMask,		XK_e,		spawn,		SHCMD(TERMINAL " -e abook -C ~/.config/abook/abookrc --datafile ~/.config/abook/addressbook") },
 	{ MODKEY,			XK_r,		spawn,		SHCMD(TERMINAL " -e lf") },
 	{ MODKEY|ShiftMask,		XK_r,		spawn,		SHCMD(TERMINAL " -e htop") },
-	{ MODKEY,			XK_t,		setlayout,	{.v = &layouts[0]} }, /* tile */
-	{ MODKEY|ShiftMask,		XK_t,		setlayout,	{.v = &layouts[1]} }, /* bstack */
-	{ MODKEY,			XK_y,		setlayout,	{.v = &layouts[2]} }, /* spiral */
+	{ MODKEY,			XK_t,		setlayout,	{.v = &layouts[1]} }, /* tile */
+	{ MODKEY|ShiftMask,		XK_t,		setlayout,	{.v = &layouts[2]} }, /* bstack */
+	{ MODKEY,			XK_y,		setlayout,	{.v = &layouts[0]} }, /* spiral */
 	{ MODKEY|ShiftMask,		XK_y,		setlayout,	{.v = &layouts[3]} }, /* dwindle */
 	{ MODKEY,			XK_u,		setlayout,	{.v = &layouts[4]} }, /* deck */
 	{ MODKEY|ShiftMask,		XK_u,		setlayout,	{.v = &layouts[5]} }, /* monocle */
@@ -221,7 +221,7 @@ static Key keys[] = {
 	{ MODKEY,			XK_F4,		spawn,		SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)") },
 	{ MODKEY,			XK_F5,		xrdb,		{.v = NULL } },
 	{ MODKEY,			XK_F6,		spawn,		SHCMD("torwrap") },
-	{ MODKEY,			XK_F7,		spawn,		SHCMD("td-toggle") },
+	{ MODKEY,			XK_F7,		spawn,		SHCMD("newsup") },
 	{ MODKEY,			XK_F8,		spawn,		SHCMD("mw -Y") },
 	{ MODKEY,			XK_F9,		spawn,		SHCMD("dmenumount") },
 	{ MODKEY,			XK_F10,		spawn,		SHCMD("dmenuumount") },
diff --git a/platforms/linux/xorg/default.nix b/platforms/linux/xorg/default.nix
index 987558d..13abb32 100644
--- a/platforms/linux/xorg/default.nix
+++ b/platforms/linux/xorg/default.nix
@@ -10,7 +10,6 @@ let
     patches = [
       ./dwm-systray.diff
       ./dwm-center.diff
-      ./dwm-apps.diff
       ./dwm-autostart.diff
       # ./dwm-rounded.diff - Resize dont work
     ];
diff --git a/platforms/linux/xorg/dwm-apps.diff b/platforms/linux/xorg/dwm-apps.diff
deleted file mode 100644
index b5d7474..0000000
--- a/platforms/linux/xorg/dwm-apps.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/config.h b/config.h
-index 780550a..e8d3805 100644
---- a/config.h
-+++ b/config.h
-@@ -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[]  = { TERMINAL, NULL };
- 
- #include <X11/XF86keysym.h>
-@@ -158,7 +159,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} },
diff --git a/programs/newsboat/urls b/programs/newsboat/urls
index 15af148..be83b34 100644
--- a/programs/newsboat/urls
+++ b/programs/newsboat/urls
@@ -12,6 +12,7 @@ personal "~## PERSONAL ##"
 https://www.poznan.pl/mim/feeds/rss.xml "~Poznań"
 #https://tvn24.pl/najwazniejsze.xml "~Polska"
 https://portal.mozz.us/gemini/cetacean.club/journal/atom.xml "~Christine Dodrill journal"
+https://feeds.simplecast.com/cgGduVSh "~Wayward Guide"
 
 ## Tech
 tech "~## TECH ##"