Update config to use i3menu on Mod1+p, update Makefile to compile/install i3lock...

diff --git a/Makefile b/Makefile
index ed216c00724e1c9fd4eccf53f96347494bbe5918..3e1fa8923903dc0b5a9ee98a808644d03bcaf0fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 UNAME=$(shell uname)
 DEBUG=1
 INSTALL=install
+MAKE=make
 
 CFLAGS += -std=c99
 CFLAGS += -pipe
@@ -39,12 +40,16 @@ src/%.o: src/%.c ${HEADERS}
 
 all: ${FILES}
        $(CC) -o i3 ${FILES} $(LDFLAGS)
+       $(MAKE) -C src/i3lock
+       $(MAKE) -C src/i3menu
 
 install: all
        $(INSTALL) -d -m 0755 $(DESTDIR)/usr/bin
        $(INSTALL) -d -m 0755 $(DESTDIR)/etc/i3
        $(INSTALL) -m 0755 i3 $(DESTDIR)/usr/bin/
        test -e $(DESTDIR)/etc/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)/etc/i3/config
+       $(MAKE) -C src/i3lock install
+       $(MAKE) -C src/i3menu install
 
 clean:
        rm -f src/*.o

diff --git a/i3.config b/i3.config
index 0d7488a6730bf09d8a7b7be61d424101dd3a103d..c6990a57e54206ceed6635136a23ef4f97f90e4d 100644 (file)
--- a/i3.config
+++ b/i3.config
@@ -72,5 +72,9 @@ bind Mod1+Shift+19 m10
 # Mod1+Enter starts a new terminal
 bind Mod1+36 exec /usr/bin/urxvt
 
+# Mod1+p starts dmenu and launches the selected application
+# for now, we don’t have an own launcher
+bind Mod1+55 exec /usr/local/bin/dmenu_run
+
 # Mod1+Shift+r restarts i3 inplace
 bind Mod1+Shift+27 restart