diff --git a/config.def.h b/config.def.h index 597602e..9b2ee08 100644 --- a/config.def.h +++ b/config.def.h @@ -34,9 +34,10 @@ static const Rule rules[] = { * WM_CLASS(STRING) = instance, class * WM_NAME(STRING) = title */ - /* class instance title tags mask isfloating monitor */ - {"Gimp", NULL, NULL, 0, 1, -1}, - {"Firefox", NULL, NULL, 1 << 8, 0, -1}, + /* class instance title tags mask isfloating monitor */ + {"firefox", NULL, NULL, 1 << 0, 0, -1}, + {"thunderbird", NULL, NULL, 1 << 6, 0, -1}, + {"ManagerDesktop", NULL, NULL, 1 << 7, 0, -1}, }; /* layout(s) */ @@ -142,7 +143,7 @@ static const Keychord *keychords[] = { &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_f}}, spawn, {.v = (const char *[]){"firefox", NULL}} }), &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_n}}, spawn, {.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}} }), &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_m}}, spawn, {.v = (const char *[]){TERMINAL, "-e", "gotop", NULL}} }), - &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_t}}, spawn, {.v = (const char *[]){"thunar, NULL}} }), + &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_t}}, spawn, {.v = (const char *[]){"thunar", NULL}} }), &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_h}}, spawn, {.v = (const char *[]){"dmenuhandler", NULL}} }), &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_m}}, spawn, {.v = (const char *[]){"mounter", NULL}} }), diff --git a/config.h b/config.h deleted file mode 100644 index 6b30be9..0000000 --- a/config.h +++ /dev/null @@ -1,205 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* appearance */ -static const unsigned int borderpx = 1; /* border pixel of windows */ -static const unsigned int gappx = 6; /* gaps between windows */ -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[] = {"FiraCode Nerd Font:size=10:antialias=true:hinting=true"}; -static const char dmenufont[] = "FiraCode Nerd Font:size=10:antialias=true:hinting=true"; - -static const char norm_fg[] = "#D5C4A1"; -static const char norm_bg[] = "#262626"; -static const char norm_border[] = "#665c54"; - -static const char sel_fg[] = "#262626"; -static const char sel_bg[] = "#FE8019"; -static const char sel_border[] = "#fbf1c7"; - -static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = {norm_fg, norm_bg, norm_border}, // unfocused wins - [SchemeSel] = {sel_fg, sel_bg, sel_border}, // the focused win -}; - -static const unsigned int baralpha = 0xd0; -static const unsigned int borderalpha = 0xd0; - -/* tagging */ -static const char *tags[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9"}; - -static const Rule rules[] = { - /* xprop(1): - * WM_CLASS(STRING) = instance, class - * WM_NAME(STRING) = title - */ - /* class instance title tags mask isfloating monitor */ - {"Gimp", NULL, NULL, 0, 1, -1}, - {"Firefox", NULL, NULL, 1 << 8, 0, -1}, -}; - -/* layout(s) */ -static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */ -static const int nmaster = 1; /* number of clients in master area */ -static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */ -static const int lockfullscreen =1; /* 1 will force focus on the fullscreen window */ - -static const Layout layouts[] = { - /* symbol arrange function */ - {"[]=", tile}, /* first entry is default */ - {"[M]", monocle}, - {"><>", NULL}, /* no layout function means floating behavior */ -}; - -/* key definitions */ -#define MODKEY Mod1Mask -#define TAGKEYS(KEY,TAG) \ - &((Keychord){1, {{MODKEY, KEY}}, view, {.ui = 1 << TAG} }), \ - &((Keychord){1, {{MODKEY|ControlMask, KEY}}, toggleview, {.ui = 1 << TAG} }), \ - &((Keychord){1, {{MODKEY|ShiftMask, KEY}}, tag, {.ui = 1 << TAG} }), \ - &((Keychord){1, {{MODKEY|ControlMask|ShiftMask, KEY}}, toggletag, {.ui = 1 << TAG} }), - -/* helper for spawning shell commands in the pre dwm-5.0 fashion */ -#define SHCMD(cmd) { .v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } } - -/* some defaults */ -#define TERMINAL "st" -#define STATUSBAR "dwmblocks" - -/* commands */ -static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = {"dmenu_run", NULL}; -static const char *slockcmd[] = {"slock", NULL}; -static const char *termcmd[] = {TERMINAL, "-e", "tmux-worker", NULL}; - -#include "movestack.c" -#include "shift-tools.c" -#include - -static const Keychord *keychords[] = { - /* modifier key chord function argument */ - // &((Keychord){1, {{MODKEY, XK_}}, spawn, {} }), - &((Keychord){1, {{MODKEY | ControlMask | ShiftMask, XK_apostrophe}}, quit, {0} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_apostrophe}}, quit, {1} }), - - &((Keychord){1, {{MODKEY, XK_apostrophe}}, killclient, {0} }), - - &((Keychord){1, {{MODKEY, XK_a}}, spawn, {.v = dmenucmd} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_Return}}, spawn, {.v = termcmd} }), - &((Keychord){1, {{MODKEY, XK_Escape}}, spawn, {.v = slockcmd} }), - - &((Keychord){1, {{MODKEY, XK_l}}, shiftviewclients, {.i = +1} }), - &((Keychord){1, {{MODKEY, XK_h}}, shiftviewclients, {.i = -1} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_l}}, shiftview, {.i = +1} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_h}}, shiftview, {.i = -1} }), - &((Keychord){1, {{MODKEY | ControlMask, XK_l}}, shiftboth, {.i = +1} }), - &((Keychord){1, {{MODKEY | ControlMask, XK_h}}, shiftboth, {.i = -1} }), - &((Keychord){1, {{MODKEY | ControlMask | ShiftMask, XK_l}}, shiftswaptags, {.i = +1} }), - &((Keychord){1, {{MODKEY | ControlMask | ShiftMask, XK_h}}, shiftswaptags, {.i = -1} }), - - &((Keychord){1, {{MODKEY, XK_j}}, focusstack, {.i = +1} }), - &((Keychord){1, {{MODKEY, XK_k}}, focusstack, {.i = -1} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_v}}, incnmaster, {.i = +1} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_w}}, incnmaster, {.i = -1} }), - &((Keychord){1, {{MODKEY, XK_equal}}, setmfact, {.f = +0.05} }), - &((Keychord){1, {{MODKEY, XK_minus}}, setmfact, {.f = -0.05} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_j}}, movestack, {.i = +1} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_k}}, movestack, {.i = -1} }), - &((Keychord){1, {{MODKEY, XK_Return}}, zoom, {0} }), - &((Keychord){1, {{MODKEY, XK_Tab}}, view, {0} }), - - &((Keychord){2, {{MODKEY, XK_w}, {MODKEY, XK_t}}, setlayout, {.v = &layouts[0]} }), - &((Keychord){2, {{MODKEY, XK_w}, {MODKEY, XK_m}}, setlayout, {.v = &layouts[1]} }), - &((Keychord){2, {{MODKEY, XK_w}, {MODKEY, XK_f}}, setlayout, {.v = &layouts[2]} }), - &((Keychord){1, {{MODKEY, XK_F11}}, fullscreen, {0} }), - &((Keychord){1, {{MODKEY, XK_space}}, setlayout, {0} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_space}}, togglefloating, {0} }), - &((Keychord){1, {{MODKEY, XK_b}}, togglebar, {0} }), - - &((Keychord){1, {{MODKEY, XK_0}}, view, {.ui = ~0} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_0}}, tag, {.ui = ~0} }), - &((Keychord){1, {{MODKEY, XK_comma}}, focusmon, {.i = -1} }), - &((Keychord){1, {{MODKEY, XK_period}}, focusmon, {.i = +1} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_comma}}, tagmon, {.i = -1} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_period}}, tagmon, {.i = +1} }), - - &((Keychord){1, {{MODKEY | ShiftMask, XK_s}}, spawn, {.v = (const char *[]){"sysact", NULL}} }), - - &((Keychord){1, {{MODKEY | ShiftMask, XK_o}}, spawn, {.v = (const char *[]){"set-default-sink", NULL}} }), - &((Keychord){1, {{MODKEY | ShiftMask, XK_i}}, spawn, {.v = (const char *[]){"set-default-source", NULL}} }), - - &((Keychord){2, {{MODKEY, XK_m}, {MODKEY, XK_a}}, spawn, {.v = (const char *[]){"dmenumusic", NULL}} }), - &((Keychord){2, {{MODKEY, XK_m}, {MODKEY, XK_p}}, spawn, {.v = (const char *[]){"mpc", "toggle", NULL}} }), - &((Keychord){2, {{MODKEY, XK_m}, {MODKEY, XK_l}}, spawn, {.v = (const char *[]){"mpc", "next", NULL}} }), - &((Keychord){2, {{MODKEY, XK_m}, {MODKEY, XK_h}}, spawn, {.v = (const char *[]){"mpc", "prev", NULL}} }), - &((Keychord){1, {{MODKEY, XF86XK_AudioPlay}}, spawn, {.v = (const char *[]){"mpc", "toggle", NULL}} }), - &((Keychord){1, {{MODKEY, XF86XK_AudioNext}}, spawn, {.v = (const char *[]){"mpc", "next", NULL}} }), - &((Keychord){1, {{MODKEY, XF86XK_AudioPrev}}, spawn, {.v = (const char *[]){"mpc", "prev", NULL}} }), - - &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_l}}, spawn, {.v = (const char *[]){TERMINAL, "-e", "lf", NULL}} }), - &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_f}}, spawn, {.v = (const char *[]){"firefox", NULL}} }), - &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_n}}, spawn, {.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}} }), - &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_m}}, spawn, {.v = (const char *[]){TERMINAL, "-e", "gotop", NULL}} }), - &((Keychord){2, {{MODKEY, XK_o}, {MODKEY, XK_t}}, spawn, {.v = (const char *[]){"thunar, NULL}} }), - - &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_h}}, spawn, {.v = (const char *[]){"dmenuhandler", NULL}} }), - &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_m}}, spawn, {.v = (const char *[]){"mounter", NULL}} }), - &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_c}}, spawn, {.v = (const char *[]){"dmenumountcifs", NULL}} }), - &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_u}}, spawn, {.v = (const char *[]){"unmounter", NULL}} }), - &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_s}}, spawn, {.v = (const char *[]){"dmenusearch", "duckduckgo", NULL}} }), - &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_l}}, spawn, {.v = (const char *[]){"linkhandler", NULL}} }), - - &((Keychord){2, {{MODKEY, XK_d}, {MODKEY, XK_b}}, spawn, SHCMD("dmenu-bluetooth -i -l 25") }), - - &((Keychord){1, {{MODKEY | ShiftMask, XK_t}}, spawn, SHCMD("trayer-toggle trayer --edge top --align center --widthtype request " "--padding 6 --SetDockType true --SetPartialStrut true --expand " "true --transparent true --alpha 0 --tint 0x262626 --height 18 &") }), - - &((Keychord){1, {{MODKEY | ControlMask, XK_period}}, spawn, {.v = (const char *[]){"sd", NULL}} }), - - &((Keychord){1, {{MODKEY, XK_f}}, spawn, {.v = (const char *[]){"screenlayout", NULL}} }), - - &((Keychord){1, {{MODKEY, XK_F1}}, spawn, {.v = (const char *[]){"kbswitcher", NULL}} }), - - &((Keychord){1, {{0, XF86XK_AudioMute}}, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -37 $(pidof " "dwmblocks)") }), - &((Keychord){1, {{0, XF86XK_AudioRaiseVolume}}, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -37 $(pidof " "dwmblocks)") }), - &((Keychord){1, {{0, XF86XK_AudioLowerVolume}}, spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -37 $(pidof " "dwmblocks)") }), - &((Keychord){1, {{0, XF86XK_AudioMicMute}}, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle; kill -37 $(pidof " "dwmblocks)") }), - &((Keychord){1, {{MODKEY, XK_v}}, spawn, {.v = (const char *[]){"setvol", NULL}} }), - - &((Keychord){1, {{0, XF86XK_MonBrightnessUp}}, spawn, {.v = (const char *[]){"mod_backlight", "up", NULL}} }), - &((Keychord){1, {{0, XF86XK_MonBrightnessDown}}, spawn, {.v = (const char *[]){"mod_backlight", "down", NULL}} }), - - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) - TAGKEYS( XK_4, 3) - TAGKEYS( XK_5, 4) - TAGKEYS( XK_6, 5) - TAGKEYS( XK_7, 6) - TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8) -}; - -/* button definitions */ -/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, - * ClkClientWin, or ClkRootWin */ -static Button buttons[] = { - /* click event mask button function argument */ - {ClkLtSymbol, 0, Button1, setlayout, {0}}, - {ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]}}, - {ClkWinTitle, 0, Button2, zoom, {0}}, - {ClkStatusText, 0, Button1, sigstatusbar, {.i = 1}}, - {ClkStatusText, 0, Button2, sigstatusbar, {.i = 2}}, - {ClkStatusText, 0, Button3, sigstatusbar, {.i = 3}}, - {ClkStatusText, 0, Button4, sigstatusbar, {.i = 4}}, - {ClkStatusText, 0, Button5, sigstatusbar, {.i = 5}}, - {ClkStatusText, ShiftMask, Button1, sigstatusbar, {.i = 6}}, - {ClkClientWin, MODKEY, Button1, movemouse, {0}}, - {ClkClientWin, MODKEY, Button2, togglefloating, {0}}, - {ClkClientWin, MODKEY, Button3, resizemouse, {0}}, - {ClkTagBar, 0, Button1, view, {0}}, - {ClkTagBar, 0, Button3, toggleview, {0}}, - {ClkTagBar, MODKEY, Button1, tag, {0}}, - {ClkTagBar, MODKEY, Button3, toggletag, {0}}, -}; - diff --git a/drw.o b/drw.o deleted file mode 100644 index dbafb16..0000000 Binary files a/drw.o and /dev/null differ