diff options
| -rw-r--r-- | config.def.h | 59 | 
1 files changed, 37 insertions, 22 deletions
| diff --git a/config.def.h b/config.def.h index 9efa774..6b314b6 100644 --- a/config.def.h +++ b/config.def.h @@ -1,21 +1,22 @@  /* 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 gapp 	    = 30;  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 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 *fonts[]          = { "Hermit-Regular:size=11" }; +static const char dmenufont[]       = "Hermit-Regular:size=11"; +static const char col_gray1[]       = "#181818"; +static const char col_gray2[]       = "#585858"; +static const char col_gray3[]       = "#b8b8b8"; +static const char col_gray4[]       = "#f8f8f8"; +static const char col[]             = "#a1b56c";  static const char *colors[][3]      = {  	/*               fg         bg         border   */  	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, -	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  }, +	[SchemeSel]  = { col_gray4, col,       col },  };  /* tagging */ @@ -28,7 +29,6 @@ static const Rule rules[] = {  	 */  	/* class      instance    title       tags mask     isfloating   monitor */  	{ "Gimp",     NULL,       NULL,       0,            1,           -1 }, -	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },  };  /* layout(s) */ @@ -57,26 +57,40 @@ 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, "-sf", col_gray4, NULL }; +static const char *passmenucmd[] = { "passmenu", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col, "-sf", col_gray4, NULL }; +static const char *passotpmenucmd[] = { "passotpmenu", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col, "-sf", col_gray4, NULL }; +static const char *volumeupcmd[] = { "amixer", "sset", "Master", "5%+", NULL }; +static const char *volumedowncmd[] = { "amixer", "sset", "Master", "5%-", NULL };  static const char *termcmd[]  = { "st", NULL }; -static const Key keys[] = { +static Key keys[] = {  	/* modifier                     key        function        argument */ -	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } }, -	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } }, -	{ MODKEY,                       XK_b,      togglebar,      {0} }, +	{ MODKEY,             		XK_Return, spawn,          {.v = termcmd } }, +	{ MODKEY,                       XK_d,      spawn,          {.v = dmenucmd } }, +	{ MODKEY,                       XK_c,      spawn,          {.v = passmenucmd } }, +	{ MODKEY,                       XK_x,      spawn,          {.v = passotpmenucmd } }, + +	{ MODKEY,                       XK_equal,  spawn,          {.v = volumeupcmd } }, +	{ MODKEY,                       XK_minus,  spawn,          {.v = volumedowncmd } }, + +	{ MODKEY,             		XK_q,      killclient,     {0} }, +	{ MODKEY|ShiftMask, 		XK_e,      quit,           {0} }, + +	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } }, +	{ MODKEY,                       XK_u,      incnmaster,     {.i = -1 } }, +  	{ 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,                       XK_Return, zoom,           {0} }, -	{ MODKEY,                       XK_Tab,    view,           {0} }, -	{ MODKEY|ShiftMask,             XK_c,      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_Tab,    view,           {0} },  	{ MODKEY,                       XK_space,  setlayout,      {0} },  	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },  	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } }, @@ -94,12 +108,13 @@ static const Key keys[] = {  	TAGKEYS(                        XK_7,                      6)  	TAGKEYS(                        XK_8,                      7)  	TAGKEYS(                        XK_9,                      8) -	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} }, +	//{ MODKEY,                       XK_b,      togglebar,      {0} }, +	{ MODKEY|ShiftMask,                       XK_Return, zoom,           {0} },  };  /* button definitions */  /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ -static const Button buttons[] = { +static Button buttons[] = {  	/* click                event mask      button          function        argument */  	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },  	{ ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} }, | 
