Merge branch 'master' of github.com:dopefishh/dotfiles

[dotfiles.git] / config.h / dwm / config.h

diff --git a/config.h/dwm/config.h b/config.h/dwm/config.h
index 77868b1..efc9fb1 100644 (file)
--- a/config.h/dwm/config.h
+++ b/config.h/dwm/config.h
@@ -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=12";
+static const char *fonts[]          = { font0 };
 static const char col_gray1[]       = "#222222";
 static const char col_gray2[]       = "#444444";
 static const char col_gray3[]       = "#bbbbbb";
@@ -58,16 +58,16 @@ 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};
@@ -78,7 +78,7 @@ static Key keys[] = {
        { 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|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 } },