X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=config.h%2Fdwm%2Fconfig.h;h=ec5d1ae397cce646bed9acb7d8cf9041884077a6;hb=HEAD;hp=0ee2c80b9bb6a780b4329e850973036499b11bcb;hpb=6043ef396b2d9c89c14e7439a4bd8bd2b96ef339;p=dotfiles.git

diff --git a/config.h/dwm/config.h b/config.h/dwm/config.h
index 0ee2c80..ec5d1ae 100644
--- 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=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,33 +60,33 @@ 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[]  = { "/usr/share/doc/pass/examples/dmenu/passmenu", NULL };
-static const char *passmenu_type[]  = { "/usr/share/doc/pass/examples/dmenu/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[] = {"quodlibet", "--play-pause", 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|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_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} },