pulled dwm config from yoga2 into master

This commit is contained in:
2015-06-26 18:41:52 -06:00
parent 3adf42e238
commit 6dd3017b42
+24 -18
View File
@@ -3,25 +3,33 @@
#include <X11/XF86keysym.h> /*Needed for mulitmedia keys*/ #include <X11/XF86keysym.h> /*Needed for mulitmedia keys*/
/* appearance */ /* appearance */
static const char font[] = "Ohsnap.Icons:size=12"; static const char font[] = "Inconsolataicon-12";
static const char normbordercolor[] = "#444444";
static const char normbgcolor[] = "#222222"; #define NUMCOLORS 9
static const char normfgcolor[] = "#bbbbbb"; static const char colors[NUMCOLORS][ColLast][9] = {
static const char selbordercolor[] = "#005577"; // border foreground background
static const char selbgcolor[] = "#005577"; { "#212121", "#00FFFF", "#2F4F4F" }, // 0 = normal
static const char selfgcolor[] = "#eeeeee"; { "#696969", "#ADFF2F", "#2F4F4F" }, // 1 = selected
{ "#212121", "#F8F8FF", "#C71585" }, // 2 = urgent
{ "#212121", "#90EE90", "#778899" }, // 3 = important
{ "#212121", "#FFFF00", "#2F4F4F" }, // 4 = yellow
{ "#212121", "#00BFFF", "#2F4F4F" }, // 5 = blue
{ "#212121", "#00FFFF", "#2F4F4F" }, // 6 = cyan
{ "#212121", "#FF00FF", "#2F4F4F" }, // 7 = magenta
{ "#212121", "#F5F5F5", "#2F4F4F" }, // 8 = grey
};
static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int snap = 32; /* snap pixel */ static const unsigned int snap = 32; /* snap pixel */
static const Bool showbar = True; /* False means no bar */ static const Bool showbar = True; /* False means no bar */
static const Bool topbar = True; /* False means bottom bar */ static const Bool topbar = True; /* False means bottom bar */
/* tagging */ /* tagging */
static const char *tags[] = { "term", "coms", "www", "dev", "work", "6", "7", "8", "9" }; static const char *tags[] = { "\u01A0", "\u01a5", "\u01A1 ", "\u01A2", "\u01A3 " };
static const Rule rules[] = { static const Rule rules[] = {
/* class instance title tags mask isfloating monitor */ /* class instance title tags mask isfloating monitor */
{ "Gimp", NULL, NULL, 0, True, -1 }, { "Gimp", NULL, NULL, 0, True, -1 },
{ "Firefox", NULL, NULL, 1 << 8, False, -1 }, { "Firefox", NULL, NULL, 0, False, -1 },
}; };
/* layout(s) */ /* layout(s) */
@@ -39,8 +47,8 @@ static const Layout layouts[] = {
/* key definitions */ /* key definitions */
#define MODKEY Mod1Mask #define MODKEY Mod1Mask
#define TAGKEYS(KEY,TAG) \ #define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY, KEY, toggleview, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
@@ -48,7 +56,7 @@ static const Layout layouts[] = {
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/* commands */ /* commands */
static const char *dmenucmd[] = { "dmenu_run", "-fn", "Inconsolata-9", "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL }; static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", colors[0][ColBG], "-nf", colors[0][ColFG], "-sb", colors[1][ColBG], "-sf", colors[1][ColFG], NULL };
static const char *termcmd[] = { "termite", NULL }; static const char *termcmd[] = { "termite", NULL };
/*functions for volume control*/ /*functions for volume control*/
static const char *upvol[] = { "amixer", "sset", "Master", "1%+", NULL}; static const char *upvol[] = { "amixer", "sset", "Master", "1%+", NULL};
@@ -65,7 +73,9 @@ static Key keys[] = {
{ 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol} }, { 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol} },
{ 0, XF86XK_AudioMute, spawn, {.v = mute } }, { 0, XF86XK_AudioMute, spawn, {.v = mute } },
{ MODKEY, XK_u, spawn, {.v = cmusplaypause} }, { MODKEY, XK_u, spawn, {.v = cmusplaypause} },
{ MODKEY, XK_p, spawn, {.v = dmenucmd } }, { MODKEY, XK_bracketright, spawn, {.v = cmusnext} },
{ MODKEY, XK_bracketleft, spawn, {.v = cmusprev} },
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
{ MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_j, focusstack, {.i = +1 } },
@@ -92,11 +102,7 @@ static Key keys[] = {
TAGKEYS( XK_2, 1) TAGKEYS( XK_2, 1)
TAGKEYS( XK_3, 2) TAGKEYS( XK_3, 2)
TAGKEYS( XK_4, 3) TAGKEYS( XK_4, 3)
TAGKEYS( XK_5, 4) 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} }, { MODKEY|ShiftMask, XK_q, quit, {0} },
}; };