Permalink
Browse files

Merge branch 'master' of github.com:azer/emacsfiles

Conflicts:
	.gitmodules
	profiles/dev.el
  • Loading branch information...
2 parents a5ce952 + 7157969 commit 4813cdde9378cf3cfe931b6c83a7a67c11f2cb41 @azer committed May 1, 2012
Showing with 32 additions and 15 deletions.
  1. +3 −0 .gitmodules
  2. +3 −0 Makefile
  3. +4 −0 conf/coffee-script.el
  4. +9 −3 conf/deft.el
  5. +11 −12 conf/org.el
  6. +1 −0 lib/coffee-mode
  7. +1 −0 profiles/dev.el
View
@@ -40,3 +40,6 @@
[submodule "lib/ecb"]
path = lib/ecb
url = https://github.com/emacsmirror/ecb.git
+[submodule "lib/coffee-mode"]
+ path = lib/coffee-mode
+ url = git://github.com/defunkt/coffee-mode.git
View
@@ -11,6 +11,9 @@ all:
mv js2-mode.elc ../.;
echo "build successful."
+submodule:
+ git submodule add ${repo} lib/${name}
+
install:
@mkdir lib/themes
@echo "Locate your snippets in ~/.local/share/snippets"
@@ -0,0 +1,4 @@
+(add-lib-path "coffee-mode")
+(require 'coffee-mode)
+(add-to-list 'auto-mode-alist '("\\.coffee$" . coffee-mode))
+(add-to-list 'auto-mode-alist '("Cakefile" . coffee-mode))
View
@@ -1,6 +1,12 @@
(add-lib-path "deft")
(require 'deft)
-(setq deft-extension "txt")
-(setq deft-directory "~/docs/notes")
+(setq deft-extension "md")
+(setq deft-directory "~/projects/docs.kodfabrik.com")
(setq deft-text-mode 'markdown-mode)
-(global-set-key [f8] 'deft)
+
+(defun deft-start-and-refresh ()
+ (interactive)
+ (deft)
+ (deft-refresh))
+
+(global-set-key [f8] 'deft-start-and-refresh)
View
@@ -7,17 +7,16 @@
(setq org-log-done 'time)
(setq org-use-fast-todo-selection t)
-(setq org-todo-keyword-faces (quote (("TODO" :foreground "red" :weight bold)
- ("STARTED" :foreground "blue" :weight bold)
- ("DONE" :foreground "forest green" :weight bold)
- ("WAITING" :foreground "orange" :weight bold)
- ("SOMEDAY" :foreground "magenta" :weight bold)
- ("CANCELLED" :foreground "forest green" :weight bold)
- ("QUOTE" :foreground "red" :weight bold)
- ("QUOTED" :foreground "magenta" :weight bold)
- ("APPROVED" :foreground "forest green" :weight bold)
- ("EXPIRED" :foreground "forest green" :weight bold)
- ("REJECTED" :foreground "forest green" :weight bold)
- ("OPEN" :foreground "blue" :weight bold))))
+(setq org-todo-keywords
+ '((sequence "TODO" "STARTED" "WAITING" "|" "DONE" "CANCELLED")))
+
+(setq org-todo-keyword-faces
+ '(("TODO" :foreground "red" :weight bold)
+ ("STARTED" :foreground "light blue" :weight bold)
+ ("DONE" :foreground "forest green" :weight bold)
+ ("WAITING" :foreground "orange" :weight bold)
+ ("CANCELLED" :foreground "forest green" :weight bold)
+ ("QUOTE" :foreground "red" :weight bold)
+ ("QUOTED" :foreground "magenta" :weight bold)))
(run-at-time "00:59" 3600 'org-save-all-org-buffers)
Submodule coffee-mode added at 244d4b
View
@@ -13,5 +13,6 @@
(load-conf-file "yasnippet.el")
(load-conf-file "rust.el")
(load-conf-file "ecb.el")
+(load-conf-file "coffee-script.el")
(load-conf-file "durendal.el")

0 comments on commit 4813cdd

Please sign in to comment.