diff options
| -rw-r--r-- | dwm/config.h | 58 | ||||
| -rwxr-xr-x | dwm/dwm | bin | 133624 -> 133704 bytes | |||
| -rw-r--r-- | dwm/thesiah.mom | 78 | ||||
| -rw-r--r-- | slock/config.h | 5 | ||||
| -rwxr-xr-x | slock/slock | bin | 32144 -> 32144 bytes | |||
| -rw-r--r-- | slock/slock.c | 18 |
6 files changed, 90 insertions, 69 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} }, Binary files differdiff --git a/dwm/thesiah.mom b/dwm/thesiah.mom index c13c13f..34b1dd7 100644 --- a/dwm/thesiah.mom +++ b/dwm/thesiah.mom @@ -141,6 +141,21 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik .ITEM \f(CWMOD+Ctrl+slash\fP \(en spawn SHCMD("mpcrepeatoff;mpcrandomoff;mpcsingleoff;pkill-RTMIN+11dwmblocks") .LIST OFF +.HEADING 9 "Floating Sizes" +.LI +.ITEM +\f(CWMOD2+Ctrl+h\fP \(en exresize {.v=(int[]){-25}} +.ITEM +\f(CWMOD2+Ctrl+l\fP \(en exresize {.v=(int[]){25}} +.ITEM +\f(CWMOD2+Ctrl+j\fP \(en exresize {.v=(int[]){25}} +.ITEM +\f(CWMOD2+Ctrl+k\fP \(en exresize {.v=(int[]){-25}} +.ITEM +\f(CWMOD2+Ctrl+comma\fP \(en exresize {.v=(int[]){-25,-25}} +.ITEM +\f(CWMOD2+Ctrl+period\fP \(en exresize {.v=(int[]){25+25}} +.LIST OFF .HEADING 9 "Layout Sizes" .LI .ITEM @@ -150,6 +165,8 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik .ITEM \f(CWMOD+f\fP \(en togglefullscr {0} .ITEM +\f(CWMOD+Ctrl+f\fP \(en togglefloating {0} +.ITEM \f(CWMOD+h\fP \(en setmfact {.f=-0.05} .ITEM \f(CWMOD+l\fP \(en setmfact {.f=+0.05} @@ -162,7 +179,7 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik .ITEM \f(CWMOD+Ctrl+k\fP \(en setcfact {.f=+0.25} .ITEM -\f(CWMOD+Ctrl+y\fP \(en setcfact {.f=0.00} +\f(CWMOD+Ctrl+l\fP \(en setcfact {.f=0.00} .ITEM \f(CWMOD+Shift+c\fP \(en incrgaps {.i=-5} .ITEM @@ -176,40 +193,25 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik .ITEM \f(CWMOD+Ctrl+o\fP \(en incrogaps {.i=+5} .ITEM -\f(CWMOD+Shift+h\fP \(en incrihgaps {.i=-5} -.ITEM -\f(CWMOD+Ctrl+h\fP \(en incrihgaps {.i=+5} -.ITEM -\f(CWMOD+Shift+g\fP \(en incrivgaps {.i=-5} +\f(CWMOD+Shift+y\fP \(en incrihgaps {.i=-5} .ITEM -\f(CWMOD+Ctrl+g\fP \(en incrivgaps {.i=+5} +\f(CWMOD+Ctrl+y\fP \(en incrihgaps {.i=+5} .ITEM -\f(CWMOD+Shift+b\fP \(en incrohgaps {.i=-5} +\f(CWMOD+Shift+t\fP \(en incrivgaps {.i=-5} .ITEM -\f(CWMOD+Ctrl+b\fP \(en incrohgaps {.i=+5} +\f(CWMOD+Ctrl+t\fP \(en incrivgaps {.i=+5} .ITEM -\f(CWMOD+Shift+v\fP \(en incrovgaps {.i=-5} +\f(CWMOD+Shift+u\fP \(en incrohgaps {.i=-5} .ITEM -\f(CWMOD+Ctrl+v\fP \(en incrovgaps {.i=+5} +\f(CWMOD+Ctrl+u\fP \(en incrohgaps {.i=+5} .ITEM -\f(CWMOD+Shift+t\fP \(en togglegaps {0} +\f(CWMOD+Shift+r\fP \(en incrovgaps {.i=-5} .ITEM -\f(CWMOD+Ctrl+t\fP \(en defaultgaps {0} -.LIST OFF -.HEADING 9 "Floating Sizes" -.LI -.ITEM -\f(CWMOD2+Ctrl+h\fP \(en exresize {.v=(int[]){-25}} -.ITEM -\f(CWMOD2+Ctrl+l\fP \(en exresize {.v=(int[]){25}} -.ITEM -\f(CWMOD2+Ctrl+j\fP \(en exresize {.v=(int[]){25}} +\f(CWMOD+Ctrl+r\fP \(en incrovgaps {.i=+5} .ITEM -\f(CWMOD2+Ctrl+k\fP \(en exresize {.v=(int[]){-25}} -.ITEM -\f(CWMOD2+Ctrl+comma\fP \(en exresize {.v=(int[]){-25,-25}} +\f(CWMOD+Shift+g\fP \(en defaultgaps {0} .ITEM -\f(CWMOD2+Ctrl+period\fP \(en exresize {.v=(int[]){25+25}} +\f(CWMOD+Ctrl+g\fP \(en togglegaps {0} .LIST OFF .HEADING 9 "Media Controls" .LI @@ -282,16 +284,18 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik .ITEM \f(CWMOD+e\fP \(en spawn SHCMD(TERMINAL"-eneomutt;pkill-RTMIN+12dwmblocks;rmdir~/.abook2>/dev/null") .ITEM -\f(CWMOD+n\fP \(en spawn SHCMD(TERMINAL"-enewsboat;pkill-RTMIN+6dwmblocks") +\f(CWMOD+g\fP \(en spawn {.v=(constchar*[]){TERMINAL,"-e","lfub",NULL}} .ITEM -\f(CWMOD+r\fP \(en spawn {.v=(constchar*[]){TERMINAL,"-e","lfub",NULL}} +\f(CWMOD+n\fP \(en spawn SHCMD(TERMINAL"-enewsboat;pkill-RTMIN+6dwmblocks") .ITEM -\f(CWMOD+Shift+r\fP \(en spawn {.v=(constchar*[]){TERMINAL,"-e","htop",NULL}} +\f(CWMOD+r\fP \(en spawn {.v=(constchar*[]){TERMINAL,"-e","htop",NULL}} .ITEM \f(CWMOD+t\fP \(en spawn {.v=(constchar*[]){"torwrap",NULL}} .ITEM \f(CWMOD+w\fP \(en spawn {.v=(constchar*[]){BROWSER+NULL}} .ITEM +\f(CWMOD+Ctrl+w\fP \(en spawn {.v=(constchar*[]){"pkill","-f",BROWSER,NULL}} +.ITEM \f(CWMOD+Shift+grave\fP \(en spawn {.v=(constchar*[]){"dmenuunicode",NULL}} .ITEM \f(CWMOD+Return\fP \(en spawn {.v=termcmd} @@ -311,6 +315,8 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik .ITEM \f(CWMOD+v\fP \(en spawn {.v=(constchar*[]){"mpvplay",NULL}} .ITEM +\f(CWMOD+Ctrl+v\fP \(en spawn {.v=(constchar*[]){"ovpn",NULL}} +.ITEM \f(CWMOD+Insert\fP \(en spawn SHCMD("xdotooltype$(grep-v'^#'~/.local/share/thesiah/snippets+dmenu-i-l50+cut-d''-f1)") .ITEM \f(CWPrint\fP \(en spawn SHCMD("maim+tee~/Pictures/screenshot-$(date'+%y%m%d-%H%M-%S').png+xclip-selectionclipboard") @@ -325,7 +331,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${XDG_PICTURES_DIR:-$HOME/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 @@ -366,8 +372,6 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik .HEADING 9 "Systems" .LI .ITEM -\f(CWMOD+Ctrl+f\fP \(en spawn {.v=(constchar*[]){"pkill","-f",BROWSER,NULL}} -.ITEM \f(CWMOD+Ctrl+k\fP \(en spawn {.v=(constchar*[]){"pkill","-f","kakaotalk",NULL}} .ITEM \f(CWMOD+q\fP \(en killclient {0} @@ -551,7 +555,7 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik .HEADING 9 "Programs" .LI .ITEM -\f(CWa\fP \(en spawn SHCMD(TERMINAL"-eabook-C${XDG_CONFIG_HOME:-$HOME/.config}/abook/abookrc--datafile${XDG_CONFIG_HOME:-$HOME/.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 @@ -569,15 +573,15 @@ 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 SHCMD(TERMINAL"-esc-im${WEBDIR:-$HOME/THESIAH}/static/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*[]){"vpn",NULL}} +\f(CWv\fP \(en spawn {.v=(constchar*[]){"ovpn",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") +\f(CWw\fP \(en spawn SHCMD(TERMINAL"-eless-Sf${XDG_CACHE_HOME:-${HOME}/.cache}/weatherreport") .ITEM \f(CWReturn\fP \(en spawn {.v=(constchar*[]){TERMINAL,"-e","lfub",NULL}} .LIST OFF @@ -601,7 +605,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${XDG_SOURCES_HOME:-$HOME/.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 b71498c..b219101 100644 --- a/slock/config.h +++ b/slock/config.h @@ -1,6 +1,6 @@ /* user and group to drop privileges to */ static const char *group = "wheel"; -static int personalblur = 0; +static int personalblur = 100; static const char *colorname[NUMCOLS] = { [INIT] = "#3c3836", /* after initialization */ @@ -16,7 +16,7 @@ static const char *colorname[NUMCOLS] = { static const int failonclear = 1; /* Background image path, should be available to the user above */ -static const char* background_image = "/home/si/Pictures/wallpaper/personal-yejin-wall.png"; +static const char* background_image = "Personal/photo/DEE96C0C-1003-4749-856A-D369E7E328C5.png"; /* default message */ static const char *message = "THESIAH"; @@ -74,4 +74,3 @@ ResourcePref resources[] = { { "color13", STRING, &colorname[PAM] }, { "color0", STRING, &text_color }, }; - diff --git a/slock/slock b/slock/slock Binary files differindex 5df9120..650ae4d 100755 --- a/slock/slock +++ b/slock/slock diff --git a/slock/slock.c b/slock/slock.c index 1fc3d9d..957012b 100644 --- a/slock/slock.c +++ b/slock/slock.c @@ -672,7 +672,23 @@ main(int argc, char **argv) { config_init(dpy); /* Load picture */ - Imlib_Image buffer = imlib_load_image(background_image); + char* home_path = getenv("HOME"); + int size_needed = snprintf(NULL, 0, "mount | grep -q ' %s/Personal '", home_path) + 1; + char* command = malloc(size_needed); + snprintf(command, size_needed, "mount | grep -q ' %s/Personal '", home_path); + int result = system(command); + free(command); + if (result != 0) { + background_image = "Pictures/wallpaper/personal-default.png"; + personalblur = 0; + } + size_needed = strlen(home_path) + strlen(background_image) + 2; // +2 for slash and null terminator + char* full_background_image = malloc(size_needed); + strcpy(full_background_image, home_path); + strcat(full_background_image, "/"); + strcat(full_background_image, background_image); + + Imlib_Image buffer = imlib_load_image(full_background_image); if (buffer) { blurRadius = personalblur; |