rm binary, reset tagging, changing colors

diff --git a/TuCLS.7 b/TuCLS.7
index 8530de3b670552dd73af2df1b3e6d709fb93d5ae..2c9c4bb3a5abb12871d14234d0499ddc3478731e 100644 (file)
--- a/TuCLS.7
+++ b/TuCLS.7
@@ -53,7 +53,8 @@ They are also placed in different tags which can be navigated like alternate des
 .MR dwm 1
 man page)
 .TP
-.B Navigation
+.B Nav
+NB move/resize windows with 'Mod + left/right click'
 .TS
 tab(|) nospaces;
 l l.
@@ -68,10 +69,36 @@ Mod + s|toggle a 'sticky' window that follows you through tags
 Mod + b|toggle status bar
 Mod + v|jump to top window
 .TE
-.SM N.B. move/resize windows with 'Mod + left/right click'
 .
 .TP
 .B Layouts
+.TS
+tab(|) nospaces;
+l l.
+Mod + t|tiling \(en default|[tlng]
+Mod + T|horizontal tiling|[htlng]
+Mod + f|fullscreen selected window|
+Mod + F|floating|[fltg]
+Mod + y|spiral|[sprl]
+Mod + Y|dwindle|[dwdl]
+Mod + u|main on left, others in deck|[ldck]
+Mod + U|deck|[sdck]
+Mod + i|center main|[cntr]
+Mod + I|center, floating main|[fcntr]
+Mod + o/O|decrease/increase main window count|
+.TE
 .
+.TP
+.B Tags
+Tags function like workspaces or alternate desktops.
+.TS
+tab(|) nospaces;
+l l.
+Mod + 1-9|switch tags
+Mod + Shift + 1-9|send current window to a tag
+Mod + Tab|switch to previous tag
+Mod + Left/Right|switch displays
+Mod + Shift + Left/Right|send current window to another display
+.TE
 .SH Author
 Tucker Johnson (tucker@newer.systems, https://newer.systems)

diff --git a/config.h b/config.h
index e2decb447c0bd190a3c6b3423819846ad42464ba..80da2c73a1b9cd8f8bcd8b10eedac020c6c9974d 100644 (file)
--- a/config.h
+++ b/config.h
@@ -21,8 +21,8 @@ static char normbgcolor[]           = "#222222";
 static char normbordercolor[]       = "#444444";
 static char normfgcolor[]           = "#bbbbbb";
 static char selfgcolor[]            = "#eeeeee";
-static char selbordercolor[]        = "#888888";
-static char selbgcolor[]            = "#005577";
+static char selbordercolor[]        = "#cccccc";
+static char selbgcolor[]            = "#555555";
 static char *colors[][3] = {
        /*               fg           bg           border   */
        [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
@@ -68,19 +68,19 @@ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen win
 #include "vanitygaps.c"
 static const Layout layouts[] = {
        /* symbol     arrange function */
-       { "tl",     tile },                     /* Default: Master on left, slaves on right */
-       { "bst",        bstack },               /* Master on top, slaves on bottom */
+       { "tlng",     tile },                   /* Default: Master on left, slaves on right */
+       { "htlng",      bstack },               /* Master on top, slaves on bottom */
 
-       { "spr",        spiral },               /* Fibonacci spiral */
+       { "sprl",       spiral },               /* Fibonacci spiral */
        { "dwdl",       dwindle },              /* Decreasing in size right and leftward */
 
-       { "dck",        deck },                 /* Master on left, slaves in monocle-like mode on right */
-       { "mcl",        monocle },              /* All windows on top of eachother */
+       { "ldck",       deck },                 /* Master on left, slaves in monocle-like mode on right */
+       { "sdck",       monocle },              /* All windows on top of eachother */
 
-       { "cen",        centeredmaster },               /* Master in middle, slaves on sides */
-       { "cfm",        centeredfloatingmaster },       /* Same but master floats */
+       { "cntr",       centeredmaster },               /* Master in middle, slaves on sides */
+       { "fcntr",      centeredfloatingmaster },       /* Same but master floats */
 
-       { "flt",        NULL },                 /* no layout function means floating behavior */
+       { "fltg",       NULL },                 /* no layout function means floating behavior */
        { NULL,         NULL },
 };
 
@@ -141,51 +141,51 @@ static const Key keys[] = {
        /* { MODKEY|ShiftMask,          XK_Escape,      spawn,  SHCMD("") }, */
        { MODKEY,                       XK_grave,       spawn,  {.v = (const char*[]){ "dmenuunicode", NULL } } },
        /* { MODKEY|ShiftMask,          XK_grave,       togglescratch,  SHCMD("") }, */
-       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)
-       { MODKEY,                       XK_0,           view,           {.ui = ~0 } },
-       { MODKEY|ShiftMask,             XK_0,           tag,            {.ui = ~0 } },
-       { MODKEY,                       XK_minus,       spawn,          SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -44 $(pidof dwmblocks)") },
-       { MODKEY|ShiftMask,             XK_minus,       spawn,          SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%-; kill -44 $(pidof dwmblocks)") },
-       { MODKEY,                       XK_equal,       spawn,          SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -44 $(pidof dwmblocks)") },
-       { MODKEY|ShiftMask,             XK_equal,       spawn,          SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+; kill -44 $(pidof dwmblocks)") },
-       { MODKEY,                       XK_BackSpace,   spawn,          {.v = (const char*[]){ "sysact", NULL } } },
+       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)
+       { MODKEY,                           XK_0,                   view,               {.ui = ~0 } },
+       { MODKEY|ShiftMask,             XK_0,               tag,                {.ui = ~0 } },
+       { MODKEY,                           XK_minus,       spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -44 $(pidof dwmblocks)") },
+       { MODKEY|ShiftMask,             XK_minus,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%-; kill -44 $(pidof dwmblocks)") },
+       { MODKEY,                           XK_equal,       spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -44 $(pidof dwmblocks)") },
+       { MODKEY|ShiftMask,             XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+; kill -44 $(pidof dwmblocks)") },
+       { MODKEY,                           XK_BackSpace,       spawn,          {.v = (const char*[]){ "sysact", NULL } } },
        { MODKEY|ShiftMask,             XK_BackSpace,   spawn,          {.v = (const char*[]){ "sysact", NULL } } },
 
-       { MODKEY,                       XK_Tab,         view,           {0} },
+       { MODKEY,                           XK_Tab,                 view,                  {0} },
        /* { MODKEY|ShiftMask,          XK_Tab,         spawn,          SHCMD("") }, */
-       { MODKEY,                       XK_q,           killclient,     {0} },
-       { MODKEY|ShiftMask,             XK_q,           spawn,          {.v = (const char*[]){ "sysact", NULL } } },
-       { MODKEY,                       XK_w,           spawn,          {.v = (const char*[]){ BROWSER, NULL } } },
-       { MODKEY|ShiftMask,             XK_w,           spawn,          {.v = (const char*[]){ TERMINAL, "-e", "sudo", "nmtui", NULL } } },
-       { MODKEY,                       XK_e,           spawn,          SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
-       { MODKEY|ShiftMask,             XK_e,           spawn,          SHCMD(TERMINAL " -e abook -C ~/.config/abook/abookrc --datafile ~/.config/abook/addressbook") },
-       { MODKEY,                       XK_r,           spawn,          {.v = (const char*[]){ TERMINAL, "-e", "lfub", NULL } } },
-       { MODKEY|ShiftMask,             XK_r,           spawn,          {.v = (const char*[]){ TERMINAL, "-e", "htop", NULL } } },
-       { 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|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 */
-       { MODKEY,                       XK_i,           setlayout,      {.v = &layouts[6]} }, /* centeredmaster */
-       { MODKEY|ShiftMask,             XK_i,           setlayout,      {.v = &layouts[7]} }, /* centeredfloatingmaster */
-       { MODKEY,                       XK_o,           incnmaster,     {.i = +1 } },
-       { MODKEY|ShiftMask,             XK_o,           incnmaster,     {.i = -1 } },
-       { MODKEY,                       XK_p,                   spawn,          {.v = (const char*[]){ "mpc", "toggle", NULL } } },
+       { MODKEY,                           XK_q,                   killclient, {0} },
+       { MODKEY|ShiftMask,             XK_q,               spawn,              {.v = (const char*[]){ "sysact", NULL } } },
+       { MODKEY,                           XK_w,                   spawn,      {.v = (const char*[]){ BROWSER, NULL } } },
+       { MODKEY|ShiftMask,             XK_w,               spawn,              {.v = (const char*[]){ TERMINAL, "-e", "sudo", "nmtui", NULL } } },
+       { MODKEY,                           XK_e,                   spawn,              SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+       { MODKEY|ShiftMask,             XK_e,               spawn,              SHCMD(TERMINAL " -e abook -C ~/.config/abook/abookrc --datafile ~/.config/abook/addressbook") },
+       { MODKEY,                           XK_r,                   spawn,              {.v = (const char*[]){ TERMINAL, "-e", "lfub", NULL } } },
+       { MODKEY|ShiftMask,             XK_r,               spawn,              {.v = (const char*[]){ TERMINAL, "-e", "htop", NULL } } },
+       { 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|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 */
+       { MODKEY,                           XK_i,                   setlayout,  {.v = &layouts[6]} }, /* centeredmaster */
+       { MODKEY|ShiftMask,             XK_i,               setlayout,  {.v = &layouts[7]} }, /* centeredfloatingmaster */
+       { MODKEY,                           XK_o,                   incnmaster, {.i = +1 } },
+       { MODKEY|ShiftMask,             XK_o,               incnmaster, {.i = -1 } },
+       { MODKEY,                           XK_p,                       spawn,          {.v = (const char*[]){ "mpc", "toggle", NULL } } },
        { MODKEY|ShiftMask,             XK_p,                   spawn,          SHCMD("mpc pause; pauseallmpv") },
-       { MODKEY,                       XK_bracketleft,         spawn,          {.v = (const char*[]){ "mpc", "seek", "-10", NULL } } },
-       { MODKEY|ShiftMask,             XK_bracketleft,         spawn,          {.v = (const char*[]){ "mpc", "seek", "-60", NULL } } },
-       { MODKEY,                       XK_bracketright,        spawn,          {.v = (const char*[]){ "mpc", "seek", "+10", NULL } } },
-       { MODKEY|ShiftMask,             XK_bracketright,        spawn,          {.v = (const char*[]){ "mpc", "seek", "+60", NULL } } },
-       { MODKEY,                       XK_backslash,           view,           {0} },
+       { MODKEY,                           XK_bracketleft,     spawn,          {.v = (const char*[]){ "mpc", "seek", "-10", NULL } } },
+       { MODKEY|ShiftMask,             XK_bracketleft, spawn,          {.v = (const char*[]){ "mpc", "seek", "-60", NULL } } },
+       { MODKEY,                           XK_bracketright,spawn,              {.v = (const char*[]){ "mpc", "seek", "+10", NULL } } },
+       { MODKEY|ShiftMask,             XK_bracketright,spawn,          {.v = (const char*[]){ "mpc", "seek", "+60", NULL } } },
+       { MODKEY,                           XK_backslash,       view,           {0} },
        /* { MODKEY|ShiftMask,          XK_backslash,           spawn,          SHCMD("") }, */
 
        { MODKEY,                       XK_a,           togglegaps,     {0} },
@@ -197,12 +197,12 @@ static const Key keys[] = {
        { MODKEY,                       XK_f,           togglefullscr,  {0} },
        { MODKEY|ShiftMask,             XK_f,           setlayout,      {.v = &layouts[8]} },
        { MODKEY,                       XK_g,           shiftview,      { .i = -1 } },
-       { MODKEY|ShiftMask,             XK_g,           shifttag,       { .i = -1 } },
+       /* { MODKEY|ShiftMask,          XK_g,           shifttag,       { .i = -1 } }, */
        { 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|ShiftMask,             XK_semicolon,   shifttag,       { .i = 1 } },
+       /* { MODKEY,                    XK_semicolon,   shiftview,      { .i = 1 } }, */
+       /*{ MODKEY|ShiftMask,           XK_semicolon,   shifttag,       { .i = 1 } },*/
        { MODKEY,                       XK_apostrophe,  togglescratch,  {.ui = 1} },
        /* { MODKEY|ShiftMask,          XK_apostrophe,  spawn,          SHCMD("") }, */
        { MODKEY|ShiftMask,             XK_apostrophe,  togglesmartgaps,        {0} },

diff --git a/dwm b/dwm
deleted file mode 100755 (executable)
index b7697b8..0000000
Binary files a/dwm and /dev/null differ

diff --git a/dwm.o b/dwm.o
index a97391f980912692141289caf1aa4ae97fd56470..99c9ba7d5cf2ef241bbb4c3aba14d10133bf5ec7 100644 (file)
Binary files a/dwm.o and b/dwm.o differ