modified dwm/config.h

1 files changed, 33 insertions, 21 deletions

diff --git a/dwm/config.h b/dwm/config.h
index 151b61a..ce2b3a6 100644
--- a/dwm/config.h
+++ b/dwm/config.h
@@ -239,7 +239,7 @@ static const Key keys[] = {
     { MODKEY,                               XK_m,               spawn,              SHCMD("mpc random on; mpc load entire; mpc play; sleep 1 && mpc volume 50; pkill -RTMIN+23 dwmblocks") },
     { MODKEY | ShiftMask,                   XK_m,               spawn,              SHCMD("mpdmenu && pkill -RTMIN+23 dwmblocks") },
     { MODKEY | ControlMask,                 XK_m,               spawn,              SHCMD("mpc stop; sleep 1 && mpc repeat off && mpc random off && mpc single off && mpc consume off && mpc clear") },
-    { MODKEY | ShiftMask | ControlMask,     XK_m,               spawn,              { .v = (const char *[]){ "delmusic", NULL } } },
+    { MODKEY | ControlMask | ShiftMask,     XK_m,               spawn,              { .v = (const char *[]){ "delmusic", NULL } } },
     { MODKEY,                               XK_p,               spawn,              SHCMD("mpc toggle") },
     { MODKEY | ShiftMask,                   XK_p,               spawn,              SHCMD("mpc pause; sleep 1 && pauseallmpv") },
     { MODKEY | ControlMask,                 XK_p,               spawn,              SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; sleep 1 && kill -39 $(pidof dwmblocks)") },
@@ -255,6 +255,17 @@ static const Key keys[] = {
     { MODKEY | ShiftMask,                   XK_slash,           spawn,              SHCMD("mpc single off; mpc random on; mpc repeat on") },
     { MODKEY | ControlMask,                 XK_slash,           spawn,              SHCMD("mpc repeat off; mpc random off; mpc single off") },
 
+    // FLOATING POSITIONS
+    { MODKEY2 | ControlMask | ShiftMask,    XK_u,               explace,            { .ui = EX_NW } },
+    { MODKEY2 | ControlMask | ShiftMask,    XK_i,               explace,            { .ui = EX_N } },
+    { MODKEY2 | ControlMask | ShiftMask,    XK_o,               explace,            { .ui = EX_NE } },
+    { MODKEY2 | ControlMask | ShiftMask,    XK_j,               explace,            { .ui = EX_W } },
+    { MODKEY2 | ControlMask | ShiftMask,    XK_k,               explace,            { .ui = EX_C } },
+    { MODKEY2 | ControlMask | ShiftMask,    XK_l,               explace,            { .ui = EX_E } },
+    { MODKEY2 | ControlMask | ShiftMask,    XK_m,               explace,            { .ui = EX_SW } },
+    { MODKEY2 | ControlMask | ShiftMask,    XK_comma,           explace,            { .ui = EX_S } },
+    { MODKEY2 | ControlMask | ShiftMask,    XK_period,          explace,            { .ui = EX_SE } },
+
     // FLOATING SIZES
     { MODKEY2 | ControlMask,                XK_h,               exresize,           { .v = (int []){ -25,   0 } } },
     { MODKEY2 | ControlMask,                XK_l,               exresize,           { .v = (int []){  25,   0 } } },
@@ -269,20 +280,20 @@ static const Key keys[] = {
     { MODKEY | ControlMask,                 XK_s,               togglesticky,       {0} },
 	{ MODKEY | ShiftMask,                   XK_h,               layoutscroll,       { .i = -1 } },
 	{ MODKEY | ShiftMask,                   XK_l,               layoutscroll,       { .i = +1 } },
-    { ShiftMask | ControlMask,              XK_grave,           setlayout,          { .v = &layouts[0] } },
-    { ShiftMask | ControlMask,              XK_1,               setlayout,          { .v = &layouts[1] } },
-    { ShiftMask | ControlMask,              XK_2,               setlayout,          { .v = &layouts[2] } },
-    { ShiftMask | ControlMask,              XK_3,               setlayout,          { .v = &layouts[3] } },
-    { ShiftMask | ControlMask,              XK_4,               setlayout,          { .v = &layouts[4] } },
-    { ShiftMask | ControlMask,              XK_5,               setlayout,          { .v = &layouts[5] } },
-    { ShiftMask | ControlMask,              XK_6,               setlayout,          { .v = &layouts[6] } },
-    { ShiftMask | ControlMask,              XK_7,               setlayout,          { .v = &layouts[7] } },
-    { ShiftMask | ControlMask,              XK_8,               setlayout,          { .v = &layouts[8] } },
-    { ShiftMask | ControlMask,              XK_9,               setlayout,          { .v = &layouts[9] } },
-    { ShiftMask | ControlMask,              XK_0,               setlayout,          { .v = &layouts[10] } },
-    { ShiftMask | ControlMask,              XK_minus,           setlayout,          { .v = &layouts[11] } },
-    { ShiftMask | ControlMask,              XK_equal,           setlayout,          { .v = &layouts[12] } },
-    { ShiftMask | ControlMask,              XK_backslash,       setlayout,          { .v = &layouts[13] } },
+    { ControlMask | ShiftMask,              XK_grave,           setlayout,          { .v = &layouts[0] } },
+    { ControlMask | ShiftMask,              XK_1,               setlayout,          { .v = &layouts[1] } },
+    { ControlMask | ShiftMask,              XK_2,               setlayout,          { .v = &layouts[2] } },
+    { ControlMask | ShiftMask,              XK_3,               setlayout,          { .v = &layouts[3] } },
+    { ControlMask | ShiftMask,              XK_4,               setlayout,          { .v = &layouts[4] } },
+    { ControlMask | ShiftMask,              XK_5,               setlayout,          { .v = &layouts[5] } },
+    { ControlMask | ShiftMask,              XK_6,               setlayout,          { .v = &layouts[6] } },
+    { ControlMask | ShiftMask,              XK_7,               setlayout,          { .v = &layouts[7] } },
+    { ControlMask | ShiftMask,              XK_8,               setlayout,          { .v = &layouts[8] } },
+    { ControlMask | ShiftMask,              XK_9,               setlayout,          { .v = &layouts[9] } },
+    { ControlMask | ShiftMask,              XK_0,               setlayout,          { .v = &layouts[10] } },
+    { ControlMask | ShiftMask,              XK_minus,           setlayout,          { .v = &layouts[11] } },
+    { ControlMask | ShiftMask,              XK_equal,           setlayout,          { .v = &layouts[12] } },
+    { ControlMask | ShiftMask,              XK_backslash,       setlayout,          { .v = &layouts[13] } },
 
     // LAYOUT SIZES
     { MODKEY | ShiftMask,                   XK_n,               incnmaster,         { .i = -1 } },
@@ -369,13 +380,13 @@ static const Key keys[] = {
     // SCRIPTS
     { MODKEY,                               XK_b,               spawn,              { .v = (const char *[]){ "bookmarks", "-t", NULL } } },
     { MODKEY | ShiftMask,                   XK_b,               spawn,              { .v = (const char *[]){ "bookmarks", "-o", NULL } } },
-    { MODKEY | ShiftMask | ControlMask,     XK_b,               spawn,              { .v = (const char *[]){ "bookmarks", "-p", NULL } } },
+    { MODKEY | ControlMask | ShiftMask,     XK_b,               spawn,              { .v = (const char *[]){ "bookmarks", "-p", NULL } } },
     { MODKEY | ControlMask,                 XK_b,               togglebar,          {0} },
-    { ShiftMask | ControlMask,              XK_b,               togglebar,          { .i = 1 } },
+    { ControlMask | ShiftMask,              XK_b,               togglebar,          { .i = 1 } },
     { MODKEY2 ,                             XK_b,               spawn,              { .v = (const char *[]){ "bookmarks", "-c", NULL } } },
     { MODKEY2 | ShiftMask,                  XK_b,               spawn,              { .v = (const char *[]){ "bookmarks", "-b", NULL } } },
     { MODKEY2 | ControlMask,                XK_b,               spawn,              { .v = (const char *[]){ "bookmarks", "-s", NULL } } },
-    { MODKEY2 | ShiftMask | ControlMask,    XK_b,               spawn,              { .v = (const char *[]){ "bookmarks", "-v", NULL } } },
+    { MODKEY2 | ControlMask | ShiftMask,    XK_b,               spawn,              { .v = (const char *[]){ "bookmarks", "-v", NULL } } },
     { MODKEY | ShiftMask,                   XK_d,               spawn,              { .v = (const char *[]){ "passmenu", NULL } } },
     { MODKEY | ControlMask,                 XK_d,               spawn,              { .v = (const char *[]){ "passmenu2", NULL } } },
     { MODKEY | ControlMask,                 XK_e,               spawn,              SHCMD("ecrypt; pkill -RTMIN+2 dwmblocks") },
@@ -397,7 +408,7 @@ static const Key keys[] = {
     { MODKEY,                               XK_F5,              xrdb,               { .v = NULL } },
     { MODKEY | ShiftMask,                   XK_F5,              spawn,              { .v = (const char *[]){ "stw", NULL } } },
     { MODKEY | ControlMask,                 XK_F5,              spawn,              { .v = (const char *[]){ "rbackup", NULL } } },
-    { MODKEY | ControlMask | ShiftMask,     XK_F5,              spawn,              { .v = (const char *[]){ "dmenuupgrade", NULL } } },
+    { MODKEY | ControlMask | ShiftMask ,    XK_F5,              spawn,              { .v = (const char *[]){ "dmenuupgrade", NULL } } },
     { MODKEY,                               XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-v", NULL } } },
     { MODKEY | ShiftMask,                   XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-m", NULL } } },
     { MODKEY,                               XK_F7,              spawn,              { .v = (const char *[]){ "transadd", "-l", NULL } } },
@@ -425,8 +436,8 @@ static const Key keys[] = {
     { MODKEY | ShiftMask,                   XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+; kill -39 $(pidof dwmblocks)") },
     { MODKEY | ControlMask,                 XK_minus,           spawn,              SHCMD("pkexec brillo -U 5 -q; kill -43 $(pidof dwmblocks)") },
     { MODKEY | ControlMask,                 XK_equal,           spawn,              SHCMD("pkexec brillo -A 5 -q; kill -43 $(pidof dwmblocks)") },
-    { MODKEY | ShiftMask | ControlMask,     XK_minus,           spawn,              SHCMD("monitorbright -dec 5; kill -42 $(pidof dwmblocks)") },
-    { MODKEY | ShiftMask | ControlMask,     XK_equal,           spawn,              SHCMD("monitorbright -inc 5; kill -42 $(pidof dwmblocks)") },
+    { MODKEY | ControlMask | ShiftMask,     XK_minus,           spawn,              SHCMD("monitorbright -dec 5; kill -42 $(pidof dwmblocks)") },
+    { MODKEY | ControlMask | ShiftMask,     XK_equal,           spawn,              SHCMD("monitorbright -inc 5; kill -42 $(pidof dwmblocks)") },
     { 0,                                    XK_Alt_R,           spawn,              SHCMD("fcitx5-remote -t; kill -44 $(pidof dwmblocks)") },
     { ControlMask,                          XK_F5,              quit,               {1} },
     { ControlMask | ShiftMask,              XK_F5,              spawn,              SHCMD("killall -q dwmblocks; setsid -f dwmblocks") },
@@ -509,6 +520,7 @@ static Command commands[] = {
     { { 0, 0, 0, 0 },           { XK_l, XK_m, XK_l, 0 },            setlayout,              { .v = &layouts[12] } },
     { { 0, 0, 0, 0 },           { XK_l, XK_m, XK_s, 0 },            setlayout,              { .v = &layouts[13] } },
 
+    // FLOATING POSITIONS
     { { 0, 0, 0, 0 },           { XK_f, XK_u, 0, 0 },               explace,                { .ui = EX_NW } },
     { { 0, 0, 0, 0 },           { XK_f, XK_i, 0, 0 },               explace,                { .ui = EX_N } },
     { { 0, 0, 0, 0 },           { XK_f, XK_o, 0, 0 },               explace,                { .ui = EX_NE } },