Updates dwm keybinding and slock

1 files changed, 30 insertions, 28 deletions

diff --git a/dwm/config.h b/dwm/config.h
index 4f431b9..45cb94a 100644
--- a/dwm/config.h
+++ b/dwm/config.h
@@ -218,42 +218,43 @@ 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; pkill -RTMIN+11 dwmblocks") },
 
+    // FLOATING SIZES
+    { MODKEY2 | ControlMask,                XK_h,               exresize,           { .v = (int []){ -25,   0 } } },
+    { MODKEY2 | ControlMask,                XK_l,               exresize,           { .v = (int []){  25,   0 } } },
+    { MODKEY2 | ControlMask,                XK_j,               exresize,           { .v = (int []){   0,  25 } } },
+    { MODKEY2 | ControlMask,                XK_k,               exresize,           { .v = (int []){   0, -25 } } },
+    { MODKEY2 | ControlMask,                XK_comma,           exresize,           { .v = (int []){ -25, -25 } } },
+    { MODKEY2 | ControlMask,                XK_period,          exresize,           { .v = (int []){  25,  25 } } },
+
     // LAYOUT SIZES
     { MODKEY | ShiftMask,                   XK_n,               incnmaster,         { .i = -1 } },
     { MODKEY | ControlMask,                 XK_n,               incnmaster,         { .i = +1 } },
     { MODKEY,                               XK_f,               togglefullscr,      {0} },
+    { MODKEY | ControlMask,                 XK_f,               togglefloating,     {0} },
     { MODKEY,                               XK_h,               setmfact,           { .f = -0.05 } },
     { MODKEY,                               XK_l,               setmfact,           { .f = +0.05 } },
     { MODKEY,                               XK_s,               togglesticky,       {0} },
     { MODKEY,                               XK_space,           zoom,               {0} },
     { MODKEY | ControlMask,                 XK_j,               setcfact,           { .f = -0.25 } },
     { MODKEY | ControlMask,                 XK_k,               setcfact,           { .f = +0.25 } },
-    { MODKEY | ControlMask,                 XK_y,               setcfact,           { .f = 0.00 } },
+    { MODKEY | ControlMask,                 XK_l,               setcfact,           { .f = 0.00 } },
     { MODKEY | ShiftMask,                   XK_c,               incrgaps,           { .i = -5 } },
     { MODKEY | ControlMask,                 XK_c,               incrgaps,           { .i = +5 } },
     { MODKEY | ShiftMask,                   XK_i,               incrigaps,          { .i = -5 } },
     { MODKEY | ControlMask,                 XK_i,               incrigaps,          { .i = +5 } },
     { MODKEY | ShiftMask,                   XK_o,               incrogaps,          { .i = -5 } },
     { MODKEY | ControlMask,                 XK_o,               incrogaps,          { .i = +5 } },
-    { MODKEY | ShiftMask,                   XK_h,               incrihgaps,         { .i = -5 } },
-    { MODKEY | ControlMask,                 XK_h,               incrihgaps,         { .i = +5 } },
-    { MODKEY | ShiftMask,                   XK_g,               incrivgaps,         { .i = -5 } },
-    { MODKEY | ControlMask,                 XK_g,               incrivgaps,         { .i = +5 } },
-    { MODKEY | ShiftMask,                   XK_b,               incrohgaps,         { .i = -5 } },
-    { MODKEY | ControlMask,                 XK_b,               incrohgaps,         { .i = +5 } },
-    { MODKEY | ShiftMask,                   XK_v,               incrovgaps,         { .i = -5 } },
-    { MODKEY | ControlMask,                 XK_v,               incrovgaps,         { .i = +5 } },
-    { MODKEY | ShiftMask,                   XK_t,               togglegaps,         {0} },
-    { MODKEY | ControlMask,                 XK_t,               defaultgaps,        {0} },
+    { MODKEY | ShiftMask,                   XK_y,               incrihgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_y,               incrihgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_t,               incrivgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_t,               incrivgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_u,               incrohgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_u,               incrohgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_r,               incrovgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_r,               incrovgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_g,               defaultgaps,        {0} },
+    { MODKEY | ControlMask,                 XK_g,               togglegaps,         {0} },
  
-    // FLOATING SIZES
-    { MODKEY2 | ControlMask,                XK_h,               exresize,           { .v = (int []){ -25,   0 } } },
-    { MODKEY2 | ControlMask,                XK_l,               exresize,           { .v = (int []){  25,   0 } } },
-    { MODKEY2 | ControlMask,                XK_j,               exresize,           { .v = (int []){   0,  25 } } },
-    { MODKEY2 | ControlMask,                XK_k,               exresize,           { .v = (int []){   0, -25 } } },
-    { MODKEY2 | ControlMask,                XK_comma,           exresize,           { .v = (int []){ -25, -25 } } },
-    { MODKEY2 | ControlMask,                XK_period,          exresize,           { .v = (int []){  25,  25 } } },
-
     // MEDIA CONTROLS
     { 0, XF86XK_Battery,                    spawn, SHCMD("pkill -RTMIN+3 dwmblocks") },
     { 0, XF86XK_WWW,                        spawn, { .v = (const char *[]){ BROWSER, NULL } } },
@@ -290,11 +291,12 @@ static const Key keys[] = {
     // PROGRAMS
     { MODKEY,                               XK_d,               spawn,              { .v = (const char *[]){ "dmenu_run", NULL } } },
     { MODKEY,                               XK_e,               spawn,              SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+    { MODKEY,                               XK_g,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
     { MODKEY,                               XK_n,               spawn,              SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
-    { 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_r,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
     { MODKEY,                               XK_t,               spawn,              { .v = (const char *[]){ "torwrap", NULL } } },
     { MODKEY,                               XK_w,               spawn,              { .v = (const char *[]){ BROWSER, NULL } } },
+    { MODKEY | ControlMask,                 XK_w,               spawn,              { .v = (const char *[]){ "pkill", "-f", BROWSER, NULL } } },
     { MODKEY,                               XK_grave,           togglescratch,      { .ui = 1 } }, /* calculator */
     { MODKEY | ShiftMask,                   XK_grave,           spawn,              { .v = (const char *[]){ "dmenuunicode", NULL } } },
     { MODKEY,                               XK_Return,          spawn,              { .v = termcmd } },
@@ -307,6 +309,7 @@ static const Key keys[] = {
     { MODKEY | ControlMask,                 XK_d,               spawn,              { .v = (const char *[]){ "passmenu2", NULL } } },
     { MODKEY | ControlMask,                 XK_e,               spawn,              { .v = (const char *[]){ "fecrypt", NULL } } },
     { MODKEY,                               XK_v,               spawn,              { .v = (const char *[]){ "mpvplay", NULL } } },
+    { MODKEY | ControlMask,                 XK_v,               spawn,              { .v = (const char *[]){ "ovpn", NULL } } },
     { MODKEY,                               XK_Insert,          spawn,              SHCMD("xdotool type $(grep -v '^#' ~/.local/share/thesiah/snippets | dmenu -i -l 50 | cut -d' ' -f1)") },
     { 0,                                    XK_Print,           spawn,              SHCMD("maim | tee ~/Pictures/screenshot-$(date '+%y%m%d-%H%M-%S').png | xclip -selection clipboard") },
     { ShiftMask,                            XK_Print,           spawn,              { .v = (const char *[]){ "maimpick", NULL } } },
@@ -314,7 +317,7 @@ static const Key keys[] = {
     { MODKEY,                               XK_Delete,          spawn,              { .v = (const char *[]){ "dmenurecord", "kill", NULL } } },
     { MODKEY,                               XK_Scroll_Lock,     spawn,              SHCMD("killall screenkey || screenkey -t 3 -p fixed -s small -g 20%x5%+40%-5% --key-mode keysyms --bak-mode normal --mods-mode normal -f ttf-font-awesome --opacity 0.5 &") },
     { MODKEY,                               XK_F1,              spawn,              SHCMD("groff -mom /usr/local/share/dwm/thesiah.mom -Tpdf | zathura -") },
-    { MODKEY | ShiftMask,                   XK_F1,              spawn,              SHCMD("nsxiv ${XDG_PICTURES_DIR:-$HOME/Pictures}/resources") },
+    { MODKEY | ShiftMask,                   XK_F1,              spawn,              SHCMD("nsxiv ${XDG_PICTURES_DIR:-${HOME}/Pictures}/resources") },
     { MODKEY | ControlMask,                 XK_F1,              spawn,              { .v = (const char *[]){ TERMINAL, "-e", "dman", NULL } } },
     { MODKEY,                               XK_F2,              spawn,              { .v = (const char *[]){ "tutorialvids", NULL } } },
     { MODKEY,                               XK_F3,              spawn,              { .v = (const char *[]){ "displayselect", NULL } } },
@@ -335,7 +338,6 @@ static const Key keys[] = {
     { MODKEY | ShiftMask,                   XK_F12,             spawn,              { .v = (const char *[]){ "fcitx5-configtool", NULL } } },
 
     // SYSTEMS
-    { MODKEY | ControlMask,                 XK_f,               spawn,              { .v = (const char *[]){ "pkill", "-f", BROWSER, NULL } } },
     { MODKEY | ControlMask,                 XK_k,               spawn,              { .v = (const char *[]){ "pkill", "-f", "kakaotalk", NULL } } },
     { MODKEY,                               XK_q,               killclient,         {0} },
     { MODKEY | ShiftMask,                   XK_q,               killclient,         { .ui = 1 } },
@@ -453,7 +455,7 @@ static Command commands[] = {
     { { 0, 0, 0, 0 },                   { XK_f, XK_s, XK_d, XK_m }, togglemaximize,         { .i = -1 } },
 
     // PROGRAMS
-    { { 0, 0, 0, 0 },                   { XK_a, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e abook -C ${XDG_CONFIG_HOME:-$HOME/.config}/abook/abookrc --datafile ${XDG_CONFIG_HOME:-$HOME/.config}/abook/addressbook") },
+    { { 0, 0, 0, 0 },                   { XK_a, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e abook -C ${XDG_CONFIG_HOME:-${HOME}/.config}/abook/abookrc --datafile ${XDG_CONFIG_HOME:-${HOME}/.config}/abook/addressbook") },
     { { 0, 0, 0, 0 },                   { XK_c, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "profanity", NULL } } },
     { { 0, 0, 0, 0 },                   { XK_e, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
     { { 0, 0, 0, 0 },                   { XK_g, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "gimp", NULL } } },
@@ -462,11 +464,11 @@ static Command commands[] = {
     { { 0, 0, 0, 0 },                   { XK_k, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "kakaotalk", NULL } } },
     { { 0, 0, 0, 0 },                   { XK_m, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
     { { 0, 0, 0, 0 },                   { XK_n, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
-    { { 0, 0, 0, 0 },                   { XK_p, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e sc-im ${WEBDIR:-$HOME/THESIAH}/static/progs.csv") },
+    { { 0, 0, 0, 0 },                   { XK_p, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e sc-im ${WEBDIR:-${HOME}/THESIAH}/static/progs.csv") },
     { { 0, 0, 0, 0 },                   { XK_t, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "torwrap", NULL } } },
-    { { 0, 0, 0, 0 },                   { XK_v, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "vpn", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_v, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "ovpn", NULL } } },
     { { ShiftMask, 0, 0, 0 },           { XK_v, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "nvim", "-c", "VimwikiIndex", "1", NULL } } },
-    { { 0, 0, 0, 0 },                   { XK_w, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e less -Sf ${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport") },
+    { { 0, 0, 0, 0 },                   { XK_w, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e less -Sf ${XDG_CACHE_HOME:-${HOME}/.cache}/weatherreport") },
     { { 0, 0, 0, 0 },                   { XK_Return, 0, 0, 0 },     spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
 };
 
@@ -485,7 +487,7 @@ static const Button buttons[] = {
     { ClkStatusText,    0,              Button5,    sigdwmblocks,   { .i = 5 } },
     { ClkStatusText,    ShiftMask,      Button1,    sigdwmblocks,   { .i = 6 } },
 #endif
-    { ClkStatusText,    ShiftMask,      Button3,    spawn,          SHCMD(TERMINAL " -e nvim ${XDG_SOURCES_HOME:-$HOME/.local/src}/suckless/dwmblocks/config.h") },
+    { ClkStatusText,    ShiftMask,      Button3,    spawn,          SHCMD(TERMINAL " -e nvim ${XDG_SOURCES_HOME:-${HOME}/.local/src}/suckless/dwmblocks/config.h") },
     { ClkClientWin,     MODKEY,         Button1,    movemouse,      {0} },
     { ClkClientWin,     MODKEY,         Button2,    defaultgaps,    {0} },
     { ClkClientWin,     MODKEY,         Button3,    resizemouse,    {0} },