yasnippets

3 files changed, 18 insertions, 10 deletions

diff --git a/snippets/org-mode/org-basic b/snippets/org-mode/org-basic
deleted file mode 100644
index 81a3bdc..0000000
--- a/snippets/org-mode/org-basic
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: Org mode basic template
-# key: /skel
-# --
-
-#+TITLE: ${1:Default Title}
-#+AUTHOR: ${2:Marius Peter}
-#+DATE: `(org-time-stamp nil)`
diff --git a/snippets/org-mode/org-doc b/snippets/org-mode/org-doc
new file mode 100644
index 0000000..ce19410
--- /dev/null
+++ b/snippets/org-mode/org-doc
@@ -0,0 +1,16 @@
+# -*- mode: snippet -*-
+# name: default
+# key: $default
+# --
+# -*- mode: org; -*-
+
+#+TITLE: ${1:Default Title}
+#+AUTHOR: ${2:`(if (eq user-full-name "") "Default Author" user-full-name)`}
+#+DATE: ${3:`(with-temp-buffer (org-insert-time-stamp (current-time)))`}
+
+#+SETUPFILE: ~/.emacs.d/templates/documents/default.org
+#+INCLUDE: ~/.emacs.d/templates/documents/default.org_title
+
+$0
+
+
diff --git a/snippets/org-mode/src b/snippets/org-mode/src
index e6da583..cdada53 100644
--- a/snippets/org-mode/src
+++ b/snippets/org-mode/src
@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: src
-# key: src
+# key: $src
 # --
-#+BEGIN_SRC ${1:emacs-lisp}
+#+BEGIN_SRC ${1:emacs-lisp} ${2::tangle yes}
 $0
 #+END_SRC