prepare for new laptop
[dotfiles.git] / config.h / dwm / config.h
index 6ef64a4..ec5d1ae 100644 (file)
@@ -7,8 +7,8 @@ static const unsigned int borderpx  = 1;        /* border pixel of windows */
 static const unsigned int snap      = 32;       /* snap pixel */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 0;        /* 0 means bottom bar */
-static const char *fonts[]          = { "monospace:size=12" };
-static const char dmenufont[]       = "monospace:size=12";
+static const char font0[]           = "monospace:size=14";
+static const char *fonts[]          = { font0 };
 static const char col_gray1[]       = "#222222";
 static const char col_gray2[]       = "#444444";
 static const char col_gray3[]       = "#bbbbbb";
@@ -21,7 +21,8 @@ static const char *colors[][3]      = {
 };
 
 /* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+//static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+static const char *tags[] = { "1", "2", "3", "4", "5" };
 
 static const Rule rules[] = {
        /* xprop(1):
@@ -37,6 +38,7 @@ static const Rule rules[] = {
 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 */
@@ -58,67 +60,71 @@ 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", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *termcmd[]  = { "st", NULL };
 static const char *quitcmd[]  = { "killall", "xinit", NULL };
-static const char *passmenu[]  = { "passmenu", NULL };
-static const char *passmenu_type[]  = { "passmenu", "--type", NULL };
+static const char *passmenu[]  = { "passmenu", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+static const char *passmenu_tmux[]  = { "passmenu", "--tmux", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *scr[] = { "scr", NULL };
 static const char *scr_sel[] = { "scr", "selection", NULL };
-static const char *lock[] = { "slock", NULL };
+static const char *lock[] = { "xautolock", "-locknow", NULL };
 static const char *brightup[] = { "xbacklight", "-inc", "5", NULL };
-static const char *brightdown[] = { "xbacklight", "-inc", "5", NULL };
+static const char *brightdown[] = { "xbacklight", "-dec", "5", NULL };
 static const char *volume_mute[] = {"pactl", "set-sink-mute", "@DEFAULT_SINK@", "toggle", NULL};
 static const char *volume_dec[] = {"pactl", "set-sink-volume", "@DEFAULT_SINK@", "-5%", NULL};
 static const char *volume_inc[] = {"pactl", "set-sink-volume", "@DEFAULT_SINK@", "+5%", NULL};
-
+static const char *toggle_music[] = {"music_toggle", NULL};
 
 static Key keys[] = {
        /* modifier                     key        function        argument */
-       { MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-       { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
-       { MODKEY,                       XK_y,      spawn,          {.v = passmenu } },
-       { MODKEY|ShiftMask,             XK_y,      spawn,          {.v = passmenu_type } },
-       { MODKEY,                       XK_Print,  spawn,          {.v = scr } },
-       { MODKEY|ShiftMask,             XK_Print,  spawn,          {.v = scr_sel } },
-       { MODKEY|ShiftMask,             XK_l,      spawn,          {.v = lock } },
-       { 0 ,        XF86XK_MonBrightnessUp,   spawn,          {.v = brightup } },
-       { 0 ,        XF86XK_MonBrightnessDown, spawn,          {.v = brightdown } },
-       { 0 ,        XF86XK_AudioLowerVolume,  spawn,          {.v = volume_dec } },
-       { 0 ,        XF86XK_AudioMute,         spawn,          {.v = volume_mute } },
-       { 0 ,        XF86XK_AudioRaiseVolume,  spawn,          {.v = volume_inc } }, 
-       { 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,                       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_space,  setlayout,      {0} },
-       { MODKEY|ShiftMask,             XK_space,  togglefloating, {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,                       XK_q,      quit,           {0} },
-       { MODKEY|ShiftMask,             XK_q,      spawn,          {.v = quitcmd } },
+       { MODKEY,           XK_p,      spawn,          {.v = dmenucmd } },
+       { MODKEY|ShiftMask, XK_Return, spawn,          {.v = termcmd } },
+       { MODKEY,           XK_y,      spawn,          {.v = passmenu } },
+       { MODKEY|ShiftMask, XK_y,      spawn,          {.v = passmenu_tmux } },
+       { MODKEY|ShiftMask, XK_l,      spawn,          {.v = lock } },
+       { 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,           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_space,  setlayout,      {0} },
+       { MODKEY|ShiftMask, XK_space,  togglefloating, {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 } },
+       //Tags
+       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)
+       //Quit
+       { MODKEY,           XK_q,      quit,           {0} },
+       { MODKEY|ShiftMask, XK_q,      spawn,          {.v = quitcmd } },
+       //Without mod
+       { 0, XF86XK_MonBrightnessUp,   spawn,          {.v = brightup } },
+       { 0, XF86XK_MonBrightnessDown, spawn,          {.v = brightdown } },
+       { 0, XF86XK_AudioLowerVolume,  spawn,          {.v = volume_dec } },
+       { 0, XF86XK_AudioMute,         spawn,          {.v = volume_mute } },
+       { 0, XF86XK_AudioRaiseVolume,  spawn,          {.v = volume_inc } },
+       { 0,                XK_Print,  spawn,          {.v = scr } },
+       { ShiftMask,        XK_Print,  spawn,          {.v = scr_sel } },
+       { 0,                XK_Pause,  spawn,          {.v = toggle_music } },
 };
 
 /* button definitions */