pushing ultraminimalistic configHEADmaster

2 files changed, 39 insertions, 99 deletions

diff --git a/config.def.h b/config.def.h
index 0cded32..385bfa9 100644
--- a/config.def.h
+++ b/config.def.h
@@ -2,36 +2,25 @@ static const unsigned int borderpx  = 2;
 static const unsigned int snap      = 32;
 static const int showbar            = 1;
 static const int topbar             = 1;
-//static const char *barlayout        = "sn|lt";
-static const char *barlayout        = "tln|s";
-static const int user_bh            = 30;
-static const char *fonts[]          = { "Noto Sans CJK JP:size=14" };
+static const char *barlayout        = "sn|t";
+static const int user_bh            = 28;
+static const char *fonts[]          = { "Noto Sans:size=14" };
 static const unsigned int gappih    = 12;       /* horiz inner gap between windows */
 static const unsigned int gappiv    = 8;       /* vert inner gap between windows */
 static const unsigned int gappoh    = 12;       /* horiz outer gap between windows and screen edge */
 static const unsigned int gappov    = 8;       /* vert outer gap between windows and screen edge */
-static       int smartgaps          = 0;        /* 1 means no outer gap when there is only one window */
+static       int smartgaps          = 1;        /* 1 means no outer gap when there is only one window */
 static const char *colors[][4]      = {
-  /*               fg         bg         border     float */
-	[SchemeNorm] = { "#bbbbbb", "#282c34", "#282c34", "#ffa152" },
-	[SchemeSel]  = { "#232627", "#9188f7", "#c678dd", "#05fa88" },
+        /*               fg         bg         border     float */
+	[SchemeNorm] = { "#CDD6F4", "#181825", "#313244", "#FAB387" },
+	[SchemeSel]  = { "#181825", "#CBA6F7", "#CBA6F7", "#A6E3A1" },
 };
 
-/* tagging */
-// static const char *tags[] = { "一", "二", "三", "四", "五", "六", "七", "八", "九", "十" };
-static const char *tags[] = { "󰮫", "󰈹", "", "", "󰣀", "", "", "", "", "" };
+static const char *tags[] = { "V", "W", "X", "Y", "Z" };
 
 static const Rule rules[] = {
-	/* xprop(1):
-	 *	WM_CLASS(STRING) = instance, class
-	 *	WM_NAME(STRING) = title
-	 */
 	/* class         instance    title       tags mask     isfloating   monitor */
 	{ "librewolf",   NULL,       NULL,       1 << 1,       0,           -1 },
-	{ "kdenlive",    NULL,       NULL,       1 << 5,       0,           -1 },
-	{ "Gimp",        NULL,       NULL,       1 << 6,       0,           -1 },
-	{ "thunderbird", NULL,       NULL,       1 << 8,       0,           -1 },
-	{ "discord",     NULL,       NULL,       1 << 9,       0,           -1 },
 };
 
 /* layout(s) */
@@ -44,22 +33,9 @@ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen win
 #include "vanitygaps.c"
 
 static const Layout layouts[] = {
-	/* symbol     arrange function */
-	{ "tile",      tile },    /* first entry is default */
-	{ "[M]",      monocle },
-	{ "[@]",      spiral },
-	{ "[\\]",     dwindle },
-	{ "H[]",      deck },
-	{ "TTT",      bstack },
-	{ "===",      bstackhoriz },
-	{ "HHH",      grid },
-	{ "###",      nrowgrid },
-	{ "---",      horizgrid },
-	{ ":::",      gaplessgrid },
-	{ "|M|",      centeredmaster },
-	{ ">M>",      centeredfloatingmaster },
-	{ "float",      NULL },    /* no layout function means floating behavior */
-	{ NULL,       NULL },
+	{ "TILE",     tile },
+	{ "SPIRAL",   spiral },
+	{ "GRID",     grid },
 };
 
 /* key definitions */
@@ -69,7 +45,7 @@ static const Layout layouts[] = {
 	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
 	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
 	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} }, \
-  { Mod1Mask|ShiftMask,           KEY,      swaptags,       {.ui = 1 << TAG} },
+        { Mod1Mask|ShiftMask,           KEY,      swaptags,       {.ui = 1 << TAG} },
 
 /* helper for spawning shell commands in the pre dwm-5.0 fashion */
 #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
@@ -77,7 +53,7 @@ static const Layout layouts[] = {
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 static const char *dmenucmd[] = { "dmenu_run", NULL };
-static const char *termcmd[]  = { "open_terminal", NULL };
+static const char *termcmd[]  = { "st", NULL };
 
 void shiftAndViewLeft(const Arg *arg) {
   tagtoleft(arg);
@@ -90,80 +66,44 @@ void shiftAndViewRight(const Arg *arg) {
 }
 
 static const Key keys[] = {
-  /* tag keys (for all the tag functions defined in TAGKEYS macro) */
+        /* tag keys (for all the tag functions defined in TAGKEYS macro) */
 	TAGKEYS(                           XK_1,                            0)
 	TAGKEYS(                           XK_2,                            1)
 	TAGKEYS(                           XK_3,                            2)
-	TAGKEYS(                           XK_4,                            3)
-	TAGKEYS(                           XK_5,                            4)
-	TAGKEYS(                           XK_6,                            5)
-	TAGKEYS(                           XK_7,                            6)
-	TAGKEYS(                           XK_8,                            7)
-	TAGKEYS(                           XK_9,                            8)
-	TAGKEYS(                           XK_0,                            9)
-
-	/* modifier                        key           function           argument */
-  /* basic WM functions */
+	TAGKEYS(                           XK_9,                            3)
+	TAGKEYS(                           XK_0,                            4)
+
+        /* basic WM functions */
 	{ MODKEY,                          XK_backslash, togglebar,         {0} },
-	{ MODKEY|ShiftMask,                XK_c,         killclient,        {0} },
-	{ MODKEY|ShiftMask,                XK_q,         quit,              {0} }, // TODO: add confirmation or something
-
-  /* functions for "all tags" TODO: map them somewhere, they seem useful */
-	// { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
-	// { MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
-
-  /* viewing and moving to adjacent tags */
-  { MODKEY,                          XK_h,         viewtoleft,        {0} },
-  { MODKEY,                          XK_l,         viewtoright,       {0} },
-  { MODKEY|ShiftMask,                XK_h,         shiftAndViewLeft,  {0} },
-  { MODKEY|ShiftMask,                XK_l,         shiftAndViewRight, {0} },
-
-  /* multi monitor stuff */
-  /* focusing monitors */
-	{ MODKEY|ControlMask,              XK_h,         focusmon,          {.i = -1 } },
-	{ MODKEY|ControlMask,              XK_l,         focusmon,          {.i = +1 } },
-  /* moving windows to monitors */
-	{ MODKEY|ControlMask|ShiftMask,    XK_h,         tagmon,            {.i = -1 } },
-	{ MODKEY|ControlMask|ShiftMask,    XK_l,         tagmon,            {.i = +1 } },
-
-  /* move floating windows from the keyboard */
-	{ MODKEY|ControlMask,		           XK_Up,	       movekeyboard_y, 	  {.i = -1}},
-	{ MODKEY|ControlMask,		           XK_Down,	     movekeyboard_y, 	  {.i = 1}},
-	{ MODKEY|ControlMask,		           XK_Left,	     movekeyboard_x, 	  {.i = -1}},
-  { MODKEY|ControlMask,		           XK_Right,	   movekeyboard_x, 	  {.i = 1}},
-  
-  /* layouts */
-  { MODKEY,                          XK_equal,     cyclelayout,       {.i = -1 } },
-  { MODKEY,                          XK_plus,      togglefloating,    {0} },
-  // { MODKEY|ControlMask,             XK_period,    cyclelayout,       {.i = +1 } },
+	{ MODKEY,                          XK_w,         killclient,        {0} },
+	{ MODKEY|ShiftMask,                XK_q,         quit,              {0} },
+
+        /* launch programs and shit */
+	{ MODKEY,                          XK_Return,    spawn,             {.v = termcmd} },
+	{ MODKEY|ShiftMask,                XK_s,         spawn,             {.v = dmenucmd} },
+
+        /* viewing and moving to adjacent tags */
+        { Mod1Mask,                        XK_h,         viewtoleft,        {0} },
+        { Mod1Mask,                        XK_l,         viewtoright,       {0} },
+        { Mod1Mask|ShiftMask,              XK_h,         shiftAndViewLeft,  {0} },
+        { Mod1Mask|ShiftMask,              XK_l,         shiftAndViewRight, {0} },
+
+        /* layouts */
+        { MODKEY,                          XK_equal,     cyclelayout,       {.i = -1 } },
+        { MODKEY,                          XK_plus,      togglefloating,    {0} },
+        // { MODKEY|ControlMask,             XK_period,    cyclelayout,       {.i = +1 } },
 	// { MODKEY,                         XK_t,         setlayout,         {.v = &layouts[0]} },
 
-  /* tiling window management */
+        /* tiling window management */
 	{ MODKEY,                          XK_j,         focusstack,        {.i = +1 } },
+	{ MODKEY,                          XK_Tab,       focusstack,        {.i = +1 } },
 	{ MODKEY,                          XK_k,         focusstack,        {.i = -1 } },
-	{ MODKEY|ShiftMask,                XK_Return,    zoom,              {0} },
-	// { MODKEY,                          XK_r,         incnmaster,        {.i = +1 } },
-	// { MODKEY|ShiftMask,                XK_r,         incnmaster,        {.i = -1 } },
-	// { MODKEY,                          XK_question,  setmfact,          {.f = -0.05} },
-  // { MODKEY,                          XK_slash,     setmfact,          {.f = +0.05} },
-	// { MODKEY,                          XK_Tab,       view,              {0} },
+	{ MODKEY|ShiftMask,                XK_Tab,       focusstack,        {.i = -1 } },
+	{ MODKEY|ShiftMask,                XK_f,         zoom,              {0} },
 };
 
-/* button definitions */
-/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
 static const Button buttons[] = {
-	/* click                event mask      button          function        argument */
-	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
-	{ ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
-	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
-	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
 	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
 	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
 	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
-	{ ClkTagBar,            0,              Button1,        view,           {0} },
-	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
-	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
-	{ ClkTagBar,            0,              Button4,        viewtoleft,     {0} },
-	{ ClkTagBar,            0,              Button5,        viewtoright,    {0} },
 };
diff --git a/drw.o b/drw.o
index 9437a24..9fc8711 100644
--- a/drw.o
+++ b/drw.o