diff --git a/config.def.h b/config.def.h index 6434818..5e065ad 100644 --- a/config.def.h +++ b/config.def.h @@ -6,20 +6,38 @@ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ static const char *fonts[] = { "monospace:size=10" }; -static const char *fonts[] = { "JetBrains Mono Nerd Font:size=11:antialias=true:autohint=true" }; -static const char dmenufont[] = "JetBrains Mono Nerd Font:size=12"; +//static const char *fonts[] = { "JetBrains Mono Nerd Font:size=11:antialias=true:autohint=true" }; +//static const char dmenufont[] = "JetBrains Mono Nerd Font:size=12"; +static const char dmenufont[] = { "monospace:size=10" }; +//static const char col_gray1[] = "#222222"; +//static const char col_gray2[] = "#444444"; +//static const char col_gray3[] = "#bbbbbb"; +//static const char col_gray4[] = "#eeeeee"; +////static const char col_cyan[] = "#005577"; +//static const char col_cyan[] = "#d90429"; +//static const char *colors[][3] = { +// /* fg bg border */ +// [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, +// [SchemeSel] = { col_gray4, col_cyan, col_cyan }, +//}; + + static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; static const char col_gray4[] = "#eeeeee"; -//static const char col_cyan[] = "#005577"; -static const char col_cyan[] = "#d90429"; +static const char col_main[] = "#383838"; +static const char col_background[] = "#151515"; +static const char col_alert[] = "#a55"; static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_cyan, col_cyan }, + /* fg bg border */ + [SchemeNorm] = { col_gray3, col_background, col_gray2 }, + [SchemeSel] = { col_gray4, col_main, col_alert }, }; + + + /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; @@ -58,7 +76,7 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; +static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_main, "-sf", col_gray4, NULL }; static const char *termcmd[] = { "alacritty", NULL }; static const char *slockcmd[] = { "slock", NULL }; // Brightness commands @@ -80,14 +98,15 @@ static const char *volume[3][4] = { { static const Key keys[] = { /* modifier key function argument */ - { MODKEY|ShiftMask, 46, spawn, {.v = slockcmd } }, + /* { MODKEY|ShiftMask, 46, spawn, {.v = slockcmd } }, */ + { MODKEY|ShiftMask, 46, spawn, SHCMD("setxkbmap us; slock") }, { 0, 233, spawn, {.v = brightness[0]} }, { 0, 232, spawn, {.v = brightness[1]} }, { 0, 123, spawn, {.v = volume[0]} }, { 0, 122, spawn, {.v = volume[1]} }, { 0, 121, spawn, {.v = volume[2]} }, { MODKEY|ShiftMask, 65, spawn, SHCMD("setxkbmap -query | grep 'us' && setxkbmap cz qwerty || setxkbmap us")}, - { MODKEY|ShiftMask, 248, spawn, SHCMD("setxkbmap -query | grep 'us' && setxkbmap cz qwerty || setxkbmap us")}, + { MODKEY|ShiftMask, 156, spawn, SHCMD("setxkbmap -query | grep 'us' && setxkbmap cz qwerty || setxkbmap us")}, { MODKEY, 33, spawn, {.v = dmenucmd } }, // p { MODKEY|ShiftMask, 36, spawn, {.v = termcmd } }, // Return { MODKEY, 56, togglebar, {0} }, // b @@ -121,6 +140,7 @@ static const Key keys[] = { TAGKEYS( 17, 7) // 8 TAGKEYS( 18, 8) // 9 { MODKEY|ShiftMask, 24, quit, {0} }, // q + { MODKEY, 127, spawn, SHCMD("setxkbmap us; slock & sleep 0.2; loginctl suspend") }, // Pause { 0, 107, spawn, SHCMD("shotgun $(slop -f '-i %i -g %g') - | tee /home/$USER/Pictures/Screenshots/$(date +'%F_%T').png | xclip -t 'image/png' -selection c") }, }; diff --git a/config.h b/config.h index 4f0686a..5e065ad 100644 --- a/config.h +++ b/config.h @@ -6,19 +6,38 @@ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ static const char *fonts[] = { "monospace:size=10" }; -static const char dmenufont[] = "monospace:size=10"; +//static const char *fonts[] = { "JetBrains Mono Nerd Font:size=11:antialias=true:autohint=true" }; +//static const char dmenufont[] = "JetBrains Mono Nerd Font:size=12"; +static const char dmenufont[] = { "monospace:size=10" }; +//static const char col_gray1[] = "#222222"; +//static const char col_gray2[] = "#444444"; +//static const char col_gray3[] = "#bbbbbb"; +//static const char col_gray4[] = "#eeeeee"; +////static const char col_cyan[] = "#005577"; +//static const char col_cyan[] = "#d90429"; +//static const char *colors[][3] = { +// /* fg bg border */ +// [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, +// [SchemeSel] = { col_gray4, col_cyan, col_cyan }, +//}; + + static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; static const char col_gray4[] = "#eeeeee"; -//static const char col_cyan[] = "#005577"; -static const char col_cyan[] = "#ff0000"; +static const char col_main[] = "#383838"; +static const char col_background[] = "#151515"; +static const char col_alert[] = "#a55"; static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_cyan, col_cyan }, + /* fg bg border */ + [SchemeNorm] = { col_gray3, col_background, col_gray2 }, + [SchemeSel] = { col_gray4, col_main, col_alert }, }; + + + /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; @@ -57,7 +76,7 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; +static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_main, "-sf", col_gray4, NULL }; static const char *termcmd[] = { "alacritty", NULL }; static const char *slockcmd[] = { "slock", NULL }; // Brightness commands @@ -79,13 +98,15 @@ static const char *volume[3][4] = { { static const Key keys[] = { /* modifier key function argument */ - { MODKEY|ShiftMask, 46, spawn, {.v = slockcmd } }, + /* { MODKEY|ShiftMask, 46, spawn, {.v = slockcmd } }, */ + { MODKEY|ShiftMask, 46, spawn, SHCMD("setxkbmap us; slock") }, { 0, 233, spawn, {.v = brightness[0]} }, { 0, 232, spawn, {.v = brightness[1]} }, { 0, 123, spawn, {.v = volume[0]} }, { 0, 122, spawn, {.v = volume[1]} }, { 0, 121, spawn, {.v = volume[2]} }, { MODKEY|ShiftMask, 65, spawn, SHCMD("setxkbmap -query | grep 'us' && setxkbmap cz qwerty || setxkbmap us")}, + { MODKEY|ShiftMask, 156, spawn, SHCMD("setxkbmap -query | grep 'us' && setxkbmap cz qwerty || setxkbmap us")}, { MODKEY, 33, spawn, {.v = dmenucmd } }, // p { MODKEY|ShiftMask, 36, spawn, {.v = termcmd } }, // Return { MODKEY, 56, togglebar, {0} }, // b @@ -119,6 +140,7 @@ static const Key keys[] = { TAGKEYS( 17, 7) // 8 TAGKEYS( 18, 8) // 9 { MODKEY|ShiftMask, 24, quit, {0} }, // q + { MODKEY, 127, spawn, SHCMD("setxkbmap us; slock & sleep 0.2; loginctl suspend") }, // Pause { 0, 107, spawn, SHCMD("shotgun $(slop -f '-i %i -g %g') - | tee /home/$USER/Pictures/Screenshots/$(date +'%F_%T').png | xclip -t 'image/png' -selection c") }, }; diff --git a/dwm b/dwm index d389ecd..81d2e64 100755 Binary files a/dwm and b/dwm differ diff --git a/dwm.o b/dwm.o index 8584630..d6f558a 100644 Binary files a/dwm.o and b/dwm.o differ