Commit 717888aa11b7

@@ -227,7 +227,6 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes (quote ("53c542b560d232436e14619d058f81434d6bbcdc42e00a4db53d2667d841702e" "1989847d22966b1403bab8c674354b4a2adf6e03e0ffebe097a6bd8a32be1e19" "ce79400f46bd76bebeba655465f9eadf60c477bd671cbcd091fe871d58002a88" "bf648fd77561aae6722f3d53965a9eb29b08658ed045207fe32ffed90433eb52" "0ebe0307942b6e159ab794f90a074935a18c3c688b526a2035d14db1214cf69c" "90b5269aefee2c5f4029a6a039fb53803725af6f5c96036dee5dc029ff4dff60" "33c5a452a4095f7e4f6746b66f322ef6da0e770b76c0ed98a438e76c497040bb" "9bcb8ee9ea34ec21272bb6a2044016902ad18646bd09fdd65abae1264d258d89" "c7359bd375132044fe993562dfa736ae79efc620f68bab36bd686430c980df1c" "e26780280b5248eb9b2d02a237d9941956fc94972443b0f7aeec12b5c15db9f3" "7d4d00a2c2a4bba551fcab9bfd9186abe5bfa986080947c2b99ef0b4081cb2a6" "a774c5551bc56d7a9c362dca4d73a374582caedb110c201a09b410c0ebbb5e70" "d6a00ef5e53adf9b6fe417d2b4404895f26210c52bb8716971be106550cea257" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "37d0cdc1e79ae56cd1ea262dd6b84939fcc15d7977e320e2c7249c140aafc032" default)))
- '(org-agenda-files (quote ("/home/vincent/desktop/org/todos/computers.org" "/home/vincent/desktop/org/todos/eileo.org" "/home/vincent/desktop/org/todos/inbox.org" "/home/vincent/desktop/org/todos/personal.org" "/home/vincent/desktop/org/todos/xgbi.org" "/home/vincent/desktop/org/todos/zenika.org"))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

@@ -3,14 +3,15 @@
 
 (setq
  org-completion-use-ido t                  ;; use IDO for completion
- ; org-startup-indented t                  ;; ident by default
+ org-startup-indented t                  ;; ident by default
  org-tags-column -90                       ;; align tags on the 90th columns
  org-hide-leading-stars t                  ;; don't show leading stars
  org-cycle-separator-lines 0               ;; don't show blank lines between collapsed trees
  org-src-fontify-natively t                ;; fontify code blocks
  org-edit-src-content-indentation 0        ;; don't indent source blocks
  org-catch-invisible-edits 'error          ;; don't edit invisible text
-)
+ org-agenda-include-diary t
+ )
 
 ;; org files
 (setq org-directory "~/desktop/org/")
@@ -19,15 +20,25 @@
 
 ;; Todos keywords
 (setq org-todo-keywords
-      '((sequence "TODO(t)" "NEXT(n)" "SOMEDAY(S!)" "PROGRESS(p)" "|" "DONE(d!)")
-        (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)")))
+      (quote ((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d)")
+              (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)" "PHONE" "MEETING"))))
 
+(setq org-todo-keyword-faces
+      (quote (("TODO" :foreground "#EE0000" :weight bold)
+              ("NEXT" :foreground "#A197BF" :weight bold)
+              ("DONE" :foreground "#8fbfdc" :weight bold)
+              ("WAITING" :foreground "orange" :weight bold)
+              ("HOLD" :foreground "magenta" :weight bold)
+              ("CANCELLED" :foreground "forest green" :weight bold)
+              ("MEETING" :foreground "forest green" :weight bold)
+              ("PHONE" :foreground "forest green" :weight bold))))
 
-(require 'org-mobile)
-;; mobileorg settings
-(setq org-mobile-directory "/scpc:vincent@sif:desktop/org/")
-(setq org-mobile-inbox-for-pull "~/desktop/org/todos/inbox.org")
-(setq org-mobile-files '("~/desktop/org/todos/"))
+(defun my-org-mode-hook ()
+  "Personal org-mode-hook, that enable and disable stuff."
+  (define-key org-mode-map (kbd "C-c [") 'nil)
+  (define-key org-mode-map (kbd "C-c ]") 'nil)
+  )
+(add-hook 'org-mode-hook 'my-org-mode-hook)
 
 ;; Use bullets
 (require 'org-bullets)
@@ -38,6 +49,12 @@
 (require 'org-protocol)
 ;; (require 'org-mine)
 
+(require 'org-mobile)
+;; mobileorg settings
+(setq org-mobile-directory "/scpc:vincent@sif:desktop/org/")
+(setq org-mobile-inbox-for-pull "~/desktop/org/todos/inbox.org")
+(setq org-mobile-files '("~/desktop/org/todos/"))
+
 ;; org-babel
 (require 'ob)
 (setq org-src-fontify-natively t)