Updates

1 files changed, 44 insertions, 42 deletions

diff --git a/config.h b/config.h
index b48d24b..9cd8acf 100644
--- a/config.h
+++ b/config.h
@@ -64,62 +64,64 @@ static const char *termcmd[]  = { "st", "/usr/bin/fish", NULL };
 
 static const Key keys[] = {
 	/* modifier                     key        function        argument */
-	{ MODKEY,                       XK_i,      spawn,          {.v = (const char*[]){"passmenu", "--type", NULL } } },
-	{ MODKEY|ShiftMask,             XK_i,      spawn,          {.v = (const char*[]){"passmenu", NULL } } },
-	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-	{ MODKEY,                       XK_Return, spawn,          {.v = termcmd } },
-	{ MODKEY|ShiftMask,             XK_Return, zoom,           {0} },
-	{ 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} },
+	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_0,      view,           {.ui = ~0 } },
+	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
 	{ MODKEY,                       XK_Tab,    view,           {0} },
 	{ MODKEY,                       XK_q,      killclient,     {0} },
 	{ MODKEY|ShiftMask,             XK_e,      quit,           {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 } },
+	/* { MODKEY,                       XK_i,      incnmaster,     {.i = +1 } }, */
+	{ MODKEY,                       XK_o,       spawn,         {.v = (const char*[]){"gousermenu", "-t", NULL } } },
+	{ MODKEY|ShiftMask,             XK_o,       spawn,         {.v = (const char*[]){"gousermenu", NULL } } },
+	{ MODKEY,                       XK_p,       spawn,         {.v = (const char*[]){"gopassmenu", "-t", NULL } } },
+	{ MODKEY|ShiftMask,             XK_p,       spawn,         {.v = (const char*[]){"gopassmenu", NULL } } },
 	{ MODKEY,                       XK_bracketleft, spawn,          {.v = (const char*[]){"mpc", "seek", "0", NULL } } },
 	{ MODKEY|ShiftMask,             XK_bracketleft, spawn,          {.v = (const char*[]){"mpc", "prev", NULL } } },
 	{ MODKEY,                       XK_bracketright, spawn,         {.v = (const char*[]){"mpc", "next", NULL } } },
 	/* { MODKEY|ShiftMask,             XK_bracketright, spawn,          {.v = (const char*[]){"mpc", "prev", NULL } } }, */
 	{ MODKEY,                       XK_backslash, spawn,          {.v = (const char*[]){"mpc", "toggle", NULL } } },
 	{ MODKEY|ShiftMask,             XK_backslash, spawn,          {.v = (const char*[]){"st", "ncmpcpp", NULL } } },
-	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_d,      spawn,          {.v = dmenucmd } },
+	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
+	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
+	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
+	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
+	{ MODKEY,                       XK_Return, spawn,          {.v = termcmd } },
+	{ MODKEY|ShiftMask,             XK_Return, zoom,           {0} },
+	{ MODKEY,                       XK_b,      togglebar,      {0} },
+	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
+	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
+	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
+	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
+	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
+	{ MODKEY,                       XK_space,  setlayout,      {0} },
+	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
 	{ MODKEY,                       XK_x,       spawn,         {.v = (const char*[]){"librewolf", NULL } } },
 	{ MODKEY|ShiftMask,             XK_x,       spawn,         {.v = (const char*[]){"librewolf", "--private-window", NULL } } },
 	{ MODKEY,                       XK_c,       spawn,         {.v = (const char*[]){"surf", "duckduckgo.com/html", NULL } } },
 	{ MODKEY|ShiftMask,             XK_c,       spawn,         {.v = (const char*[]){"surf", NULL } } },
-	{ 0, XF86XK_AudioMute,                         spawn,                  {.v = (const char*[]){"wpctl", "set-mute", "@DEFAULT_AUDIO_SINK@", "toggle", NULL} } },
-	{ 0, XF86XK_AudioLowerVolume,                         spawn,                  {.v = (const char*[]){"wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", "0.05-", NULL} } },
-	{ 0, XF86XK_AudioRaiseVolume,                         spawn,                  {.v = (const char*[]){"wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", "0.05+", NULL} } },
-	{ 0, XF86XK_AudioMicMute,                         spawn,                  {.v = (const char*[]){"wpctl", "set-mute", "@DEFAULT_AUDIO_SOURCE@", "toggle", NULL} } },
-	{ 0, XF86XK_AudioPrev,                         spawn,                  {.v = (const char*[]){ "mpc", "prev", NULL } } },
-	{ 0, XF86XK_AudioNext,                         spawn,                  {.v = (const char*[]){ "mpc",  "next", NULL } } },
-	{ 0, XF86XK_AudioPause,                        spawn,                  {.v = (const char*[]){ "mpc", "pause", NULL } } },
-	{ 0, XF86XK_AudioPlay,                         spawn,                  {.v = (const char*[]){ "mpc", "play", NULL } } },
-	{ 0, XF86XK_AudioStop,                         spawn,                  {.v = (const char*[]){ "mpc", "stop", NULL } } },
-	{ 0, XF86XK_AudioRewind,                       spawn,                  {.v = (const char*[]){ "mpc", "seek", "-10", NULL } } },
-	{ 0, XF86XK_AudioForward,                      spawn,                  {.v = (const char*[]){ "mpc", "seek", "+10", NULL } } },
+
+	{ 0, XF86XK_AudioMute,          spawn,                          {.v = (const char*[]){"wpctl", "set-mute", "@DEFAULT_AUDIO_SINK@", "toggle", NULL} } },
+	{ 0, XF86XK_AudioLowerVolume,   spawn,                          {.v = (const char*[]){"wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", "0.05-", NULL} } },
+	{ 0, XF86XK_AudioRaiseVolume,   spawn,                          {.v = (const char*[]){"wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@", "0.05+", NULL} } },
+	{ 0, XF86XK_AudioMicMute,       spawn,                          {.v = (const char*[]){"wpctl", "set-mute", "@DEFAULT_AUDIO_SOURCE@", "toggle", NULL} } },
+	{ 0, XF86XK_AudioPrev,                         spawn,           {.v = (const char*[]){ "mpc", "prev", NULL } } },
+	{ 0, XF86XK_AudioNext,                         spawn,           {.v = (const char*[]){ "mpc",  "next", NULL } } },
+	{ 0, XF86XK_AudioPause,                        spawn,           {.v = (const char*[]){ "mpc", "pause", NULL } } },
+	{ 0, XF86XK_AudioPlay,                         spawn,           {.v = (const char*[]){ "mpc", "play", NULL } } },
+	{ 0, XF86XK_AudioStop,                         spawn,           {.v = (const char*[]){ "mpc", "stop", NULL } } },
+	{ 0, XF86XK_AudioRewind,                       spawn,           {.v = (const char*[]){ "mpc", "seek", "-10", NULL } } },
+	{ 0, XF86XK_AudioForward,                      spawn,           {.v = (const char*[]){ "mpc", "seek", "+10", NULL } } },
 
 };