More org and evil org

This commit is contained in:
madmaurice 2017-10-08 16:10:53 +02:00
parent 47191d4813
commit 36657d36a4

View file

@ -69,14 +69,14 @@
'(shell-pop-window-position "top") '(shell-pop-window-position "top")
'(shell-pop-window-size 20) '(shell-pop-window-size 20)
'(show-trailing-whitespace t) '(show-trailing-whitespace t)
'(tool-bar-mode nil) '(tool-bar-mode nil))
'(org-directory "~/org")
'(org-agenda-files "~/org/agenda"))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(ivy-current-match ((t (:foreground "gold"))))
'(minibuffer-prompt ((t (:foreground "dark orange" :weight bold))))
'(neo-dir-link-face ((t (:foreground "#fce94f")))) '(neo-dir-link-face ((t (:foreground "#fce94f"))))
'(neo-expand-btn-face ((t (:foreground "#ffe070")))) '(neo-expand-btn-face ((t (:foreground "#ffe070"))))
'(neo-root-dir-face ((t (:foreground "#fff3c6" :weight bold)))) '(neo-root-dir-face ((t (:foreground "#fff3c6" :weight bold))))
@ -145,8 +145,18 @@
;; Org-mode ;; Org-mode
(use-package org (use-package org
:ensure t :ensure t
:config (progn :config
(global-set-key (kbd "<f12>") 'org-agenda))) (setq org-directory "~/org")
(setq org-agenda-files "~/org/agenda")
(global-set-key (kbd "<f12>") 'org-agenda)
(setq org-todo-keywords '((sequence "TODO" "DOING" "BLOCKED" "REVIEW" "|" "ABANDONED" "DONE")))
(setq org-todo-keyword-faces
'(("TODO" . "firebrick2")
("DOING" . "turquoise1")
("BLOCKED" . "orange red")
("REVIEW" . "dodger blue")
("ABANDONED" . "slate blue")
("DONE" . "green3"))))
;; Evil-mode ;; Evil-mode
(defun my/evil-go-back () (defun my/evil-go-back ()
@ -175,14 +185,14 @@
(define-key evil-motion-state-map [mouse-1] 'silence) (define-key evil-motion-state-map [mouse-1] 'silence)
(setq-default evil-cross-lines t)) (setq-default evil-cross-lines t))
;; (use-package evil-org (use-package evil-org
;; :ensure t :ensure t
;; :after org :demand t
;; :config :config
;; (add-hook 'org-mode-hook 'evil-org-mode) (add-hook 'org-mode-hook 'evil-org-mode)
;; (add-hook 'evil-org-mode-hook (add-hook 'evil-org-mode-hook
;; (lambda () (lambda ()
;; (evil-org-set-key-theme)))) (evil-org-set-key-theme '(navigation insert shift todo heading)))))
(use-package projectile (use-package projectile
:ensure t :ensure t