From a2f59253c5bcdb8303002692e50cec5fc04f22a1 Mon Sep 17 00:00:00 2001 From: Alexander Rosenberg Date: Fri, 15 Sep 2023 22:14:05 -0700 Subject: [PATCH] Fix the last commit --- .gitignore | 2 + config.def.h | 202 ++++++++++++++++++++++++++------------------------- config.h | 154 --------------------------------------- config.mk | 43 ----------- 4 files changed, 104 insertions(+), 297 deletions(-) delete mode 100644 config.h delete mode 100644 config.mk diff --git a/.gitignore b/.gitignore index 095e840..b41245e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.o dwm +config.h +config.mk diff --git a/config.def.h b/config.def.h index 57b6e75..735cd3f 100644 --- a/config.def.h +++ b/config.def.h @@ -1,10 +1,10 @@ /* See LICENSE file for copyright and license details. */ /* appearance */ -static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int borderpx = 2; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ -static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */ +static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */ static const unsigned int systrayspacing = 2; /* systray spacing */ static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ static const int showsystray = 1; /* 0 means no systray */ @@ -17,11 +17,11 @@ static const char col_gray3[] = "#bbbbbb"; static const char col_gray4[] = "#eeeeee"; static const char col_acc[] = "#ff0000"; static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_acc, col_acc }, - [SchemeStatus] = { col_gray3, col_gray1, "#000000" }, // Statusbar right {text,background,not used but cannot be empty} - [SchemeTagsSel] = { col_gray4, col_acc, "#000000" }, // Tagbar left selected {text,background,not used but cannot be empty} + /* fg bg border */ + [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, + [SchemeSel] = { col_gray4, col_acc, col_acc }, + [SchemeStatus] = { col_gray3, col_gray1, "#000000" }, // Statusbar right {text,background,not used but cannot be empty} + [SchemeTagsSel] = { col_gray4, col_acc, "#000000" }, // Tagbar left selected {text,background,not used but cannot be empty} [SchemeTagsNorm] = { col_gray3, col_gray1, "#000000" }, // Tagbar left unselected {text,background,not used but cannot be empty} [SchemeInfoSel] = { col_gray3, col_gray1, "#000000" }, // infobar middle selected {text,background,not used but cannot be empty} [SchemeInfoNorm] = { col_gray3, col_gray1, "#000000" }, // infobar middle unselected {text,background,not used but cannot be empty} @@ -31,11 +31,11 @@ static const char *colors[][3] = { 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 */ + /* xprop(1): + * WM_CLASS(STRING) = instance, class + * WM_NAME(STRING) = title + */ + /* class instance title tags mask isfloating monitor */ {"firefox", "Toolkit", "Picture-in-Picture", -1, 1, -1}, }; @@ -46,107 +46,109 @@ static const int resizehints = 1; /* 1 means respect size hints in tiled resi 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 */ - { "><>", NULL }, /* no layout function means floating behavior */ - { "[M]", monocle }, + /* symbol arrange function */ + { "[]=", tile }, /* first entry is default */ + { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, }; /* key definitions */ #define MODKEY Mod4Mask #define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, comboview, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, combotag, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, + { MODKEY, KEY, comboview, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, combotag, {.ui = 1 << TAG} }, \ + { 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 } } /* commands */ -static const char *runcmd[] = { "dmenu_run", NULL }; -static const char *termcmd[] = { "alacritty", NULL }; -static const char *browsercmd[] = { "firefox", NULL }; -static const char *lockcmd[] = { "loginctl", "lock-session", NULL }; -static const char *passwdcmd[] = { "keepassxc", NULL }; -static const char *mailcmd[] = { "thunderbird", NULL }; -static const char *shotcmd[] = { "screenshot.sh", NULL }; -static const char *soundcmd[] = { "select-sound-output.sh", NULL }; -static const char *volupcmd[] = { "pamixer", "-i", "1", NULL }; -static const char *bigvolupcmd[] = { "pamixer", "-i", "5", NULL }; -static const char *voldowncmd[] = { "pamixer", "-d", "1", NULL }; -static const char *bigvoldowncmd[] = { "pamixer", "-d", "5", NULL }; -static const char *volmutecmd[] = { "pamixer", "-t", NULL }; -static const char *monbrightupcmd[] = { "brightness-control.sh", "up", NULL }; -static const char *monbrightdowncmd[] = { "brightness-control.sh", "down", NULL }; +static const char *runcmd[] = { "dmenu_run", NULL }; +static const char *termcmd[] = { "kitty", "-1", NULL }; +static const char *browsercmd[] = { "mullvad-browser", NULL }; +static const char *lockcmd[] = { "loginctl", "lock-session", NULL }; +static const char *passwdcmd[] = { "keepassxc", NULL }; +static const char *mailcmd[] = { "thunderbird", NULL }; +static const char *volupcmd[] = { "pamixer", "-i", "1", NULL }; +static const char *bigvolupcmd[] = { "pamixer", "-i", "5", NULL }; +static const char *voldowncmd[] = { "pamixer", "-d", "1", NULL }; +static const char *bigvoldowncmd[] = { "pamixer", "-d", "5", NULL }; +static const char *volmutecmd[] = { "pamixer", "-t", NULL }; +static const char *selectsoundcmd[] = { "select-sound-output.sh", NULL }; +static const char *screenshotcmd[] = { "screenshot.sh", NULL }; +static const char *notifyctxcmd[] = { "dunstctl", "context", NULL }; +static const char *closenotifycmd[] = { "dunstctl", "close", NULL }; +static const char *lastnotifycmd[] = { "dunstctl", "history-pop", NULL }; -static const Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = runcmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - { MODKEY|ShiftMask, XK_b, spawn, {.v = browsercmd } }, - { MODKEY|ShiftMask, XK_o, spawn, {.v = lockcmd } }, - { MODKEY|ShiftMask, XK_p, spawn, {.v = passwdcmd } }, - { MODKEY|ShiftMask, XK_m, spawn, {.v = mailcmd } }, - { MODKEY|ShiftMask, XK_t, spawn, {.v = shotcmd } }, - { MODKEY|ShiftMask, XK_n, spawn, {.v = soundcmd } }, - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volupcmd } }, - { ShiftMask, XF86XK_AudioRaiseVolume, spawn, {.v = bigvolupcmd } }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = voldowncmd } }, - { ShiftMask, XF86XK_AudioLowerVolume, spawn, {.v = bigvoldowncmd } }, - { 0, XF86XK_AudioMute, spawn, {.v = volmutecmd } }, - { 0, XF86XK_MonBrightnessUp, spawn, {.v = monbrightupcmd } }, - { 0, XF86XK_MonBrightnessDown, spawn, {.v = monbrightdowncmd } }, - { MODKEY|ShiftMask, XK_r, restart, {0} }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY, XK_i, incnmaster, {.i = +1 } }, - { MODKEY, XK_d, incnmaster, {.i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.25} }, - { MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.25} }, - { MODKEY|ShiftMask, XK_a, setcfact, {.f = 0.00} }, - { MODKEY, XK_Return, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, - { MODKEY, XK_x, killclient, {0} }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_space, setlayout, {0} }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, - { MODKEY|ShiftMask, XK_t, togglealwaysontop, {0} }, - { MODKEY, XK_0, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, - { MODKEY, XK_comma, focusmon, {.i = -1 } }, - { MODKEY, XK_period, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, - 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) - { MODKEY|ShiftMask, XK_q, quit, {0} }, +static Key keys[] = { + /* modifier key function argument */ + { MODKEY, XK_p, spawn, {.v = runcmd } }, + { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, + { MODKEY|ShiftMask, XK_b, spawn, {.v = browsercmd } }, + { MODKEY|ShiftMask, XK_o, spawn, {.v = lockcmd } }, + { MODKEY|ShiftMask, XK_p, spawn, {.v = passwdcmd } }, + { MODKEY|ShiftMask, XK_n, spawn, {.v = selectsoundcmd } }, + { MODKEY|ShiftMask, XK_m, spawn, {.v = mailcmd } }, + { MODKEY|ShiftMask, XK_s, spawn, {.v = screenshotcmd } }, + { MODKEY, XK_u, spawn, {.v = closenotifycmd } }, + { MODKEY|ShiftMask, XK_u, spawn, {.v = lastnotifycmd } }, + { MODKEY|ControlMask, XK_u, spawn, {.v = notifyctxcmd } }, + { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volupcmd } }, + { ShiftMask, XF86XK_AudioRaiseVolume, spawn, {.v = bigvolupcmd } }, + { 0, XF86XK_AudioLowerVolume, spawn, {.v = voldowncmd } }, + { ShiftMask, XF86XK_AudioLowerVolume, spawn, {.v = bigvoldowncmd } }, + { 0, XF86XK_AudioMute, spawn, {.v = volmutecmd } }, + { MODKEY|ShiftMask, XK_r, restart, {0} }, + { MODKEY, XK_b, togglebar, {0} }, + { MODKEY, XK_j, focusstack, {.i = +1 } }, + { MODKEY, XK_k, focusstack, {.i = -1 } }, + { MODKEY, XK_i, incnmaster, {.i = +1 } }, + { MODKEY, XK_d, incnmaster, {.i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, + { MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.25} }, + { MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.25} }, + { MODKEY|ShiftMask, XK_a, setcfact, {.f = 0.00} }, + { MODKEY, XK_Return, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY, XK_x, killclient, {0} }, + { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XK_space, setlayout, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY|ShiftMask, XK_t, togglealwaysontop, {0} }, + { MODKEY, XK_0, view, {.ui = ~0 } }, + { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, + { MODKEY, XK_comma, focusmon, {.i = -1 } }, + { MODKEY, XK_period, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, + 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) + { MODKEY|ShiftMask, XK_q, quit, {0} }, }; /* button definitions */ /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ -static const Button buttons[] = { - /* click event mask button function argument */ - { ClkTagBar, MODKEY, Button1, tag, {0} }, - { ClkTagBar, MODKEY, Button3, toggletag, {0} }, - { ClkWinTitle, 0, Button2, zoom, {0} }, - { 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} }, +static Button buttons[] = { + /* click event mask button function argument */ + { ClkTagBar, MODKEY, Button1, tag, {0} }, + { ClkTagBar, MODKEY, Button3, toggletag, {0} }, + { ClkWinTitle, 0, Button2, zoom, {0} }, + { 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/config.h b/config.h deleted file mode 100644 index 735cd3f..0000000 --- a/config.h +++ /dev/null @@ -1,154 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* appearance */ -static const unsigned int borderpx = 2; /* border pixel of windows */ -static const unsigned int snap = 32; /* snap pixel */ -static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ -static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */ -static const unsigned int systrayspacing = 2; /* systray spacing */ -static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ -static const int showsystray = 1; /* 0 means no systray */ -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:style=Medium:dpi=192:antialias=true:pixelsize=44" }; -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_acc[] = "#ff0000"; -static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_acc, col_acc }, - [SchemeStatus] = { col_gray3, col_gray1, "#000000" }, // Statusbar right {text,background,not used but cannot be empty} - [SchemeTagsSel] = { col_gray4, col_acc, "#000000" }, // Tagbar left selected {text,background,not used but cannot be empty} - [SchemeTagsNorm] = { col_gray3, col_gray1, "#000000" }, // Tagbar left unselected {text,background,not used but cannot be empty} - [SchemeInfoSel] = { col_gray3, col_gray1, "#000000" }, // infobar middle selected {text,background,not used but cannot be empty} - [SchemeInfoNorm] = { col_gray3, col_gray1, "#000000" }, // infobar middle unselected {text,background,not used but cannot be empty} -}; - -/* 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 */ - {"firefox", "Toolkit", "Picture-in-Picture", -1, 1, -1}, -}; - -/* layout(s) */ -static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ -static const int nmaster = 1; /* number of clients in master area */ -static const int resizehints = 1; /* 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 */ - { "><>", NULL }, /* no layout function means floating behavior */ - { "[M]", monocle }, -}; - -/* key definitions */ -#define MODKEY Mod4Mask -#define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, comboview, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, combotag, {.ui = 1 << TAG} }, \ - { 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 } } - -/* commands */ -static const char *runcmd[] = { "dmenu_run", NULL }; -static const char *termcmd[] = { "kitty", "-1", NULL }; -static const char *browsercmd[] = { "mullvad-browser", NULL }; -static const char *lockcmd[] = { "loginctl", "lock-session", NULL }; -static const char *passwdcmd[] = { "keepassxc", NULL }; -static const char *mailcmd[] = { "thunderbird", NULL }; -static const char *volupcmd[] = { "pamixer", "-i", "1", NULL }; -static const char *bigvolupcmd[] = { "pamixer", "-i", "5", NULL }; -static const char *voldowncmd[] = { "pamixer", "-d", "1", NULL }; -static const char *bigvoldowncmd[] = { "pamixer", "-d", "5", NULL }; -static const char *volmutecmd[] = { "pamixer", "-t", NULL }; -static const char *selectsoundcmd[] = { "select-sound-output.sh", NULL }; -static const char *screenshotcmd[] = { "screenshot.sh", NULL }; -static const char *notifyctxcmd[] = { "dunstctl", "context", NULL }; -static const char *closenotifycmd[] = { "dunstctl", "close", NULL }; -static const char *lastnotifycmd[] = { "dunstctl", "history-pop", NULL }; - -static Key keys[] = { - /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = runcmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - { MODKEY|ShiftMask, XK_b, spawn, {.v = browsercmd } }, - { MODKEY|ShiftMask, XK_o, spawn, {.v = lockcmd } }, - { MODKEY|ShiftMask, XK_p, spawn, {.v = passwdcmd } }, - { MODKEY|ShiftMask, XK_n, spawn, {.v = selectsoundcmd } }, - { MODKEY|ShiftMask, XK_m, spawn, {.v = mailcmd } }, - { MODKEY|ShiftMask, XK_s, spawn, {.v = screenshotcmd } }, - { MODKEY, XK_u, spawn, {.v = closenotifycmd } }, - { MODKEY|ShiftMask, XK_u, spawn, {.v = lastnotifycmd } }, - { MODKEY|ControlMask, XK_u, spawn, {.v = notifyctxcmd } }, - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volupcmd } }, - { ShiftMask, XF86XK_AudioRaiseVolume, spawn, {.v = bigvolupcmd } }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = voldowncmd } }, - { ShiftMask, XF86XK_AudioLowerVolume, spawn, {.v = bigvoldowncmd } }, - { 0, XF86XK_AudioMute, spawn, {.v = volmutecmd } }, - { MODKEY|ShiftMask, XK_r, restart, {0} }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY, XK_i, incnmaster, {.i = +1 } }, - { MODKEY, XK_d, incnmaster, {.i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.25} }, - { MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.25} }, - { MODKEY|ShiftMask, XK_a, setcfact, {.f = 0.00} }, - { MODKEY, XK_Return, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, - { MODKEY, XK_x, killclient, {0} }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_space, setlayout, {0} }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, - { MODKEY|ShiftMask, XK_t, togglealwaysontop, {0} }, - { MODKEY, XK_0, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, - { MODKEY, XK_comma, focusmon, {.i = -1 } }, - { MODKEY, XK_period, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, - 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) - { MODKEY|ShiftMask, XK_q, quit, {0} }, -}; - -/* button definitions */ -/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ -static Button buttons[] = { - /* click event mask button function argument */ - { ClkTagBar, MODKEY, Button1, tag, {0} }, - { ClkTagBar, MODKEY, Button3, toggletag, {0} }, - { ClkWinTitle, 0, Button2, zoom, {0} }, - { 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/config.mk b/config.mk deleted file mode 100644 index 95e5d6a..0000000 --- a/config.mk +++ /dev/null @@ -1,43 +0,0 @@ -# dwm version -VERSION = 6.4 - -# Customize below to fit your system - -# paths -PREFIX = /usr/local -MANPREFIX = ${PREFIX}/share/man - -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib - -# Xinerama, comment if you don't want it -XINERAMALIBS = -lXinerama -XINERAMAFLAGS = -DXINERAMA - -# freetype -FREETYPELIBS = -lfontconfig -lXft -FREETYPEINC = /usr/include/freetype2 -# OpenBSD (uncomment) -#FREETYPEINC = ${X11INC}/freetype2 - -# FreeBSD (uncomment) -#X11INC = /usr/local/include -#X11LIB = /usr/local/lib -#FREETYPEINC = /usr/local/include/freetype2 - -# includes and libs -INCS = -I${X11INC} -I${FREETYPEINC} -LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} - -# flags -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} -CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} -LDFLAGS = ${LIBS} - -# Solaris -#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" -#LDFLAGS = ${LIBS} - -# compiler and linker -CC = cc