updates to bar, dwm and compose

diff --git a/config.h/dwm/config.h b/config.h/dwm/config.h
index 151c1ba..d332607 100644 (file)
--- a/config.h/dwm/config.h
+++ b/config.h/dwm/config.h
@@ -63,6 +63,7 @@ static const char *passmenu[]  = { "passmenu", NULL };
 static const char *passmenu_type[]  = { "passmenu", "--type", NULL };
 static const char *scr[] = { "scr", NULL };
 static const char *scr_sel[] = { "scr", "selection", NULL };
 static const char *passmenu_type[]  = { "passmenu", "--type", NULL };
 static const char *scr[] = { "scr", NULL };
 static const char *scr_sel[] = { "scr", "selection", NULL };

+static const char *lock[] = { "slock", NULL };

 
 
 static Key keys[] = {
 
 
 static Key keys[] = {


@@ -73,6 +74,7 @@ static Key keys[] = {
        { 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_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 } },

        { MODKEY,                       XK_b,      togglebar,      {0} },
        { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
        { MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
        { MODKEY,                       XK_b,      togglebar,      {0} },
        { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
        { MODKEY,                       XK_k,      focusstack,     {.i = -1 } },

diff --git a/x/.XCompose b/x/.XCompose
index 63b28e2..0a4498d 100644 (file)
--- a/x/.XCompose
+++ b/x/.XCompose
@@ -88,10 +88,10 @@ include "%L"
 <Multi_key> <asciitilde> <greater>          : "⇝" U21DD
 
 # Dotted arrows
 <Multi_key> <asciitilde> <greater>          : "⇝" U21DD
 
 # Dotted arrows

-<Multi_key> <dot> <less>                    : "⇠" U21E0
-<Multi_key> <dot> <asciicircum>             : "⇡" U21E1
-<Multi_key> <dot> <greater>                 : "⇢" U21E2
-<Multi_key> <dot> <v>                       : "⇣" U21E3
+<Multi_key> <period> <less>                 : "⇠" U21E0
+<Multi_key> <period> <asciicircum>          : "⇡" U21E1
+<Multi_key> <period> <greater>              : "⇢" U21E2
+<Multi_key> <period> <v>                    : "⇣" U21E3

 
 # Walled arrows
 <Multi_key> <less> <bar>                    : "⇤" U21E4
 
 # Walled arrows
 <Multi_key> <less> <bar>                    : "⇤" U21E4

diff --git a/x/.local/bin/bar b/x/.local/bin/bar
index 8d8d053..15b1f87 100755 (executable)
--- a/x/.local/bin/bar
+++ b/x/.local/bin/bar
@@ -1,4 +1,4 @@
 #!/bin/sh
 echo \
 #!/bin/sh
 echo \

-       "$(date +"%Y-%m-%d %H:%M:%S")"\
-       "       $(df -h | grep '/$' | awk '{print $4"/"$2}')"
+       "$(df -h | grep '/$' | awk '{print $4"/"$2}')"\
+       " | $(date +"%Y-%m-%d %H:%M:%S")"