Updates slock and dwm keybindings

6 files changed, 77 insertions, 74 deletions

diff --git a/dwm/config.h b/dwm/config.h
index 0cee861..4f431b9 100644
--- a/dwm/config.h
+++ b/dwm/config.h
@@ -69,6 +69,7 @@ static const Rule rules[] = {
     /* class        instance        title           tags mask       isfloating isterminal  noswallow  monitor */
     { "Gimp",       NULL,           NULL,           1 << 8,         0,  0,  0, -1 },
     { "kakaotalk",  NULL,           NULL,           1 << 8,         0,  0, -1, -1 },
+    { "afreecatvstreamer",  NULL,   NULL,           1 << 7,         0,  0,  0, -1 },
     { TERMCLASS,    NULL,           NULL,           0,              0,  1,  0, -1 },
     { BROWSERCLASS, NULL,           NULL,           0,              0,  0, -1, -1 },
     { TERMCLASS,    "floatterm",    NULL,           0,              1,  1,  0, -1 },
@@ -201,7 +202,7 @@ static const Key keys[] = {
     { MODKEY,                               XK_m,               spawn,              SHCMD("mpc random on; mpc load entire; mpc play; pkill -RTMIN+11 dwmblocks") },
     { MODKEY | ShiftMask,                   XK_m,               spawn,              SHCMD("mpdmenu; pkill -RTMIN+11 dwmblocks") },
     { MODKEY | ControlMask,                 XK_m,               spawn,              SHCMD("mpc stop; pkill -RTMIN+11 dwmblocks") },
-    { 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; pkill -RTMIN+11 dwmblocks") },
     { MODKEY | ShiftMask,                   XK_p,               spawn,              SHCMD("mpc pause; pauseallmpv") },
     { MODKEY | ControlMask,                 XK_p,               spawn,              SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
@@ -211,8 +212,8 @@ static const Key keys[] = {
     { MODKEY | ShiftMask,                   XK_period,          spawn,              { .v = (const char *[]){ "mpc", "seek", "+10", NULL } } },
     { MODKEY | ControlMask,                 XK_comma,           spawn,              { .v = (const char *[]){ "mpc", "seek", "-60", NULL } } },
     { MODKEY | ControlMask,                 XK_period,          spawn,              { .v = (const char *[]){ "mpc", "seek", "+60", NULL } } },
-    { MODKEY | ShiftMask | ControlMask,     XK_comma,           spawn,              { .v = (const char *[]){ "mpc", "seek", "0%", NULL } } },
-    { MODKEY | ShiftMask | ControlMask,     XK_period,          spawn,              { .v = (const char *[]){ "mpc", "repeat", NULL } } },
+    { MODKEY | ControlMask | ShiftMask,     XK_comma,           spawn,              { .v = (const char *[]){ "mpc", "seek", "0%", NULL } } },
+    { MODKEY | ControlMask | ShiftMask,     XK_period,          spawn,              { .v = (const char *[]){ "mpc", "repeat", NULL } } },
     { MODKEY ,                              XK_slash,           spawn,              SHCMD("mpc single on; mpc random off; mpc repeat on") },
     { 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") },
@@ -313,7 +314,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 ~/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 } } },
@@ -321,7 +322,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 | ShiftMask | ControlMask,     XK_F5,              spawn,              { .v = (const char *[]){ "pacupgrade", NULL } } },
+    { MODKEY | ControlMask | ShiftMask,     XK_F5,              spawn,              { .v = (const char *[]){ "pacupgrade", 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 } } },
@@ -349,7 +350,7 @@ static const Key keys[] = {
     { MODKEY | ControlMask,                 XK_equal,           spawn,              SHCMD("sudo brillo -A 5 -q; pkill -RTMIN+22 dwmblocks") },
     { 0,                                    XK_Alt_R,           spawn,              SHCMD("fcitx5-remote -t; pkill -RTMIN+29 dwmblocks") },
     { ControlMask,                          XK_F5,              quit,               {1} },
-    { ShiftMask | ControlMask,              XK_F5,              spawn,              SHCMD("killall -q dwmblocks; setsid -f dwmblocks") },
+    { ControlMask | ShiftMask,              XK_F5,              spawn,              SHCMD("killall -q dwmblocks; setsid -f dwmblocks") },
 
     // TRAVERSALS
     { MODKEY,                               XK_0,               view,               { .ui = ~0 } },
@@ -364,16 +365,15 @@ static const Key keys[] = {
     { MODKEY | ShiftMask,                   XK_bracketright,    shifttagclients,    { .i = +1 } },
     { MODKEY | ControlMask,                 XK_bracketleft,     shiftboth,          { .i = -1 } },
     { MODKEY | ControlMask,                 XK_bracketright,    shiftboth,          { .i = +1 } },
-    { MODKEY | ShiftMask | ControlMask,     XK_bracketleft,     shiftswaptags,      { .i = -1 }	},
-    { MODKEY | ShiftMask | ControlMask,     XK_bracketright,    shiftswaptags,      { .i = +1 }	},
+    { MODKEY | ControlMask | ShiftMask,     XK_bracketleft,     shiftswaptags,      { .i = -1 }	},
+    { MODKEY | ControlMask | ShiftMask,     XK_bracketright,    shiftswaptags,      { .i = +1 }	},
     { MODKEY,                               XK_Left,            focusmon,           { .i = -1 } },
     { MODKEY,                               XK_Right,           focusmon,           { .i = +1 } },
     { MODKEY | ShiftMask,                   XK_Left,            tagmon,             { .i = -1 } },
     { MODKEY | ShiftMask,                   XK_Right,           tagmon,             { .i = +1 } },
-    { MODKEY | ShiftMask,                   XK_Tab,             view,               {0} },
+    { MODKEY2,                              XK_Tab,             view,               {0} },
 
     /* { MODKEY | ShiftMask,                   XK_apostrophe,      togglesmartgaps,    {0} }, */
-  
 };
 
 static Key cmdkeys[] = {
@@ -402,12 +402,12 @@ static Command commands[] = {
 
     /* Modifier (4 keys)                keysyms (4 keys)            function                argument */
     // APPEARANCES
-    { { ShiftMask, 0, 0, 0 },           { XK_b, 0, 0, 0 },          togglebar,              {0} },
-    { { ControlMask, 0, 0, 0 },         { XK_b, 0, 0, 0 },          togglebar,              { .i = 1 } },
-    { { ShiftMask, 0, 0, 0 },           { XK_o, 0, 0, 0 },          toggleborder,           {0} },
-    { { ShiftMask, 0, 0, 0 },           { XK_f, 0, 0, 0 },          togglefloating,         {0} },
-    { { ShiftMask, 0, 0, 0 },           { XK_g, 0, 0, 0 },          togglegaps,             {0} },
-    { { ControlMask, 0, 0, 0 },         { XK_g, 0, 0, 0 },          defaultgaps,            {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_b, 0, 0, 0 },          togglebar,              {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_b, 0, 0, 0 },          togglebar,              { .i = 1 } },
+    { { ControlMask, 0, 0, 0 },         { XK_o, 0, 0, 0 },          toggleborder,           {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_f, 0, 0, 0 },          togglefloating,         {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_g, 0, 0, 0 },          togglegaps,             {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_g, 0, 0, 0 },          defaultgaps,            {0} },
 
     // LAYOUTS
     { { 0, 0, 0, 0 },                   { XK_l, XK_t, 0, 0 },       setlayout,              { .v = &layouts[0] } },
@@ -436,24 +436,25 @@ static Command commands[] = {
     { { 0, 0, 0, 0 },                   { XK_f, XK_period, 0, 0 },  explace,                { .ui = EX_SE } },
 
     // FLOATING SIZES
-    { { ControlMask, 0, 0, 0 },         { XK_j, 0, 0, 0 },          exresize,               { .v = (int []){   0,  25 } } },
-    { { ControlMask, 0, 0, 0 },         { XK_k, 0, 0, 0 },          exresize,               { .v = (int []){   0, -25 } } },
-    { { ControlMask, 0, 0, 0 },         { XK_l, 0, 0, 0 },          exresize,               { .v = (int []){  25,   0 } } },
-    { { ControlMask, 0, 0, 0 },         { XK_h, 0, 0, 0 },          exresize,               { .v = (int []){ -25,   0 } } },
-    { { ControlMask, 0, 0, 0 },         { XK_comma, 0, 0, 0 },      exresize,               { .v = (int []){ -25, -25 } } },
-    { { ControlMask, 0, 0, 0 },         { XK_period, 0, 0, 0 },     exresize,               { .v = (int []){  25,  25 } } },
-    { { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_h, 0 },    togglehorizontalexpand, { .i = +1 } },
-    { { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_h, 0 },    togglehorizontalexpand, { .i =  0 } },
-    { { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_h, 0 },    togglehorizontalexpand, { .i = -1 } },
-    { { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_v, 0 },    toggleverticalexpand,   { .i = +1 } },
-    { { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_v, 0 },    toggleverticalexpand,   { .i =  0 } },
-    { { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_v, 0 },    toggleverticalexpand,   { .i = -1 } },
-    { { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_m, 0 },    togglemaximize,         { .i = +1 } },
-    { { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_m, 0 },    togglemaximize,         { .i =  0 } },
-    { { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_m, 0 },    togglemaximize,         { .i = -1 } },
+    { { 0, 0, 0, 0 },                   { XK_s, XK_j, 0, 0 },       exresize,               { .v = (int []){   0,  25 } } },
+    { { 0, 0, 0, 0 },                   { XK_s, XK_k, 0, 0 },       exresize,               { .v = (int []){   0, -25 } } },
+    { { 0, 0, 0, 0 },                   { XK_s, XK_l, 0, 0 },       exresize,               { .v = (int []){  25,   0 } } },
+    { { 0, 0, 0, 0 },                   { XK_s, XK_h, 0, 0 },       exresize,               { .v = (int []){ -25,   0 } } },
+    { { 0, 0, 0, 0 },                   { XK_s, XK_comma, 0, 0 },   exresize,               { .v = (int []){ -25, -25 } } },
+    { { 0, 0, 0, 0 },                   { XK_s, XK_period, 0, 0 },  exresize,               { .v = (int []){  25,  25 } } },
+    { { 0, 0, 0, 0 },                   { XK_f, XK_s, XK_i, XK_h }, togglehorizontalexpand, { .i = +1 } },
+    { { 0, 0, 0, 0 },                   { XK_f, XK_s, XK_r, XK_h }, togglehorizontalexpand, { .i =  0 } },
+    { { 0, 0, 0, 0 },                   { XK_f, XK_s, XK_d, XK_h }, togglehorizontalexpand, { .i = -1 } },
+    { { 0, 0, 0, 0 },                   { XK_f, XK_s, XK_i, XK_v }, toggleverticalexpand,   { .i = +1 } },
+    { { 0, 0, 0, 0 },                   { XK_f, XK_s, XK_r, XK_v }, toggleverticalexpand,   { .i =  0 } },
+    { { 0, 0, 0, 0 },                   { XK_f, XK_s, XK_d, XK_v }, toggleverticalexpand,   { .i = -1 } },
+    { { 0, 0, 0, 0 },                   { XK_f, XK_s, XK_i, XK_m }, togglemaximize,         { .i = +1 } },
+    { { 0, 0, 0, 0 },                   { XK_f, XK_s, XK_r, XK_m }, togglemaximize,         { .i =  0 } },
+    { { 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 ~/.config/abook/abookrc --datafile ~/.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 } } },
     { { 0, 0, 0, 0 },                   { XK_h, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
@@ -461,10 +462,10 @@ 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,                  { .v = (const char *[]){ TERMINAL, "-e", "profanity", NULL } } },
-    { { 0, 0, 0, 0 },                   { XK_s, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e sc-im /home/si/.dotfiles/THESIAH/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 *[]){ TERMINAL, "-e", "nvim", "-c", "VimwikiIndex", "1", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_v, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "vpn", 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_Return, 0, 0, 0 },     spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
 };
@@ -484,7 +485,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 ~/.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} },
diff --git a/dwm/dwm b/dwm/dwm
index 75cc310..a497874 100755
--- a/dwm/dwm
+++ b/dwm/dwm
diff --git a/dwm/thesiah.mom b/dwm/thesiah.mom
index 380ffda..c13c13f 100644
--- a/dwm/thesiah.mom
+++ b/dwm/thesiah.mom
@@ -111,7 +111,7 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWMOD+Ctrl+m\fP \(en spawn SHCMD("mpcstop;pkill-RTMIN+11dwmblocks")
 .ITEM
-\f(CWMOD+Shift+Ctrl+m\fP \(en spawn {.v=(constchar*[]){"delmusic",NULL}}
+\f(CWMOD+Ctrl+Shift+m\fP \(en spawn {.v=(constchar*[]){"delmusic",NULL}}
 .ITEM
 \f(CWMOD+p\fP \(en spawn SHCMD("mpctoggle;pkill-RTMIN+11dwmblocks")
 .ITEM
@@ -131,9 +131,9 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWMOD+Ctrl+period\fP \(en spawn {.v=(constchar*[]){"mpc","seek","+60",NULL}}
 .ITEM
-\f(CWMOD+Shift+Ctrl+comma\fP \(en spawn {.v=(constchar*[]){"mpc","seek","0%",NULL}}
+\f(CWMOD+Ctrl+Shift+comma\fP \(en spawn {.v=(constchar*[]){"mpc","seek","0%",NULL}}
 .ITEM
-\f(CWMOD+Shift+Ctrl+period\fP \(en spawn {.v=(constchar*[]){"mpc","repeat",NULL}}
+\f(CWMOD+Ctrl+Shift+period\fP \(en spawn {.v=(constchar*[]){"mpc","repeat",NULL}}
 .ITEM
 \f(CWMOD+slash\fP \(en spawn SHCMD("mpcsingleon;mpcrandomoff;mpcrepeaton")
 .ITEM
@@ -325,7 +325,7 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWMOD+F1\fP \(en spawn SHCMD("groff-mom/usr/local/share/dwm/thesiah.mom-Tpdf+zathura-")
 .ITEM
-\f(CWMOD+Shift+F1\fP \(en spawn SHCMD("nsxiv~/Pictures/resources")
+\f(CWMOD+Shift+F1\fP \(en spawn SHCMD("nsxiv${XDG_PICTURES_DIR:-$HOME/Pictures}/resources")
 .ITEM
 \f(CWMOD+Ctrl+F1\fP \(en spawn {.v=(constchar*[]){TERMINAL,"-e","dman",NULL}}
 .ITEM
@@ -341,7 +341,7 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWMOD+Ctrl+F5\fP \(en spawn {.v=(constchar*[]){"rbackup",NULL}}
 .ITEM
-\f(CWMOD+Shift+Ctrl+F5\fP \(en spawn {.v=(constchar*[]){"pacupgrade",NULL}}
+\f(CWMOD+Ctrl+Shift+F5\fP \(en spawn {.v=(constchar*[]){"pacupgrade",NULL}}
 .ITEM
 \f(CWMOD+F6\fP \(en spawn {.v=(constchar*[]){"qndl","-v",NULL}}
 .ITEM
@@ -396,7 +396,7 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWCtrl+F5\fP \(en quit {1}
 .ITEM
-\f(CWShift+Ctrl+F5\fP \(en spawn SHCMD("killall-qdwmblocks;setsid-fdwmblocks")
+\f(CWCtrl+Shift+F5\fP \(en spawn SHCMD("killall-qdwmblocks;setsid-fdwmblocks")
 .LIST OFF
 .HEADING 9 "Traversals"
 .LI
@@ -425,9 +425,9 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWMOD+Ctrl+bracketright\fP \(en shiftboth {.i=+1}
 .ITEM
-\f(CWMOD+Shift+Ctrl+bracketleft\fP \(en shiftswaptags {.i=-1}
+\f(CWMOD+Ctrl+Shift+bracketleft\fP \(en shiftswaptags {.i=-1}
 .ITEM
-\f(CWMOD+Shift+Ctrl+bracketright\fP \(en shiftswaptags {.i=+1}
+\f(CWMOD+Ctrl+Shift+bracketright\fP \(en shiftswaptags {.i=+1}
 .ITEM
 \f(CWMOD+Left\fP \(en focusmon {.i=-1}
 .ITEM
@@ -437,7 +437,7 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWMOD+Shift+Right\fP \(en tagmon {.i=+1}
 .ITEM
-\f(CWMOD+Shift+Tab\fP \(en view {0}
+\f(CWMOD2+Tab\fP \(en view {0}
 .LIST OFF
 .HEADING 9 "Commands"
 .LI
@@ -454,17 +454,17 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .HEADING 9 "Appearances"
 .LI
 .ITEM
-\f(CWShift+b\fP \(en togglebar {0}
+\f(CWCtrl+b\fP \(en togglebar {0}
 .ITEM
-\f(CWCtrl+b\fP \(en togglebar {.i=1}
+\f(CWShift+b\fP \(en togglebar {.i=1}
 .ITEM
-\f(CWShift+o\fP \(en toggleborder {0}
+\f(CWCtrl+o\fP \(en toggleborder {0}
 .ITEM
-\f(CWShift+f\fP \(en togglefloating {0}
+\f(CWCtrl+f\fP \(en togglefloating {0}
 .ITEM
-\f(CWShift+g\fP \(en togglegaps {0}
+\f(CWCtrl+g\fP \(en togglegaps {0}
 .ITEM
-\f(CWCtrl+g\fP \(en defaultgaps {0}
+\f(CWShift+g\fP \(en defaultgaps {0}
 .LIST OFF
 .HEADING 9 "Layouts"
 .LI
@@ -518,40 +518,42 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .HEADING 9 "Floating Sizes"
 .LI
 .ITEM
-\f(CWCtrl+j\fP \(en exresize {.v=(int[]){25}}
+\f(CWsj\fP \(en exresize {.v=(int[]){25}}
 .ITEM
-\f(CWCtrl+k\fP \(en exresize {.v=(int[]){-25}}
+\f(CWsk\fP \(en exresize {.v=(int[]){-25}}
 .ITEM
-\f(CWCtrl+l\fP \(en exresize {.v=(int[]){25}}
+\f(CWsl\fP \(en exresize {.v=(int[]){25}}
 .ITEM
-\f(CWCtrl+h\fP \(en exresize {.v=(int[]){-25}}
+\f(CWsh\fP \(en exresize {.v=(int[]){-25}}
 .ITEM
-\f(CWCtrl+comma\fP \(en exresize {.v=(int[]){-25,-25}}
+\f(CWscomma\fP \(en exresize {.v=(int[]){-25,-25}}
 .ITEM
-\f(CWCtrl+period\fP \(en exresize {.v=(int[]){25+25}}
+\f(CWsperiod\fP \(en exresize {.v=(int[]){25+25}}
 .ITEM
-\f(CWCtrl+fih\fP \(en togglehorizontalexpand {.i=+1}
+\f(CWfsih\fP \(en togglehorizontalexpand {.i=+1}
 .ITEM
-\f(CWCtrl+frh\fP \(en togglehorizontalexpand {.i=0}
+\f(CWfsrh\fP \(en togglehorizontalexpand {.i=0}
 .ITEM
-\f(CWCtrl+fdh\fP \(en togglehorizontalexpand {.i=-1}
+\f(CWfsdh\fP \(en togglehorizontalexpand {.i=-1}
 .ITEM
-\f(CWCtrl+fiv\fP \(en toggleverticalexpand {.i=+1}
+\f(CWfsiv\fP \(en toggleverticalexpand {.i=+1}
 .ITEM
-\f(CWCtrl+frv\fP \(en toggleverticalexpand {.i=0}
+\f(CWfsrv\fP \(en toggleverticalexpand {.i=0}
 .ITEM
-\f(CWCtrl+fdv\fP \(en toggleverticalexpand {.i=-1}
+\f(CWfsdv\fP \(en toggleverticalexpand {.i=-1}
 .ITEM
-\f(CWCtrl+fim\fP \(en togglemaximize {.i=+1}
+\f(CWfsim\fP \(en togglemaximize {.i=+1}
 .ITEM
-\f(CWCtrl+frm\fP \(en togglemaximize {.i=0}
+\f(CWfsrm\fP \(en togglemaximize {.i=0}
 .ITEM
-\f(CWCtrl+fdm\fP \(en togglemaximize {.i=-1}
+\f(CWfsdm\fP \(en togglemaximize {.i=-1}
 .LIST OFF
 .HEADING 9 "Programs"
 .LI
 .ITEM
-\f(CWa\fP \(en spawn SHCMD(TERMINAL"-eabook-C~/.config/abook/abookrc--datafile~/.config/abook/addressbook")
+\f(CWa\fP \(en spawn SHCMD(TERMINAL"-eabook-C${XDG_CONFIG_HOME:-$HOME/.config}/abook/abookrc--datafile${XDG_CONFIG_HOME:-$HOME/.config}/abook/addressbook")
+.ITEM
+\f(CWc\fP \(en spawn {.v=(constchar*[]){TERMINAL,"-e","profanity",NULL}}
 .ITEM
 \f(CWe\fP \(en spawn SHCMD(TERMINAL"-eneomutt;pkill-RTMIN+12dwmblocks;rmdir~/.abook2>/dev/null")
 .ITEM
@@ -567,13 +569,13 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWn\fP \(en spawn SHCMD(TERMINAL"-enewsboat;pkill-RTMIN+6dwmblocks")
 .ITEM
-\f(CWp\fP \(en spawn {.v=(constchar*[]){TERMINAL,"-e","profanity",NULL}}
-.ITEM
-\f(CWs\fP \(en spawn SHCMD(TERMINAL"-esc-im/home/si/.dotfiles/THESIAH/progs.csv")
+\f(CWp\fP \(en spawn SHCMD(TERMINAL"-esc-im${WEBDIR:-$HOME/THESIAH}/static/progs.csv")
 .ITEM
 \f(CWt\fP \(en spawn {.v=(constchar*[]){"torwrap",NULL}}
 .ITEM
-\f(CWv\fP \(en spawn {.v=(constchar*[]){TERMINAL,"-e","nvim","-c","VimwikiIndex","1",NULL}}
+\f(CWv\fP \(en spawn {.v=(constchar*[]){"vpn",NULL}}
+.ITEM
+\f(CWShift+v\fP \(en spawn {.v=(constchar*[]){TERMINAL,"-e","nvim","-c","VimwikiIndex","1",NULL}}
 .ITEM
 \f(CWw\fP \(en spawn SHCMD(TERMINAL"-eless-Sf${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport")
 .ITEM
@@ -599,7 +601,7 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
 .ITEM
 \f(CWClkStatusText+Shift\fP \(en Button1 sigdwmblocks,{.i=6}
 .ITEM
-\f(CWClkStatusText+Shift\fP \(en Button3 spawn,SHCMD(TERMINAL"-envim~/.local/src/suckless/dwmblocks/config.h")
+\f(CWClkStatusText+Shift\fP \(en Button3 spawn,SHCMD(TERMINAL"-envim${XDG_SOURCES_HOME:-$HOME/.local/src}/suckless/dwmblocks/config.h")
 .ITEM
 \f(CWClkClientWin+MOD\fP \(en Button1 movemouse,{0}
 .ITEM
diff --git a/slock/config.h b/slock/config.h
index 15e9674..b71498c 100644
--- a/slock/config.h
+++ b/slock/config.h
@@ -31,7 +31,7 @@ static const char *font_name = "monospace:size=18:bold";
 static const int monitortime = 600;
 
 /* PAM service that's used for authentication */
-static const char* pam_service = "login";
+static const char* pam_service = "system-login";
 
 /* insert grid pattern with scale 1:1, the size can be changed with logosize */
 static const int logosize = 75;
diff --git a/slock/slock b/slock/slock
index ea0d09b..5df9120 100755
--- a/slock/slock
+++ b/slock/slock
diff --git a/slock/slock.c b/slock/slock.c
index 22f0a29..1fc3d9d 100644
--- a/slock/slock.c
+++ b/slock/slock.c
@@ -408,9 +408,9 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 				for (screen = 0; screen < nscreens; screen++) {
                     time_t rawtime;
                     time(&rawtime);
+	                refresh(dpy, locks[screen]->win,locks[screen]->screen, *localtime(&rawtime),crs[screen],surfaces[screen]);
 					drawlogo(dpy, locks[screen], color);
 					writemessage(dpy, locks[screen]->win, screen);
-	                refresh(dpy, locks[screen]->win,locks[screen]->screen, *localtime(&rawtime),crs[screen],surfaces[screen]);
 				}
 				pthread_mutex_unlock(&mutex);
 				oldc = color;