Merge remote-tracking branch 'ryuslash/master' into phoenix

Conflicts:
	.config/awesome/rc.lua
	.emacs.d/init.el
	.emacs.d/init.org
	.emacs.d/site-lisp/oni.el

3 files changed, 66 insertions, 1 deletions

diff --git a/.emacs.d/snippets/org-mode/Makefile b/.emacs.d/snippets/org-mode/Makefile
index e913708..34d4cd9 100644
--- a/.emacs.d/snippets/org-mode/Makefile
+++ b/.emacs.d/snippets/org-mode/Makefile
@@ -1,4 +1,4 @@
 DESTDIR:=$(DESTDIR)/org-mode
-objects=codeblock heading
+objects=codeblock heading project snippet
 
 include ../../../dotfiles.mk
diff --git a/.emacs.d/snippets/org-mode/project b/.emacs.d/snippets/org-mode/project
new file mode 100644
index 0000000..269d655
--- /dev/null
+++ b/.emacs.d/snippets/org-mode/project
@@ -0,0 +1,51 @@
+# -*- mode: snippet -*-
+# name: project
+# key: project
+# --
+#+TITLE: ${1:project_name}
+#+LINK: src    ${2:http://code.ryuslash.org/cgit.cgi/$3$1/}
+#+LINK: tar_gz $2${4:snapshot/$1-master}.tar.gz
+#+LINK: zip    $2$4.zip
+#+STARTUP: showall
+
+#+begin_html
+  <script src="/keyjs.js" type="text/javascript"></script>
+  <script type="text/javascript">
+    keyjs_initialize({ "u": [ "keyjs_goto", "../index.html" ],
+                       "h": [ "keyjs_goto", "http://ryuslash.org" ] });
+  </script>
+#+end_html
+
+#+INCLUDE: "dlmenu.inc"
+
+* About
+
+  ${5:A short description about $1}
+
+  | $0Status   | $6 |
+  | Language | $7 |
+  | License  | ${8:GPLv3} |
+
+* Why?
+
+  ${9:Why did you even think of writing $1?}
+
+* Features
+
+  ${10:$1 does...}
+
+* Dependencies
+
+  ${11:$1 needs to have...}
+
+* Download
+
+  ${12:To download $1...}
+
+* Install
+
+  ${13:To install $1...}
+
+* Usage
+
+  ${14:Using $1...}
\ No newline at end of file
diff --git a/.emacs.d/snippets/org-mode/snippet b/.emacs.d/snippets/org-mode/snippet
new file mode 100644
index 0000000..67f15d5
--- /dev/null
+++ b/.emacs.d/snippets/org-mode/snippet
@@ -0,0 +1,14 @@
+# -*- mode: snippet -*-
+# name: snippet
+# key: snippet
+# --
+#+TITLE: ${1:snippet-name}
+#+OPTIONS: toc:nil
+
+* $1
+
+  ${2:A short description abount $1}
+
+  #+BEGIN_SRC $3 :tangle yes
+$0
+  #+END_SRC
\ No newline at end of file