diff options
| -rw-r--r-- | config.def.h | 163 | ||||
| -rw-r--r-- | config.h | 163 | ||||
| -rw-r--r-- | dwm.c | 2 |
3 files changed, 165 insertions, 163 deletions
diff --git a/config.def.h b/config.def.h index a13a12a..cdca826 100644 --- a/config.def.h +++ b/config.def.h @@ -86,91 +86,92 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *termcmd[] = { "alacritty", NULL }; -static const char *cooltermcmd[] = { "cool-retro-term", NULL }; -static const char *dmenucmd[] = { "dmenu_run", "-i", "-m", "0", NULL }; -static const char *dmpccmd[] = { "/home/jozan/.local/bin/dmpc", NULL }; -static const char *dmkillcmd[] = { "/home/jozan/.local/bin/dmkill", NULL }; -static const char *dmsearchcmd[] = { "/home/jozan/.local/bin/dmsearch", NULL }; -static const char *dmscrotcmd[] = { "/home/jozan/.local/bin/dmscrot", NULL }; -static const char *dmlogcmd[] = { "/home/jozan/.local/bin/dmlog", NULL }; -static const char *dmpassfullcmd[] = { "/home/jozan/.local/bin/dmpass", "--full", NULL }; -static const char *dmpasscmd[] = { "/home/jozan/.local/bin/dmpass", NULL }; -static const char *dmotpcmd[] = { "/home/jozan/.local/bin/dmotp", NULL }; -static const char *ndatecmd[] = { "/home/jozan/.local/bin/ndate", NULL }; -static const char *filecmd[] = { "alacritty", "-e", "zsh", "-ic", "lf", NULL }; -static const char *editcmd[] = { "emacsclient", "-c", NULL }; -static const char *browsercmd[] = { "iridium", "--force-dark-mode", NULL }; -static const char *torbrocmd[] = { "torify", "iridium", "--force-dark-mode", NULL }; -static const char *w3mcmd[] = { "alacritty", "-e", "w3m", "https://start.duckduckgo.com/", NULL }; -static const char *nbcmd[] = { "alacritty", "-e", "newsboat", NULL }; -static const char *ncmpccmd[] = { "alacritty", "-e", "ncmpc", NULL }; -static const char *calcmd[] = { "alacritty", "-e", "calcurse", "-C", "/home/jozan/.config/calcurse", "-D", "/home/jozan/.local/share/calcurse", NULL }; -static const char *sclicmd[] = { "alacritty", "-e", "scli", NULL }; -static const char *muttcmd[] = { "alacritty", "-e", "neomutt", NULL }; -static const char *gotopcmd[] = { "alacritty", "-e", "gotop", NULL }; -static const char *htopcmd[] = { "alacritty", "-e", "htop", NULL }; -static const char *topcmd[] = { "alacritty", "-e", "top", NULL }; -static const char *blinccmd[] = { "xbacklight", "-inc", "10", NULL }; -static const char *bldeccmd[] = { "xbacklight", "-dec", "10", NULL }; -static const char *voltogcmd[] = { "/home/jozan/.local/bin/mixer-set", "toggle", NULL }; -static const char *voldeccmd[] = { "/home/jozan/.local/bin/mixer-set", "lower", NULL }; -static const char *volinccmd[] = { "/home/jozan/.local/bin/mixer-set", "raise", NULL }; -static const char *miccmd[] = { "/home/jozan/.local/bin/mic", NULL }; -static const char *mpcprevcmd[] = { "mpc", "prev", NULL }; -static const char *mpcnextcmd[] = { "mpc", "next", NULL }; -static const char *mpctogcmd[] = { "mpc", "toggle", NULL }; -static const char *mpcstopcmd[] = { "mpc", "stop", NULL }; -static const char *killespeak[] = { "/home/jozan/.local/bin/shutup", NULL }; +static const char *term_cmd[] = { "alacritty", NULL }; +static const char *coolterm_cmd[] = { "cool-retro-term", NULL }; +static const char *dmenu_cmd[] = { "dmenu_run", "-i", "-m", "0", NULL }; +static const char *dmpc_cmd[] = { "/home/jozan/.local/bin/dmpc", NULL }; +static const char *dmkill_cmd[] = { "/home/jozan/.local/bin/dmkill", NULL }; +static const char *dmsearch_cmd[] = { "/home/jozan/.local/bin/dmsearch", NULL }; +static const char *dmscrot_cmd[] = { "/home/jozan/.local/bin/dmscrot", NULL }; +static const char *dmlog_cmd[] = { "/home/jozan/.local/bin/dmlog", NULL }; +static const char *dmpass_full_cmd[] = { "/home/jozan/.local/bin/dmpass", "--full", NULL }; +static const char *dmpass_cmd[] = { "/home/jozan/.local/bin/dmpass", NULL }; +static const char *dmotp_cmd[] = { "/home/jozan/.local/bin/dmotp", NULL }; +static const char *ndate_cmd[] = { "/home/jozan/.local/bin/ndate", NULL }; +static const char *file_cmd[] = { "alacritty", "-e", "zsh", "-ic", "lf", NULL }; +static const char *file_alt_cmd[] = { "pcmanfm", NULL }; +static const char *edit_cmd[] = { "emacsclient", "-c", NULL }; +static const char *browser_cmd[] = { "iridium", "--force-dark-mode", NULL }; +static const char *torbro_cmd[] = { "torify", "iridium", "--force-dark-mode", NULL }; +static const char *w3m_cmd[] = { "alacritty", "-e", "w3m", "https://start.duckduckgo.com/", NULL }; +static const char *nb_cmd[] = { "alacritty", "-e", "newsboat", NULL }; +static const char *ncmpc_cmd[] = { "alacritty", "-e", "ncmpc", NULL }; +static const char *cal_cmd[] = { "alacritty", "-e", "calcurse", "-C", "/home/jozan/.config/calcurse", "-D", "/home/jozan/.local/share/calcurse", NULL }; +static const char *scli_cmd[] = { "alacritty", "-e", "scli", NULL }; +static const char *mutt_cmd[] = { "alacritty", "-e", "neomutt", NULL }; +static const char *gotop_cmd[] = { "alacritty", "-e", "gotop", NULL }; +static const char *htop_cmd[] = { "alacritty", "-e", "htop", NULL }; +static const char *top_cmd[] = { "alacritty", "-e", "top", NULL }; +static const char *bl_inc_cmd[] = { "xbacklight", "-inc", "10", NULL }; +static const char *bl_dec_cmd[] = { "xbacklight", "-dec", "10", NULL }; +static const char *vol_tog_cmd[] = { "/home/jozan/.local/bin/mixer-set", "toggle", NULL }; +static const char *vol_dec_cmd[] = { "/home/jozan/.local/bin/mixer-set", "lower", NULL }; +static const char *vol_inc_cmd[] = { "/home/jozan/.local/bin/mixer-set", "raise", NULL }; +static const char *mic_cmd[] = { "/home/jozan/.local/bin/mic", NULL }; +static const char *mpc_prev_cmd[] = { "mpc", "prev", NULL }; +static const char *mpc_next_cmd[] = { "mpc", "next", NULL }; +static const char *mpc_tog_cmd[] = { "mpc", "toggle", NULL }; +static const char *mpc_stop_cmd[] = { "mpc", "stop", NULL }; +static const char *killespeak_cmd[] = { "/home/jozan/.local/bin/shutup", NULL }; #include "movestack.c" #include <X11/XF86keysym.h> static Key keys[] = { /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY|ControlMask, XK_Return, spawn, {.v = cooltermcmd } }, - { MODKEY, XK_F1, spawn, {.v = filecmd } }, - { MODKEY, XK_F2, spawn, {.v = editcmd } }, - { MODKEY, XK_F3, spawn, {.v = browsercmd } }, - { MODKEY|ShiftMask, XK_F3, spawn, {.v = torbrocmd } }, - { MODKEY, XK_F4, spawn, {.v = w3mcmd } }, - { MODKEY, XK_F5, spawn, {.v = ncmpccmd } }, - { MODKEY, XK_F6, spawn, {.v = nbcmd} }, - { MODKEY, XK_F7, spawn, {.v = calcmd } }, - { MODKEY, XK_F8, spawn, {.v = sclicmd } }, - { MODKEY, XK_F9, spawn, {.v = muttcmd } }, - { MODKEY, XK_F10, spawn, {.v = gotopcmd } }, - { MODKEY, XK_F11, spawn, {.v = htopcmd } }, - { MODKEY, XK_F12, spawn, {.v = topcmd } }, - { MODKEY|ShiftMask, XK_F6, spawn, {.v = mpcprevcmd } }, - { MODKEY|ShiftMask, XK_F7, spawn, {.v = mpctogcmd } }, - { MODKEY|ShiftMask, XK_F8, spawn, {.v = mpcnextcmd } }, - { MODKEY|ShiftMask, XK_F9, spawn, {.v = mpcstopcmd } }, - { MODKEY|ShiftMask, XK_F10, spawn, {.v = voltogcmd } }, - { MODKEY|ShiftMask, XK_F11, spawn, {.v = voldeccmd } }, - { MODKEY|ShiftMask, XK_F12, spawn, {.v = volinccmd } }, - { MODKEY|ShiftMask, XK_Delete, spawn, {.v = miccmd } }, - { MODKEY|ControlMask, XK_F9, spawn, {.v = dmkillcmd } }, - { MODKEY|ControlMask, XK_F10, spawn, {.v = dmscrotcmd } }, - { MODKEY|ControlMask, XK_F11, spawn, {.v = dmsearchcmd } }, - { MODKEY|ControlMask, XK_F12, spawn, {.v = dmlogcmd } }, - { MODKEY|ControlMask, XK_BackSpace, spawn, {.v = dmlogcmd } }, - { MODKEY, XK_BackSpace, spawn, {.v = dmpccmd } }, - { MODKEY|ControlMask, XK_p, spawn, {.v = dmpasscmd } }, - { MODKEY|ControlMask|ShiftMask, XK_p, spawn, {.v = dmpassfullcmd } }, - { MODKEY|ControlMask, XK_o, spawn, {.v = dmotpcmd } }, - { MODKEY, XK_End, spawn, {.v = ndatecmd } }, - { 0, XF86XK_MonBrightnessUp, spawn, {.v = blinccmd } }, - { 0, XF86XK_MonBrightnessDown, spawn, {.v = bldeccmd } }, - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volinccmd } }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = voldeccmd } }, - { 0, XF86XK_AudioMute, spawn, {.v = voltogcmd } }, - { 0, XF86XK_AudioMute, spawn, {.v = voltogcmd } }, - { 0, XF86XK_AudioPlay, spawn, {.v = mpctogcmd } }, - { 0, XF86XK_AudioPrev, spawn, {.v = mpcprevcmd } }, - { 0, XF86XK_AudioNext, spawn, {.v = mpcnextcmd } }, - { MODKEY, XK_Delete, spawn, {.v = killespeak } }, + { MODKEY, XK_p, spawn, {.v = dmenu_cmd } }, + { MODKEY, XK_Return, spawn, {.v = term_cmd } }, + { MODKEY|ControlMask, XK_Return, spawn, {.v = coolterm_cmd } }, + { MODKEY, XK_F1, spawn, {.v = file_cmd } }, + { MODKEY|ShiftMask, XK_F1, spawn, {.v = file_alt_cmd } }, + { MODKEY, XK_F2, spawn, {.v = edit_cmd } }, + { MODKEY, XK_F3, spawn, {.v = browser_cmd } }, + { MODKEY|ShiftMask, XK_F3, spawn, {.v = torbro_cmd } }, + { MODKEY, XK_F4, spawn, {.v = w3m_cmd } }, + { MODKEY, XK_F5, spawn, {.v = ncmpc_cmd } }, + { MODKEY, XK_F6, spawn, {.v = nb_cmd} }, + { MODKEY, XK_F7, spawn, {.v = cal_cmd } }, + { MODKEY, XK_F8, spawn, {.v = scli_cmd } }, + { MODKEY, XK_F9, spawn, {.v = mutt_cmd } }, + { MODKEY, XK_F10, spawn, {.v = gotop_cmd } }, + { MODKEY, XK_F11, spawn, {.v = htop_cmd } }, + { MODKEY, XK_F12, spawn, {.v = top_cmd } }, + { MODKEY|ShiftMask, XK_F6, spawn, {.v = mpc_prev_cmd } }, + { MODKEY|ShiftMask, XK_F7, spawn, {.v = mpc_tog_cmd } }, + { MODKEY|ShiftMask, XK_F8, spawn, {.v = mpc_next_cmd } }, + { MODKEY|ShiftMask, XK_F9, spawn, {.v = mpc_stop_cmd } }, + { MODKEY|ShiftMask, XK_F10, spawn, {.v = vol_tog_cmd } }, + { MODKEY|ShiftMask, XK_F11, spawn, {.v = vol_dec_cmd } }, + { MODKEY|ShiftMask, XK_F12, spawn, {.v = vol_inc_cmd } }, + { MODKEY|ShiftMask, XK_Delete, spawn, {.v = mic_cmd } }, + { MODKEY|ControlMask, XK_F9, spawn, {.v = dmkill_cmd } }, + { MODKEY|ControlMask, XK_F10, spawn, {.v = dmscrot_cmd } }, + { MODKEY|ControlMask, XK_F11, spawn, {.v = dmsearch_cmd } }, + { MODKEY|ControlMask, XK_F12, spawn, {.v = dmlog_cmd } }, + { MODKEY|ControlMask, XK_BackSpace, spawn, {.v = dmlog_cmd } }, + { MODKEY, XK_BackSpace, spawn, {.v = dmpc_cmd } }, + { MODKEY|ControlMask, XK_p, spawn, {.v = dmpass_cmd } }, + { MODKEY|ControlMask|ShiftMask, XK_p, spawn, {.v = dmpass_full_cmd } }, + { MODKEY|ControlMask, XK_o, spawn, {.v = dmotp_cmd } }, + { MODKEY, XK_End, spawn, {.v = ndate_cmd } }, + { 0, XF86XK_MonBrightnessUp, spawn, {.v = bl_inc_cmd } }, + { 0, XF86XK_MonBrightnessDown, spawn, {.v = bl_dec_cmd } }, + { 0, XF86XK_AudioRaiseVolume, spawn, {.v = vol_inc_cmd } }, + { 0, XF86XK_AudioLowerVolume, spawn, {.v = vol_dec_cmd } }, + { 0, XF86XK_AudioMute, spawn, {.v = vol_tog_cmd } }, + { 0, XF86XK_AudioPlay, spawn, {.v = mpc_tog_cmd } }, + { 0, XF86XK_AudioPrev, spawn, {.v = mpc_prev_cmd } }, + { 0, XF86XK_AudioNext, spawn, {.v = mpc_next_cmd } }, + { MODKEY, XK_Delete, spawn, {.v = killespeak_cmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, @@ -239,7 +240,7 @@ static Button buttons[] = { { ClkLtSymbol, 0, Button1, setlayout, {0} }, { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, { ClkWinTitle, 0, Button2, zoom, {0} }, - { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, + { ClkStatusText, 0, Button2, spawn, {.v = term_cmd } }, { ClkClientWin, MODKEY, Button1, movemouse, {0} }, { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, @@ -86,91 +86,92 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *termcmd[] = { "alacritty", NULL }; -static const char *cooltermcmd[] = { "cool-retro-term", NULL }; -static const char *dmenucmd[] = { "dmenu_run", "-i", "-m", "0", NULL }; -static const char *dmpccmd[] = { "/home/jozan/.local/bin/dmpc", NULL }; -static const char *dmkillcmd[] = { "/home/jozan/.local/bin/dmkill", NULL }; -static const char *dmsearchcmd[] = { "/home/jozan/.local/bin/dmsearch", NULL }; -static const char *dmscrotcmd[] = { "/home/jozan/.local/bin/dmscrot", NULL }; -static const char *dmlogcmd[] = { "/home/jozan/.local/bin/dmlog", NULL }; -static const char *dmpassfullcmd[] = { "/home/jozan/.local/bin/dmpass", "--full", NULL }; -static const char *dmpasscmd[] = { "/home/jozan/.local/bin/dmpass", NULL }; -static const char *dmotpcmd[] = { "/home/jozan/.local/bin/dmotp", NULL }; -static const char *ndatecmd[] = { "/home/jozan/.local/bin/ndate", NULL }; -static const char *filecmd[] = { "alacritty", "-e", "zsh", "-ic", "lf", NULL }; -static const char *editcmd[] = { "emacsclient", "-c", NULL }; -static const char *browsercmd[] = { "iridium", "--force-dark-mode", NULL }; -static const char *torbrocmd[] = { "torify", "iridium", "--force-dark-mode", NULL }; -static const char *w3mcmd[] = { "alacritty", "-e", "w3m", "https://start.duckduckgo.com/", NULL }; -static const char *nbcmd[] = { "alacritty", "-e", "newsboat", NULL }; -static const char *ncmpccmd[] = { "alacritty", "-e", "ncmpc", NULL }; -static const char *calcmd[] = { "alacritty", "-e", "calcurse", "-C", "/home/jozan/.config/calcurse", "-D", "/home/jozan/.local/share/calcurse", NULL }; -static const char *sclicmd[] = { "alacritty", "-e", "scli", NULL }; -static const char *muttcmd[] = { "alacritty", "-e", "neomutt", NULL }; -static const char *gotopcmd[] = { "alacritty", "-e", "gotop", NULL }; -static const char *htopcmd[] = { "alacritty", "-e", "htop", NULL }; -static const char *topcmd[] = { "alacritty", "-e", "top", NULL }; -static const char *blinccmd[] = { "xbacklight", "-inc", "10", NULL }; -static const char *bldeccmd[] = { "xbacklight", "-dec", "10", NULL }; -static const char *voltogcmd[] = { "/home/jozan/.local/bin/mixer-set", "toggle", NULL }; -static const char *voldeccmd[] = { "/home/jozan/.local/bin/mixer-set", "lower", NULL }; -static const char *volinccmd[] = { "/home/jozan/.local/bin/mixer-set", "raise", NULL }; -static const char *miccmd[] = { "/home/jozan/.local/bin/mic", NULL }; -static const char *mpcprevcmd[] = { "mpc", "prev", NULL }; -static const char *mpcnextcmd[] = { "mpc", "next", NULL }; -static const char *mpctogcmd[] = { "mpc", "toggle", NULL }; -static const char *mpcstopcmd[] = { "mpc", "stop", NULL }; -static const char *killespeak[] = { "/home/jozan/.local/bin/shutup", NULL }; +static const char *term_cmd[] = { "alacritty", NULL }; +static const char *coolterm_cmd[] = { "cool-retro-term", NULL }; +static const char *dmenu_cmd[] = { "dmenu_run", "-i", "-m", "0", NULL }; +static const char *dmpc_cmd[] = { "/home/jozan/.local/bin/dmpc", NULL }; +static const char *dmkill_cmd[] = { "/home/jozan/.local/bin/dmkill", NULL }; +static const char *dmsearch_cmd[] = { "/home/jozan/.local/bin/dmsearch", NULL }; +static const char *dmscrot_cmd[] = { "/home/jozan/.local/bin/dmscrot", NULL }; +static const char *dmlog_cmd[] = { "/home/jozan/.local/bin/dmlog", NULL }; +static const char *dmpass_full_cmd[] = { "/home/jozan/.local/bin/dmpass", "--full", NULL }; +static const char *dmpass_cmd[] = { "/home/jozan/.local/bin/dmpass", NULL }; +static const char *dmotp_cmd[] = { "/home/jozan/.local/bin/dmotp", NULL }; +static const char *ndate_cmd[] = { "/home/jozan/.local/bin/ndate", NULL }; +static const char *file_cmd[] = { "alacritty", "-e", "zsh", "-ic", "lf", NULL }; +static const char *file_alt_cmd[] = { "pcmanfm", NULL }; +static const char *edit_cmd[] = { "emacsclient", "-c", NULL }; +static const char *browser_cmd[] = { "iridium", "--force-dark-mode", NULL }; +static const char *torbro_cmd[] = { "torify", "iridium", "--force-dark-mode", NULL }; +static const char *w3m_cmd[] = { "alacritty", "-e", "w3m", "https://start.duckduckgo.com/", NULL }; +static const char *nb_cmd[] = { "alacritty", "-e", "newsboat", NULL }; +static const char *ncmpc_cmd[] = { "alacritty", "-e", "ncmpc", NULL }; +static const char *cal_cmd[] = { "alacritty", "-e", "calcurse", "-C", "/home/jozan/.config/calcurse", "-D", "/home/jozan/.local/share/calcurse", NULL }; +static const char *scli_cmd[] = { "alacritty", "-e", "scli", NULL }; +static const char *mutt_cmd[] = { "alacritty", "-e", "neomutt", NULL }; +static const char *gotop_cmd[] = { "alacritty", "-e", "gotop", NULL }; +static const char *htop_cmd[] = { "alacritty", "-e", "htop", NULL }; +static const char *top_cmd[] = { "alacritty", "-e", "top", NULL }; +static const char *bl_inc_cmd[] = { "xbacklight", "-inc", "10", NULL }; +static const char *bl_dec_cmd[] = { "xbacklight", "-dec", "10", NULL }; +static const char *vol_tog_cmd[] = { "/home/jozan/.local/bin/mixer-set", "toggle", NULL }; +static const char *vol_dec_cmd[] = { "/home/jozan/.local/bin/mixer-set", "lower", NULL }; +static const char *vol_inc_cmd[] = { "/home/jozan/.local/bin/mixer-set", "raise", NULL }; +static const char *mic_cmd[] = { "/home/jozan/.local/bin/mic", NULL }; +static const char *mpc_prev_cmd[] = { "mpc", "prev", NULL }; +static const char *mpc_next_cmd[] = { "mpc", "next", NULL }; +static const char *mpc_tog_cmd[] = { "mpc", "toggle", NULL }; +static const char *mpc_stop_cmd[] = { "mpc", "stop", NULL }; +static const char *killespeak_cmd[] = { "/home/jozan/.local/bin/shutup", NULL }; #include "movestack.c" #include <X11/XF86keysym.h> static Key keys[] = { /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY|ControlMask, XK_Return, spawn, {.v = cooltermcmd } }, - { MODKEY, XK_F1, spawn, {.v = filecmd } }, - { MODKEY, XK_F2, spawn, {.v = editcmd } }, - { MODKEY, XK_F3, spawn, {.v = browsercmd } }, - { MODKEY|ShiftMask, XK_F3, spawn, {.v = torbrocmd } }, - { MODKEY, XK_F4, spawn, {.v = w3mcmd } }, - { MODKEY, XK_F5, spawn, {.v = ncmpccmd } }, - { MODKEY, XK_F6, spawn, {.v = nbcmd} }, - { MODKEY, XK_F7, spawn, {.v = calcmd } }, - { MODKEY, XK_F8, spawn, {.v = sclicmd } }, - { MODKEY, XK_F9, spawn, {.v = muttcmd } }, - { MODKEY, XK_F10, spawn, {.v = gotopcmd } }, - { MODKEY, XK_F11, spawn, {.v = htopcmd } }, - { MODKEY, XK_F12, spawn, {.v = topcmd } }, - { MODKEY|ShiftMask, XK_F6, spawn, {.v = mpcprevcmd } }, - { MODKEY|ShiftMask, XK_F7, spawn, {.v = mpctogcmd } }, - { MODKEY|ShiftMask, XK_F8, spawn, {.v = mpcnextcmd } }, - { MODKEY|ShiftMask, XK_F9, spawn, {.v = mpcstopcmd } }, - { MODKEY|ShiftMask, XK_F10, spawn, {.v = voltogcmd } }, - { MODKEY|ShiftMask, XK_F11, spawn, {.v = voldeccmd } }, - { MODKEY|ShiftMask, XK_F12, spawn, {.v = volinccmd } }, - { MODKEY|ShiftMask, XK_Delete, spawn, {.v = miccmd } }, - { MODKEY|ControlMask, XK_F9, spawn, {.v = dmkillcmd } }, - { MODKEY|ControlMask, XK_F10, spawn, {.v = dmscrotcmd } }, - { MODKEY|ControlMask, XK_F11, spawn, {.v = dmsearchcmd } }, - { MODKEY|ControlMask, XK_F12, spawn, {.v = dmlogcmd } }, - { MODKEY|ControlMask, XK_BackSpace, spawn, {.v = dmlogcmd } }, - { MODKEY, XK_BackSpace, spawn, {.v = dmpccmd } }, - { MODKEY|ControlMask, XK_p, spawn, {.v = dmpasscmd } }, - { MODKEY|ControlMask|ShiftMask, XK_p, spawn, {.v = dmpassfullcmd } }, - { MODKEY|ControlMask, XK_o, spawn, {.v = dmotpcmd } }, - { MODKEY, XK_End, spawn, {.v = ndatecmd } }, - { 0, XF86XK_MonBrightnessUp, spawn, {.v = blinccmd } }, - { 0, XF86XK_MonBrightnessDown, spawn, {.v = bldeccmd } }, - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volinccmd } }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = voldeccmd } }, - { 0, XF86XK_AudioMute, spawn, {.v = voltogcmd } }, - { 0, XF86XK_AudioMute, spawn, {.v = voltogcmd } }, - { 0, XF86XK_AudioPlay, spawn, {.v = mpctogcmd } }, - { 0, XF86XK_AudioPrev, spawn, {.v = mpcprevcmd } }, - { 0, XF86XK_AudioNext, spawn, {.v = mpcnextcmd } }, - { MODKEY, XK_Delete, spawn, {.v = killespeak } }, + { MODKEY, XK_p, spawn, {.v = dmenu_cmd } }, + { MODKEY, XK_Return, spawn, {.v = term_cmd } }, + { MODKEY|ControlMask, XK_Return, spawn, {.v = coolterm_cmd } }, + { MODKEY, XK_F1, spawn, {.v = file_cmd } }, + { MODKEY|ShiftMask, XK_F1, spawn, {.v = file_alt_cmd } }, + { MODKEY, XK_F2, spawn, {.v = edit_cmd } }, + { MODKEY, XK_F3, spawn, {.v = browser_cmd } }, + { MODKEY|ShiftMask, XK_F3, spawn, {.v = torbro_cmd } }, + { MODKEY, XK_F4, spawn, {.v = w3m_cmd } }, + { MODKEY, XK_F5, spawn, {.v = ncmpc_cmd } }, + { MODKEY, XK_F6, spawn, {.v = nb_cmd} }, + { MODKEY, XK_F7, spawn, {.v = cal_cmd } }, + { MODKEY, XK_F8, spawn, {.v = scli_cmd } }, + { MODKEY, XK_F9, spawn, {.v = mutt_cmd } }, + { MODKEY, XK_F10, spawn, {.v = gotop_cmd } }, + { MODKEY, XK_F11, spawn, {.v = htop_cmd } }, + { MODKEY, XK_F12, spawn, {.v = top_cmd } }, + { MODKEY|ShiftMask, XK_F6, spawn, {.v = mpc_prev_cmd } }, + { MODKEY|ShiftMask, XK_F7, spawn, {.v = mpc_tog_cmd } }, + { MODKEY|ShiftMask, XK_F8, spawn, {.v = mpc_next_cmd } }, + { MODKEY|ShiftMask, XK_F9, spawn, {.v = mpc_stop_cmd } }, + { MODKEY|ShiftMask, XK_F10, spawn, {.v = vol_tog_cmd } }, + { MODKEY|ShiftMask, XK_F11, spawn, {.v = vol_dec_cmd } }, + { MODKEY|ShiftMask, XK_F12, spawn, {.v = vol_inc_cmd } }, + { MODKEY|ShiftMask, XK_Delete, spawn, {.v = mic_cmd } }, + { MODKEY|ControlMask, XK_F9, spawn, {.v = dmkill_cmd } }, + { MODKEY|ControlMask, XK_F10, spawn, {.v = dmscrot_cmd } }, + { MODKEY|ControlMask, XK_F11, spawn, {.v = dmsearch_cmd } }, + { MODKEY|ControlMask, XK_F12, spawn, {.v = dmlog_cmd } }, + { MODKEY|ControlMask, XK_BackSpace, spawn, {.v = dmlog_cmd } }, + { MODKEY, XK_BackSpace, spawn, {.v = dmpc_cmd } }, + { MODKEY|ControlMask, XK_p, spawn, {.v = dmpass_cmd } }, + { MODKEY|ControlMask|ShiftMask, XK_p, spawn, {.v = dmpass_full_cmd } }, + { MODKEY|ControlMask, XK_o, spawn, {.v = dmotp_cmd } }, + { MODKEY, XK_End, spawn, {.v = ndate_cmd } }, + { 0, XF86XK_MonBrightnessUp, spawn, {.v = bl_inc_cmd } }, + { 0, XF86XK_MonBrightnessDown, spawn, {.v = bl_dec_cmd } }, + { 0, XF86XK_AudioRaiseVolume, spawn, {.v = vol_inc_cmd } }, + { 0, XF86XK_AudioLowerVolume, spawn, {.v = vol_dec_cmd } }, + { 0, XF86XK_AudioMute, spawn, {.v = vol_tog_cmd } }, + { 0, XF86XK_AudioPlay, spawn, {.v = mpc_tog_cmd } }, + { 0, XF86XK_AudioPrev, spawn, {.v = mpc_prev_cmd } }, + { 0, XF86XK_AudioNext, spawn, {.v = mpc_next_cmd } }, + { MODKEY, XK_Delete, spawn, {.v = killespeak_cmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, @@ -239,7 +240,7 @@ static Button buttons[] = { { ClkLtSymbol, 0, Button1, setlayout, {0} }, { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, { ClkWinTitle, 0, Button2, zoom, {0} }, - { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, + { ClkStatusText, 0, Button2, spawn, {.v = term_cmd } }, { ClkClientWin, MODKEY, Button1, movemouse, {0} }, { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, @@ -1862,7 +1862,7 @@ sigchld(int unused) void spawn(const Arg *arg) { - if (arg->v == dmenucmd) + if (arg->v == dmenu_cmd) dmenumon[0] = '0' + selmon->num; if (fork() == 0) { if (dpy) |