parkeon update
authorBenjamin Doumenc <big.clop@gmail.com>
Mon, 8 Jul 2013 08:54:43 +0000 (10:54 +0200)
committerBenjamin Doumenc <big.clop@gmail.com>
Mon, 8 Jul 2013 08:54:43 +0000 (10:54 +0200)
.gitignore
suckless/dwm/config.parkeon.diff [new file with mode: 0644]
suckless/slock/.hgtags [new file with mode: 0644]
suckless/slock/LICENSE [new file with mode: 0644]
suckless/slock/Makefile [new file with mode: 0644]
suckless/slock/README [new file with mode: 0644]
suckless/slock/config.mk [new file with mode: 0644]
suckless/slock/simple_auth.diff [new file with mode: 0644]
suckless/slock/slock.c [new file with mode: 0644]
vim/customVimrc
vim/vimfiles/.netrwhist [deleted file]

index 2a88ca3..a0e76af 100644 (file)
@@ -1 +1 @@
-vim/vimfiles/.netrwhist
+.netrwhist
diff --git a/suckless/dwm/config.parkeon.diff b/suckless/dwm/config.parkeon.diff
new file mode 100644 (file)
index 0000000..f06452d
--- /dev/null
@@ -0,0 +1,51 @@
+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}
diff --git a/suckless/slock/.hgtags b/suckless/slock/.hgtags
new file mode 100644 (file)
index 0000000..99325db
--- /dev/null
@@ -0,0 +1,10 @@
+0a95c73c7374fbc2342b6040d9f35ddf597729e1 0.1
+da5cb1f0a685258d5315ea109860bacbc2871a57 0.2
+f9157b1864388ad8f1920e5fde7c5849e73d8327 0.3
+4c2cf4d6a2d0e08cbe280ec50ef76c9aecfc0fbe 0.4
+bd24ea7fcca26b161225c464df23ecbfe85280e1 0.5
+dd226a81c09adfa86db232419b3000b7e406df68 0.6
+c4635bb35a4581261f0187b347d5e596dd390ca3 0.7
+c0eb8221ba49c6d10becc93c063c45196a3bb1ba 0.8
+1e8a77601cb9c872921bbfc47909d9339027b295 0.9
+05b949016e85da011c48783d6896de801d347bed 1.0
diff --git a/suckless/slock/LICENSE b/suckless/slock/LICENSE
new file mode 100644 (file)
index 0000000..5626eab
--- /dev/null
@@ -0,0 +1,21 @@
+MIT/X Consortium License
+
+© 2006-2012 Anselm R Garbe <anselm@garbe.us>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/suckless/slock/Makefile b/suckless/slock/Makefile
new file mode 100644 (file)
index 0000000..2bea555
--- /dev/null
@@ -0,0 +1,50 @@
+# slock - simple screen locker
+# See LICENSE file for copyright and license details.
+
+include config.mk
+
+SRC = slock.c
+OBJ = ${SRC:.c=.o}
+
+all: options slock
+
+options:
+       @echo slock build options:
+       @echo "CFLAGS   = ${CFLAGS}"
+       @echo "LDFLAGS  = ${LDFLAGS}"
+       @echo "CC       = ${CC}"
+
+.c.o:
+       @echo CC $<
+       @${CC} -c ${CFLAGS} $<
+
+${OBJ}: config.mk
+
+slock: ${OBJ}
+       @echo CC -o $@
+       @${CC} -o $@ ${OBJ} ${LDFLAGS}
+
+clean:
+       @echo cleaning
+       @rm -f slock ${OBJ} slock-${VERSION}.tar.gz
+
+dist: clean
+       @echo creating dist tarball
+       @mkdir -p slock-${VERSION}
+       @cp -R LICENSE Makefile README config.mk ${SRC} slock-${VERSION}
+       @tar -cf slock-${VERSION}.tar slock-${VERSION}
+       @gzip slock-${VERSION}.tar
+       @rm -rf slock-${VERSION}
+
+install: all
+       @echo installing executable file to ${DESTDIR}${PREFIX}/bin
+       @mkdir -p ${DESTDIR}${PREFIX}/bin
+       @cp -f slock ${DESTDIR}${PREFIX}/bin
+       @chmod 755 ${DESTDIR}${PREFIX}/bin/slock
+       @chmod u+s ${DESTDIR}${PREFIX}/bin/slock
+
+uninstall:
+       @echo removing executable file from ${DESTDIR}${PREFIX}/bin
+       @rm -f ${DESTDIR}${PREFIX}/bin/slock
+
+.PHONY: all options clean dist install uninstall
diff --git a/suckless/slock/README b/suckless/slock/README
new file mode 100644 (file)
index 0000000..a81290d
--- /dev/null
@@ -0,0 +1,24 @@
+slock - simple screen locker
+============================
+simple screen locker utility for X. 
+
+
+Requirements
+------------
+In order to build slock you need the Xlib header files.
+
+
+Installation
+------------
+Edit config.mk to match your local setup (slock is installed into
+the /usr/local namespace by default).
+
+Afterwards enter the following command to build and install slock
+(if necessary as root):
+
+    make clean install
+
+
+Running slock
+-------------
+Simply invoke the 'slock' command. To get out of it, enter your password.
diff --git a/suckless/slock/config.mk b/suckless/slock/config.mk
new file mode 100644 (file)
index 0000000..aaa118c
--- /dev/null
@@ -0,0 +1,32 @@
+# slock version
+VERSION = 1.1
+
+# Customize below to fit your system
+
+# paths
+PREFIX = /usr/local
+
+X11INC = /usr/X11R6/include
+X11LIB = /usr/X11R6/lib
+
+# includes and libs
+INCS = -I. -I/usr/include -I${X11INC}
+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext
+
+# flags
+CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H -DCOLOR1=\"black\" -DCOLOR2=\"\#005577\" -DUSE_SIMPLE_AUTH
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+LDFLAGS = -s ${LIBS}
+
+# On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS and add -DHAVE_BSD_AUTH
+# On OpenBSD and Darwin remove -lcrypt from LIBS
+# To use hardcoded password, ass -DUSE_SIMPLE_AUTH and change PASSWORD in slock.c
+
+# compiler and linker
+CC = cc
+
+# Install mode. On BSD systems MODE=2755 and GROUP=auth
+# On others MODE=4755 and GROUP=root
+MODE=4755
+GROUP=shadow
+
diff --git a/suckless/slock/simple_auth.diff b/suckless/slock/simple_auth.diff
new file mode 100644 (file)
index 0000000..5ebe981
--- /dev/null
@@ -0,0 +1,54 @@
+diff --git a/config.mk b/config.mk
+index 982d7a6..aaa118c 100644
+--- a/config.mk
++++ b/config.mk
+@@ -14,17 +14,19 @@ INCS = -I. -I/usr/include -I${X11INC}
+ LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext
+ # flags
+-CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H -DCOLOR1=\"black\" -DCOLOR2=\"\#005577\"
++CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H -DCOLOR1=\"black\" -DCOLOR2=\"\#005577\" -DUSE_SIMPLE_AUTH
+ CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+ LDFLAGS = -s ${LIBS}
+ # On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS and add -DHAVE_BSD_AUTH
+ # On OpenBSD and Darwin remove -lcrypt from LIBS
++# To use hardcoded password, ass -DUSE_SIMPLE_AUTH and change PASSWORD in slock.c
+ # compiler and linker
+ CC = cc
+ # Install mode. On BSD systems MODE=2755 and GROUP=auth
+ # On others MODE=4755 and GROUP=root
+-#MODE=2755
+-#GROUP=auth
++MODE=4755
++GROUP=shadow
++
+diff --git a/slock.c b/slock.c
+index 154a091..3ae57cd 100644
+--- a/slock.c
++++ b/slock.c
+@@ -23,6 +23,11 @@
+ #include <bsd_auth.h>
+ #endif
++#if USE_SIMPLE_AUTH
++#define PASSWORD "hackme"
++#define HAVE_BSD_AUTH
++#endif
++
+ typedef struct {
+       int screen;
+       Window root, win;
+@@ -111,7 +116,9 @@ readpw(Display *dpy, const char *pws)
+                       switch(ksym) {
+                       case XK_Return:
+                               passwd[len] = 0;
+-#ifdef HAVE_BSD_AUTH
++#ifdef USE_SIMPLE_AUTH
++                              running = strcmp(passwd, PASSWORD);
++#elif defined(HAVE_BSD_AUTH)
+                               running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
+ #else
+                               running = strcmp(crypt(passwd, pws), pws);
diff --git a/suckless/slock/slock.c b/suckless/slock/slock.c
new file mode 100644 (file)
index 0000000..3ae57cd
--- /dev/null
@@ -0,0 +1,297 @@
+
+/* See LICENSE file for license details. */
+#define _XOPEN_SOURCE 500
+#if HAVE_SHADOW_H
+#include <shadow.h>
+#endif
+
+#include <ctype.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <X11/keysym.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+#if HAVE_BSD_AUTH
+#include <login_cap.h>
+#include <bsd_auth.h>
+#endif
+
+#if USE_SIMPLE_AUTH
+#define PASSWORD "hackme"
+#define HAVE_BSD_AUTH
+#endif
+
+typedef struct {
+       int screen;
+       Window root, win;
+       Pixmap pmap;
+       unsigned long colors[2];
+} Lock;
+
+static Lock **locks;
+static int nscreens;
+static Bool running = True;
+
+static void
+die(const char *errstr, ...) {
+       va_list ap;
+
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
+}
+
+#ifndef HAVE_BSD_AUTH
+static const char *
+getpw(void) { /* only run as root */
+       const char *rval;
+       struct passwd *pw;
+
+       pw = getpwuid(getuid());
+       if(!pw)
+               die("slock: cannot retrieve password entry (make sure to suid or sgid slock)");
+       endpwent();
+       rval =  pw->pw_passwd;
+
+#if HAVE_SHADOW_H
+       if (strlen(rval) >= 1) { /* kludge, assumes pw placeholder entry has len >= 1 */
+               struct spwd *sp;
+               sp = getspnam(getenv("USER"));
+               if(!sp)
+                       die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
+               endspent();
+               rval = sp->sp_pwdp;
+       }
+#endif
+
+       /* drop privileges */
+       if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
+               die("slock: cannot drop privileges");
+       return rval;
+}
+#endif
+
+static void
+#ifdef HAVE_BSD_AUTH
+readpw(Display *dpy)
+#else
+readpw(Display *dpy, const char *pws)
+#endif
+{
+       char buf[32], passwd[256];
+       int num, screen;
+       unsigned int len, llen;
+       KeySym ksym;
+       XEvent ev;
+
+       len = llen = 0;
+       running = True;
+
+       /* As "slock" stands for "Simple X display locker", the DPMS settings
+        * had been removed and you can set it with "xset" or some other
+        * utility. This way the user can easily set a customized DPMS
+        * timeout. */
+       while(running && !XNextEvent(dpy, &ev)) {
+               if(ev.type == KeyPress) {
+                       buf[0] = 0;
+                       num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
+                       if(IsKeypadKey(ksym)) {
+                               if(ksym == XK_KP_Enter)
+                                       ksym = XK_Return;
+                               else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
+                                       ksym = (ksym - XK_KP_0) + XK_0;
+                       }
+                       if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
+                                       || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
+                                       || IsPrivateKeypadKey(ksym))
+                               continue;
+                       switch(ksym) {
+                       case XK_Return:
+                               passwd[len] = 0;
+#ifdef USE_SIMPLE_AUTH
+                               running = strcmp(passwd, PASSWORD);
+#elif defined(HAVE_BSD_AUTH)
+                               running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
+#else
+                               running = strcmp(crypt(passwd, pws), pws);
+#endif
+                               if(running != False)
+                                       XBell(dpy, 100);
+                               len = 0;
+                               break;
+                       case XK_Escape:
+                               len = 0;
+                               break;
+                       case XK_BackSpace:
+                               if(len)
+                                       --len;
+                               break;
+                       default:
+                               if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) { 
+                                       memcpy(passwd + len, buf, num);
+                                       len += num;
+                               }
+                               break;
+                       }
+                       if(llen == 0 && len != 0) {
+                               for(screen = 0; screen < nscreens; screen++) {
+                                       XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[1]);
+                                       XClearWindow(dpy, locks[screen]->win);
+                               }
+                       } else if(llen != 0 && len == 0) {
+                               for(screen = 0; screen < nscreens; screen++) {
+                                       XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]);
+                                       XClearWindow(dpy, locks[screen]->win);
+                               }
+                       }
+                       llen = len;
+               }
+               else for(screen = 0; screen < nscreens; screen++)
+                       XRaiseWindow(dpy, locks[screen]->win);
+       }
+}
+
+static void
+unlockscreen(Display *dpy, Lock *lock) {
+       if(dpy == NULL || lock == NULL)
+               return;
+
+       XUngrabPointer(dpy, CurrentTime);
+       XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 2, 0);
+       XFreePixmap(dpy, lock->pmap);
+       XDestroyWindow(dpy, lock->win);
+
+       free(lock);
+}
+
+static Lock *
+lockscreen(Display *dpy, int screen) {
+       char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
+       unsigned int len;
+       Lock *lock;
+       XColor color, dummy;
+       XSetWindowAttributes wa;
+       Cursor invisible;
+
+       if(dpy == NULL || screen < 0)
+               return NULL;
+
+       lock = malloc(sizeof(Lock));
+       if(lock == NULL)
+               return NULL;
+
+       lock->screen = screen;
+
+       lock->root = RootWindow(dpy, lock->screen);
+
+       /* init */
+       wa.override_redirect = 1;
+       wa.background_pixel = BlackPixel(dpy, lock->screen);
+       lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen),
+                       0, DefaultDepth(dpy, lock->screen), CopyFromParent,
+                       DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa);
+       XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR2, &color, &dummy);
+       lock->colors[1] = color.pixel;
+       XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, &color, &dummy);
+       lock->colors[0] = color.pixel;
+       lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
+       invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, &color, 0, 0);
+       XDefineCursor(dpy, lock->win, invisible);
+       XMapRaised(dpy, lock->win);
+       for(len = 1000; len; len--) {
+               if(XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
+                       GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
+                       break;
+               usleep(1000);
+       }
+       if(running && (len > 0)) {
+               for(len = 1000; len; len--) {
+                       if(XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+                               == GrabSuccess)
+                               break;
+                       usleep(1000);
+               }
+       }
+
+       running &= (len > 0);
+       if(!running) {
+               unlockscreen(dpy, lock);
+               lock = NULL;
+       }
+       else 
+               XSelectInput(dpy, lock->root, SubstructureNotifyMask);
+
+       return lock;
+}
+
+static void
+usage(void) {
+       fprintf(stderr, "usage: slock [-v]\n");
+       exit(EXIT_FAILURE);
+}
+
+int
+main(int argc, char **argv) {
+#ifndef HAVE_BSD_AUTH
+       const char *pws;
+#endif
+       Display *dpy;
+       int screen;
+
+       if((argc == 2) && !strcmp("-v", argv[1]))
+               die("slock-%s, © 2006-2012 Anselm R Garbe\n", VERSION);
+       else if(argc != 1)
+               usage();
+
+       if(!getpwuid(getuid()))
+               die("slock: no passwd entry for you");
+
+#ifndef HAVE_BSD_AUTH
+       pws = getpw();
+#endif
+
+       if(!(dpy = XOpenDisplay(0)))
+               die("slock: cannot open display");
+       /* Get the number of screens in display "dpy" and blank them all. */
+       nscreens = ScreenCount(dpy);
+       locks = malloc(sizeof(Lock *) * nscreens);
+       if(locks == NULL)
+               die("slock: malloc: %s", strerror(errno));
+       int nlocks = 0;
+       for(screen = 0; screen < nscreens; screen++) {
+               if ( (locks[screen] = lockscreen(dpy, screen)) != NULL)
+                       nlocks++;
+       }
+       XSync(dpy, False);
+
+       /* Did we actually manage to lock something? */
+       if (nlocks == 0) { // nothing to protect
+               free(locks);
+               XCloseDisplay(dpy);
+               return 1;
+       }
+
+       /* Everything is now blank. Now wait for the correct password. */
+#ifdef HAVE_BSD_AUTH
+       readpw(dpy);
+#else
+       readpw(dpy, pws);
+#endif
+
+       /* Password ok, unlock everything and quit. */
+       for(screen = 0; screen < nscreens; screen++)
+               unlockscreen(dpy, locks[screen]);
+
+       free(locks);
+       XCloseDisplay(dpy);
+
+       return 0;
+}
index 29dc23b..401f8dc 100644 (file)
@@ -85,6 +85,7 @@ else
     let s:basePath = expand("$PRJ_DIR")
 endif
 let g:NERDTreeBookmarksFile = s:basePath . '/.vimBookmarks'
+let g:netrw_home=expand("$HOME") . '/.cache/
 
 
 " Mappings
diff --git a/vim/vimfiles/.netrwhist b/vim/vimfiles/.netrwhist
deleted file mode 100644 (file)
index ce01eb6..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =4
-let g:netrw_dirhist_1='/home/bdoumenc/sources/TVM_FRAMEWORK/trunk'
-let g:netrw_dirhist_2='/home/bdoumenc/sources/EQUIPEMENTS_ANDROID'
-let g:netrw_dirhist_3='/home/bdoumenc/work/equipment'
-let g:netrw_dirhist_4='/home/bdoumenc/work/equipment/spike'