fix dwm lock

diff --git a/suckless/dwm/config.def.h b/suckless/dwm/config.def.h
index af06b88..2818bcc 100644 (file)
--- a/suckless/dwm/config.def.h
+++ b/suckless/dwm/config.def.h
@@ -22,8 +22,8 @@ static const Rule rules[] = {
         *      WM_NAME(STRING) = title
         */
        /* class      instance    title       tags mask     isfloating   monitor */
         *      WM_NAME(STRING) = title
         */
        /* class      instance    title       tags mask     isfloating   monitor */

-       { "Gimp",     NULL,       NULL,       0,            True,        -1 },
-       { "Firefox",  NULL,       NULL,       1 << 8,       False,       -1 },
+       { "Thunderbird",     NULL,       NULL,       0,            False,        1 },
+       { "Gajim",  NULL,       NULL,       1 << 1,       False,       1 },

 };
 
 /* layout(s) */
 };
 
 /* layout(s) */


@@ -51,15 +51,19 @@ static const Layout layouts[] = {
 
 /* commands */
 static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
 
 /* commands */
 static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };

-static const char *termcmd[]  = { "xfce4-terminal", NULL };
+static const char *termcmd[]  = { "gnome-terminal", NULL };

 static const char *browsercmd[]  = { "firefox", NULL };
 static const char *projectcmd[]  = { "launchProjectVim.sh", NULL };
 static const char *browsercmd[]  = { "firefox", NULL };
 static const char *projectcmd[]  = { "launchProjectVim.sh", NULL };

+static const char *lockcmd[]  = { "slock", NULL };
+static const char *filecmd[]  = { "nautilus", "--no-desktop", NULL };

 
 static Key keys[] = {
        /* modifier                     key        function        argument */
        { MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
        { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
        { MODKEY|ShiftMask,             XK_e,      spawn,          {.v = browsercmd } },
 
 static Key keys[] = {
        /* modifier                     key        function        argument */
        { MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
        { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
        { MODKEY|ShiftMask,             XK_e,      spawn,          {.v = browsercmd } },

+       { MODKEY|ShiftMask,             XK_f,      spawn,          {.v = filecmd } },
+       { MODKEY|ShiftMask,             XK_l,      spawn,          {.v = lockcmd } },

        { MODKEY,                       XK_v,      spawn,          {.v = projectcmd } },
        { MODKEY,                       XK_b,      togglebar,      {0} },
        { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
        { MODKEY,                       XK_v,      spawn,          {.v = projectcmd } },
        { MODKEY,                       XK_b,      togglebar,      {0} },
        { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },

diff --git a/suckless/dwm/config.mk b/suckless/dwm/config.mk
index e5bc676..c9ef9cd 100644 (file)
--- a/suckless/dwm/config.mk
+++ b/suckless/dwm/config.mk
@@ -11,8 +11,8 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 # Xinerama, comment if you don't want it
 X11LIB = /usr/X11R6/lib
 
 # Xinerama, comment if you don't want it

-#XINERAMALIBS  = -lXinerama
-#XINERAMAFLAGS = -DXINERAMA
+XINERAMALIBS  = -lXinerama
+XINERAMAFLAGS = -DXINERAMA

 
 # includes and libs
 INCS = -I${X11INC}
 
 # includes and libs
 INCS = -I${X11INC}

diff --git a/suckless/dwm/config.parkeon.diff b/suckless/dwm/config.parkeon.diff
index f06452d..92aac93 100644 (file)
--- a/suckless/dwm/config.parkeon.diff
+++ b/suckless/dwm/config.parkeon.diff
@@ -1,5 +1,5 @@
 diff --git a/suckless/dwm/config.def.h b/suckless/dwm/config.def.h
 diff --git a/suckless/dwm/config.def.h b/suckless/dwm/config.def.h

-index af06b88..6c0dcb4 100644
+index af06b88..2818bcc 100644

 --- a/suckless/dwm/config.def.h
 +++ b/suckless/dwm/config.def.h
 @@ -22,8 +22,8 @@ static const Rule rules[] = {
 --- a/suckless/dwm/config.def.h
 +++ b/suckless/dwm/config.def.h
 @@ -22,8 +22,8 @@ static const Rule rules[] = {


@@ -30,7 +30,7 @@ index af06b88..6c0dcb4 100644
        { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
        { MODKEY|ShiftMask,             XK_e,      spawn,          {.v = browsercmd } },
 +      { MODKEY|ShiftMask,             XK_f,      spawn,          {.v = filecmd } },
        { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
        { MODKEY|ShiftMask,             XK_e,      spawn,          {.v = browsercmd } },
 +      { MODKEY|ShiftMask,             XK_f,      spawn,          {.v = filecmd } },

-+      { MODKEY|ShiftMask,             XK_g,      spawn,          {.v = lockcmd } },
++      { MODKEY|ShiftMask,             XK_l,      spawn,          {.v = lockcmd } },

        { MODKEY,                       XK_v,      spawn,          {.v = projectcmd } },
        { MODKEY,                       XK_b,      togglebar,      {0} },
        { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
        { MODKEY,                       XK_v,      spawn,          {.v = projectcmd } },
        { MODKEY,                       XK_b,      togglebar,      {0} },
        { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },


@@ -49,3 +49,59 @@ index e5bc676..c9ef9cd 100644
  
  # includes and libs
  INCS = -I${X11INC}
  
  # includes and libs
  INCS = -I${X11INC}

+diff --git a/suckless/dwm/config.parkeon.diff b/suckless/dwm/config.parkeon.diff
+index f06452d..e69de29 100644
+--- a/suckless/dwm/config.parkeon.diff
++++ b/suckless/dwm/config.parkeon.diff
+@@ -1,51 +0,0 @@
+-diff --git a/suckless/dwm/config.def.h b/suckless/dwm/config.def.h
+-index af06b88..6c0dcb4 100644
+---- a/suckless/dwm/config.def.h
+-+++ b/suckless/dwm/config.def.h
+-@@ -22,8 +22,8 @@ static const Rule rules[] = {
+-       *      WM_NAME(STRING) = title
+-       */
+-      /* class      instance    title       tags mask     isfloating   monitor */
+--     { "Gimp",     NULL,       NULL,       0,            True,        -1 },
+--     { "Firefox",  NULL,       NULL,       1 << 8,       False,       -1 },
+-+     { "Thunderbird",     NULL,       NULL,       0,            False,        1 },
+-+     { "Gajim",  NULL,       NULL,       1 << 1,       False,       1 },
+- };
+- 
+- /* layout(s) */
+-@@ -51,15 +51,19 @@ static const Layout layouts[] = {
+- 
+- /* commands */
+- static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+--static const char *termcmd[]  = { "xfce4-terminal", NULL };
+-+static const char *termcmd[]  = { "gnome-terminal", NULL };
+- static const char *browsercmd[]  = { "firefox", NULL };
+- static const char *projectcmd[]  = { "launchProjectVim.sh", NULL };
+-+static const char *lockcmd[]  = { "slock", NULL };
+-+static const char *filecmd[]  = { "nautilus", "--no-desktop", NULL };
+- 
+- static Key keys[] = {
+-      /* modifier                     key        function        argument */
+-      { MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
+-      { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
+-      { MODKEY|ShiftMask,             XK_e,      spawn,          {.v = browsercmd } },
+-+     { MODKEY|ShiftMask,             XK_f,      spawn,          {.v = filecmd } },
+-+     { MODKEY|ShiftMask,             XK_g,      spawn,          {.v = lockcmd } },
+-      { MODKEY,                       XK_v,      spawn,          {.v = projectcmd } },
+-      { MODKEY,                       XK_b,      togglebar,      {0} },
+-      { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+-diff --git a/suckless/dwm/config.mk b/suckless/dwm/config.mk
+-index e5bc676..c9ef9cd 100644
+---- a/suckless/dwm/config.mk
+-+++ b/suckless/dwm/config.mk
+-@@ -11,8 +11,8 @@ X11INC = /usr/X11R6/include
+- X11LIB = /usr/X11R6/lib
+- 
+- # Xinerama, comment if you don't want it
+--#XINERAMALIBS  = -lXinerama
+--#XINERAMAFLAGS = -DXINERAMA
+-+XINERAMALIBS  = -lXinerama
+-+XINERAMAFLAGS = -DXINERAMA
+- 
+- # includes and libs
+- INCS = -I${X11INC}