merge origine/master

diff --git a/emacs.d/.gitignore b/emacs.d/.gitignore
index bbabeb3..9a35196 100644 (file)
--- a/emacs.d/.gitignore
+++ b/emacs.d/.gitignore
@@ -1,3 +1,4 @@
+.*
 elpa/*
 games/*
 test/*
@@ -13,4 +14,5 @@ recentf
 projectile-bookmarks.eld
 config/init-my-theme-2.el
 config/my-color-theme.el
-\#*
\ No newline at end of file
+\#*
+temp/*

diff --git a/emacs.d/config/init-base.el b/emacs.d/config/init-base.el
index 00fa25b..7caaace 100644 (file)
--- a/emacs.d/config/init-base.el
+++ b/emacs.d/config/init-base.el
@@ -29,8 +29,14 @@
 
 (set-face-attribute 'vertical-border nil  :foreground "gray")
 
+(defalias 'yes-or-no-p 'y-or-n-p)
 
+(setq scroll-margin 5)
+(setq scroll-conservatively 10000)
+(show-paren-mode t)
 
 
-
+(add-hook 'help-mode-hook
+         (lambda ()
+           (linum-mode -1)))
 (provide 'init-base)

diff --git a/emacs.d/config/init-color-theme.el b/emacs.d/config/init-color-theme.el
index 65b5460..3fee5b8 100644 (file)
--- a/emacs.d/config/init-color-theme.el
+++ b/emacs.d/config/init-color-theme.el
@@ -20,6 +20,7 @@
 
 ;;; this variable should equal as height in mode-line
 (custom-set-variables
+ '(powerline-height 14)
  '(powerline-text-scale-factor 0.85)) ;; 100/140
 
 (custom-set-faces

diff --git a/emacs.d/config/init-eshell.el b/emacs.d/config/init-eshell.el
new file mode 100644 (file)
index 0000000..9beb3f8
--- /dev/null
+++ b/emacs.d/config/init-eshell.el
@@ -0,0 +1,9 @@
+
+(add-hook 'eshell-mode-hook
+         (lambda ()
+           (linum-mode -1)
+           (highlight-current-line-on nil)))
+
+
+
+(provide 'init-eshell)

diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el
index 235dd34..00dd991 100644 (file)
--- a/emacs.d/config/init-evil.el
+++ b/emacs.d/config/init-evil.el
@@ -23,21 +23,30 @@
 (define-key evil-normal-state-map "\C-o" nil)
 
 
-(global-evil-leader-mode)
-(evil-leader/set-leader ";")
-(evil-leader/set-key "e" 'find-file)
-(evil-leader/set-key "f" 'recentf-ido-find-file)
-(evil-leader/set-key "b" 'switch-to-buffer)
-(evil-leader/set-key "w" 'evil-write)
 
-(evil-leader/set-key "s" 'split-window-below)
-(evil-leader/set-key "v" 'split-window-right)
-(evil-leader/set-key "q" 'delete-window)
+
+;; M-e not works correctly in evil-normal mode, this fix it
+(define-key evil-normal-state-map "\M-e" (lambda() (interactive)
+                                          (forward-sentence 2)))
+(define-key evil-motion-state-map "\C-e" (move-end-of-line 1))
+
+
+
+(global-evil-leader-mode)
+(evil-leader/set-leader "s")
+(evil-leader/set-key "j" 'helm-mini)
+(evil-leader/set-key "k" 'helm-find-files)
 
 (setq key-chord-two-keys-delay 0.5)
 (key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
 (key-chord-define evil-emacs-state-map "jj" 'evil-normal-state)
 
+
+(key-chord-define evil-normal-state-map ";w" 'save-buffer)
+(key-chord-define evil-normal-state-map ";s" 'split-window-below)
+(key-chord-define evil-normal-state-map ";v" 'split-window-right)
+(key-chord-define evil-normal-state-map ";;" 'helm-find-files)
+
 (key-chord-mode 1)
 
 (define-key evil-normal-state-map [escape] 'keyboard-quit)
@@ -51,8 +60,7 @@
 
 
 ;; cursor shape
-;(setq evil-emacs-state-cursor '("red" box))
-(setq evil-emacs-state-cursor '("red" bar))
+(setq evil-emacs-state-cursor '("red" box))
 (setq evil-normal-state-cursor '("green" box))
 (setq evil-visual-state-cursor '("orange" box))
 (setq evil-insert-state-cursor '("red" bar))

diff --git a/emacs.d/config/init-helm.el b/emacs.d/config/init-helm.el
index 2487a0a..d656eeb 100644 (file)
--- a/emacs.d/config/init-helm.el
+++ b/emacs.d/config/init-helm.el
@@ -10,13 +10,13 @@
 
 ;; helm-mini
 ;;(global-set-key (kbd "C-x b") 'helm-mini)
-(global-set-key (kbd "C-o C-j") 'helm-mini)
+;;(global-set-key (kbd "C-o C-j") 'helm-mini)
 (setq helm-buffers-fuzzy-matching t
       helm-recentf-fuzzy-match    t)
 
 ;; helm-find-file
 ;(global-set-key (kbd "C-x C-f") 'helm-find-files)
-(global-set-key (kbd "C-o C-f") 'helm-find-files)
+;;(global-set-key (kbd "C-o C-f") 'helm-find-files)
 
 
 
@@ -42,4 +42,16 @@
 (helm-adaptative-mode 1)
 (setq helm-adaptive-history 1)
 
+
+;;j;(defun helm-buffer-face-mode ()
+;;j;  "Helm buffer face"
+;;j;  (interactive)
+;;j;  (with-helm-buffer
+;;j;  (setq line-spacing 2)
+;;j;  (buffer-face-set '(:family "Source Code Pro" :height 100))))
+                                                             
+
+;;;(add-hook 'helm-update-hook 'helm-buffer-face-mode)
+
+
 (provide 'init-helm)

diff --git a/emacs.d/config/init-hydra.el b/emacs.d/config/init-hydra.el
index e77f159..2f8e41b 100644 (file)
--- a/emacs.d/config/init-hydra.el
+++ b/emacs.d/config/init-hydra.el
@@ -4,23 +4,26 @@
 ;; misc operation for toggle some style
 ;; such as toggle line number
 ;; windows layout restore / maximum
-;; 
 
-;; misc such as
-;; package-list-p, eval-buffer
-
-(defhydra hydra-helm (global-map "M-c")
-  "Helm"
-  ("j" helm-mini "helm-mini")
-  ("q" nil "quit"))
-;;* Examples
-;;** Example 1: text scale
 
   (defhydra hydra-zoom (global-map "<f2>")
     "zoom"
     ("g" text-scale-increase "in")
     ("l" text-scale-decrease "out"))
 
+;; Misc commands
+(defhydra hydra-misc (:exit t)
+  "Misc commancs"
+  ("p" (lambda ()
+        (interactive)
+        (if (buffer-exists "*Packages*")
+            (switch-to-buffer "*Packages*")
+          (package-list-packages)))
+   "list-package" :color red)
+  ("e" eval-buffer "eval-buffer" :color red))
+
+(defun buffer-exists (bufname)   (not (eq nil (get-buffer bufname))))
+(global-set-key (kbd "M-c") 'hydra-misc/body)
 
 (global-set-key
 ; (kbd "C-M-o")
@@ -53,6 +56,14 @@
 ;(defun pl-last-winner ()
   
 
+;;(defhydra hydra-launcher (:color blue :columns 2)
+;;   "Launch"
+;;   ("h" man "man")
+;;   ("r" (browse-url "http://www.reddit.com/r/emacs/") "reddit")
+;;   ("w" (browse-url "http://www.emacswiki.org/") "emacswiki")
+;;   ("s" shell "shell")
+;;   ("q" nil "cancel"))
+
 ;; define C-space start mark 
 
 
@@ -77,20 +88,6 @@
 
 
 
-;;** Example 4: toggle rarely used modes
-
-;  (defvar whitespace-mode nil)
-;  (global-set-key
-;   (kbd "C-c C-v")
-;   (defhydra hydra-toggle-simple (:color blue)
-;     "toggle"
-;     ("a" abbrev-mode "abbrev")
-;     ("d" toggle-debug-on-error "debug")
-;     ("f" auto-fill-mode "fill")
-;     ("t" toggle-truncate-lines "truncate")
-;     ("w" whitespace-mode "whitespace")
-;     ("q" nil "cancel")))
-
 
 
 ;;** Example 5: mini-vi
@@ -101,20 +98,20 @@
   (set-cursor-color "#ffffff"))
 
 
-  (global-set-key
-   (kbd "C-z")
-   (defhydra hydra-vi (:pre hydra-vi/pre :post hydra-vi/post :color amaranth)
-     "vi"
-     ("l" forward-char)
-     ("h" backward-char)
-     ("j" next-line)
-     ("k" previous-line)
-     ("m" set-mark-command "mark")
-     ("a" move-beginning-of-line "beg")
-     ("e" move-end-of-line "end")
-     ("d" delete-region "del" :color blue)
-     ("y" kill-ring-save "yank" :color blue)
-     ("q" nil "quit")))
+;  (global-set-key
+;   (kbd "C-z")
+;   (defhydra hydra-vi (:pre hydra-vi/pre :post hydra-vi/post :color amaranth)
+;     "vi"
+;     ("l" forward-char)
+;     ("h" backward-char)
+;     ("j" next-line)
+;     ("k" previous-line)
+;     ("m" set-mark-command "mark")
+;     ("a" move-beginning-of-line "beg")
+;     ("e" move-end-of-line "end")
+;     ("d" delete-region "del" :color blue)
+;     ("y" kill-ring-save "yank" :color blue)
+;     ("q" nil "quit")))
 
 (setq hydra-lv nil)
 
@@ -302,3 +299,18 @@ _h_   _l_   _o_k        _y_ank
       (goto-char mk))))
 
 (provide 'init-hydra)
+
+
+;;** Example 4: toggle rarely used modes
+
+;  (defvar whitespace-mode nil)
+;  (global-set-key
+;   (kbd "C-c C-v")
+;   (defhydra hydra-toggle-simple (:color blue)
+;     "toggle"
+;     ("a" abbrev-mode "abbrev")
+;     ("d" toggle-debug-on-error "debug")
+;     ("f" auto-fill-mode "fill")
+;     ("t" toggle-truncate-lines "truncate")
+;     ("w" whitespace-mode "whitespace")
+;     ("q" nil "cancel")))

diff --git a/emacs.d/config/init-key-binding.el b/emacs.d/config/init-key-binding.el
index 980f191..bf90894 100644 (file)
--- a/emacs.d/config/init-key-binding.el
+++ b/emacs.d/config/init-key-binding.el
@@ -1,11 +1,8 @@
 ;; This  file is for some global key binding
 
-
-
-
 (require 'key-chord)
 
-(setq key-chord-two-keys-delay 0.2)
+;(setq key-chord-two-keys-delay 0.2)
 
 ;; from emacs conference 2015 workshop
 (defun keychord-keymap (keychord bindings)
@@ -15,57 +12,25 @@
   (key-chord-define-global keychord keymap))
 
 
+
+
+;;; keychord
+;;;
 (defun switch-to-previous-buffer ()
   "Switch to previously open buffer. Repeated invocations toggle between the two most recently open buffers."
   (interactive)
   (switch-to-buffer (other-buffer (current-buffer) 1)))
 
 
-
-
 ;; main keymap
-(keychord-keymap "ss"
-                 '(("j" . helm-mini)
-                   ("k" . find-file)
-                  ("o" . delete-other-windows)))
-
-;; misc
-;; eval-buffer
-;; packet-list-install
-;; 
-
+;n(keychord-keymap "ss"
+;                 '(("j" . helm-mini)
+;                   ("k" . find-file)
+;                 ("o" . delete-other-windows)))
 
 ;; for some helm key mapping
-(key-chord-define-global "sj" 'helm-mini)
-(key-chord-define-global "sk" 'helm-find-files)
-
-;;
-(key-chord-define-global ";w" 'save-buffer)
-(key-chord-define-global ";s" 'split-window-below)
-(key-chord-define-global ";v" 'split-window-right)
-(key-chord-define-global ";q" 'delete-window)
-
-;(key-chord-define-global "x0" 'other-window)
-;(key-chord-define-global "x1" 'delete-other-windows)
-
-
-;; same  set ESC ESC as a prefix key map
-;; Windows
-;(global-set-key (kbd "<escape> M-a") 'find-file)
-(global-set-key (kbd "<escape> M-o") 'delete-other-windows)
-(global-set-key (kbd "<escape> M-h") 'other-window)
-(global-set-key (kbd "<escape> M-j") 'find-file)
-(global-set-key (kbd "<escape> M-k") 'find-file)
-(global-set-key (kbd "<escape> M-l") 'find-file)
-
-
-;; project
-(global-set-key (kbd "<escape> M-n") 'find-file)
-(global-set-key (kbd "<escape> M-m") 'find-file)
-(global-set-key (kbd "<escape> M-p") 'find-file)
-(global-set-key (kbd "<escape> M-u") 'find-file)
-(global-set-key (kbd "<escape> M-y") 'find-file)
-;(global-set-key (kbd "<escape> <escape>") 'find-file)
+;(key-chord-define-global "sj" 'helm-mini)
+;(key-chord-define-global "sk" 'helm-find-files)
 
 
 (key-chord-define-global "JJ" 'save-buffer)
@@ -100,11 +65,122 @@
 
 (key-chord-mode 1)
 
-;;;;;;;;;;;;;(provide 'init-keychord)
+
+
+;;; global key mapping, windows buffer, tab, project
+;;;
+(defun pl-make-keymap (key bindings)
+  (setq keymap (make-sparse-keymap))
+  (dolist (binding bindings)
+    (define-key keymap (car binding) (cdr binding)))
+  (global-set-key key keymap))
+
+;; ESC s j
+(pl-make-keymap "\M-s"
+            '(("j" . helm-mini)
+             ("k" . helm-find-files)
+             ("w" . save-buffer)
+             ("q" . helm-find-files)
+             ("-" . split-window-below)
+             ("\\" . split-window-right)
+;            ("\M-s" . split-window-below)
+;            ("\M-v" . split-window-right)
+             ("o" . occur)
+             ("b" . helm-find-files)))
+
+;; ESC ; j M-; add comment, 
+(pl-make-keymap "\M-;"
+            '(("v" . split-window-below)
+             ("h" . split-window-right)
+             ("b" . helm-find-files)))
+
+;; ESC c 
+;(pl-make-keymap "\M-c"
+;            '(("v" . split-window-below)
+;            ("h" . split-window-right)
+;            ("b" . helm-find-files)))
+
+
+;; Esc o - set font , can change
+;; M-l M-u low/up caps can changed
+;; M-t transpose, not used, changed
+;; M-z
+;; M-c capitialize
+
+
+;(global-set-key (kbd "M-s j") 'helm-mini)
+;(global-set-key (kbd "M-s k") 'helm-find-files)
+
+;; ESC ESC + i
+(global-set-key (kbd "ESC M-h") 'helm-mini)
+(global-set-key (kbd "ESC M-j") 'helm-mini)
+(global-set-key (kbd "ESC M-k") 'helm-mini)
+(global-set-key (kbd "ESC M-l") 'helm-mini)
+(global-set-key (kbd "ESC M-;") 'helm-mini)
+(global-set-key (kbd "ESC M-y") 'helm-mini)
+(global-set-key (kbd "ESC M-u") 'helm-mini)
+(global-set-key (kbd "ESC M-i") 'helm-mini)
+(global-set-key (kbd "ESC M-o") 'other-window)
+(global-set-key (kbd "ESC M-p") 'helm-mini)
+(global-set-key (kbd "ESC M-n") 'helm-mini)
+(global-set-key (kbd "ESC M-m") 'helm-mini)
+(global-set-key (kbd "ESC M-y") 'helm-mini)
+(global-set-key (kbd "ESC M-s") 'split-window-below)
+(global-set-key (kbd "ESC M-v") 'split-window-right)
+(global-set-key (kbd "ESC M-u") 'helm-mini)
+(global-set-key (kbd "ESC M-i") 'helm-mini)
+(global-set-key (kbd "ESC M-p") 'helm-mini)
+(global-set-key (kbd "ESC M-;") 'helm-mini)
+(global-set-key (kbd "ESC M-1") 'delete-other-windows)
+(global-set-key (kbd "ESC M-2") 'split-window-below)
+(global-set-key (kbd "ESC M-3") 'split-window-right)
+
+
+(global-set-key (kbd "C-; C-j") 'helm-mini)
+
+;(global-set-key (kbd "<escape> j") 'helm-mini)
+;(global-set-key (kbd "<escape> k") 'helm-find-files)
+;(global-set-key (kbd "<escape> l") 'find-file)
+;(global-set-key (kbd "<escape> f") 'find-file)
+;(global-set-key (kbd "<escape> M-a") 'find-file)
+;(global-set-key (kbd "<escape> M-a") 'find-file)
+;(global-set-key (kbd "<escape> M-a") 'find-file)
+;(global-set-key (kbd "<escape> M-o") 'delete-other-windows)
+;(global-set-key (kbd "<escape> M-h") 'other-window)
+;(global-set-key (kbd "<escape> M-j") 'find-file)
+;(global-set-key (kbd "<escape> M-k") 'find-file)
+;(global-set-key (kbd "<escape> M-l") 'find-file)
+
+
+
+(defvar sacha/windmove-map (make-sparse-keymap))
+(define-key sacha/windmove-map "h" 'windmove-left)
+(define-key sacha/windmove-map "t" 'windmove-up)
+(define-key sacha/windmove-map "n" 'windmove-down)
+(define-key sacha/windmove-map "s" 'windmove-right)
+(define-key sacha/windmove-map "[left]" 'windmove-left)
+(define-key sacha/windmove-map "[up]" 'windmove-up)
+(define-key sacha/windmove-map "[down]" 'windmove-down)
+(define-key sacha/windmove-map "[right]" 'windmove-right)
+;(key-chord-define-global "yy"     sacha/windmove-map)
+
+
+
+;; project
+;(global-set-key (kbd "<escape> M-n") 'find-file)
+;(global-set-key (kbd "<escape> M-m") 'find-file)
+;(global-set-key (kbd "<escape> M-p") 'find-file)
+;(global-set-key (kbd "<escape> M-u") 'find-file)
+;(global-set-key (kbd "<escape> M-y") 'find-file)
+;(global-set-key (kbd "<escape> <escape>") 'find-file)
+
+
 
 
 (setq mac-command-modifier 'super) ; make cmd key do Meta
 
+
+
 ;; super key for elscreen tabs
 (global-set-key (kbd "<s-return>") 'toggle-frame-fullscreen)
 (global-set-key (kbd "s-t") 'elscreen-create)
@@ -143,21 +219,24 @@
 ;;----------------------------------------------------------------------------
 ;; C-o prefix binding for some File/Buffer switching/openning
 ;;
-(global-unset-key "\C-o")
+;;(global-unset-key "\C-o")
 ;;(global-set-key (kbd "C-o C-o") 'keyboard-quit);; same as C-g to quit
 ;;; c-o c-o swith to normal mode 
-(global-set-key (kbd "C-o C-o") 'evil-normal-state)
+;(global-set-key (kbd "C-o C-o") 'evil-normal-state)
 ;;(global-set-key (kbd "C-o C-o") 'fiplr-find-file)
-(global-set-key (kbd "C-o C-f") 'ido-find-file)
-(global-set-key (kbd "C-o C-n") 'recentf-ido-find-file)
-(global-set-key (kbd "C-o C-j") 'ido-switch-buffer)
+;(global-set-key (kbd "C-o C-f") 'ido-find-file)
+;(global-set-key (kbd "C-o C-n") 'recentf-ido-find-file)
+;(global-set-key (kbd "C-o C-j") 'ido-switch-buffer)
 ;(global-set-key (kbd "C-o C-j") 'ido-find-file)
 
 
-(global-set-key (kbd "C-o C-g") 'ggtags-find-file)
-(global-set-key (kbd "C-o C-t") 'ggtags-find-tag-dwim)
+;(global-set-key (kbd "C-o C-g") 'ggtags-find-file)
+;(global-set-key (kbd "C-o C-t") 'ggtags-find-tag-dwim)
 
-(global-set-key (kbd "M-g M-g") 'magit-status)
+;(global-set-key (kbd "M-g M-g") 'magit-status)
+
+(global-set-key [f7] 'winner-undo)
+(global-set-key [C-f7] 'winner-redo)
 
 
 (defun recentf-ido-find-file ()
@@ -168,10 +247,7 @@
       (find-file file))))
 
 
-;;----------------------------------------------------------------------------
-;; M-g prefix binding for some commands
-;;
-
-
+(global-set-key "\C-s" 'isearch-forward-regexp)
+(global-set-key "\C-r" 'isearch-backward-regexp)
 
 (provide 'init-key-binding)

diff --git a/emacs.d/config/init-linum.el b/emacs.d/config/init-linum.el
index 142403b..fd43e27 100644 (file)
--- a/emacs.d/config/init-linum.el
+++ b/emacs.d/config/init-linum.el
@@ -19,7 +19,7 @@
   "The current line number.")
 
 (defun my-linum-get-format-string ()
- (let* ((width (min 4 (1+ (length (number-to-string
+ (let* ((width (max 3 (1+ (length (number-to-string
                              (count-lines (point-min) (point-max)))))))
          (format (concat "%" (number-to-string width) "d "))
          (current-line-format (concat "%-" (number-to-string width) "d ")))

diff --git a/emacs.d/config/init-multi-term.el b/emacs.d/config/init-multi-term.el
new file mode 100644 (file)
index 0000000..8fdd9e2
--- /dev/null
+++ b/emacs.d/config/init-multi-term.el
@@ -0,0 +1,23 @@
+
+
+;; http://rawsyntax.com/blog/learn-emacs-zsh-and-multi-term/
+;; color display
+;; tic -o ~/.terminfo /usr/local/Cellar/emacs/24.5/share/emacs/24.5/etc/e/eterm-color.ti
+
+(require 'multi-term)
+
+(setq multi-term-program "/bin/zsh")
+(setq system-uses-terminfo nil)
+
+(add-hook 'term-mode-hook
+          (lambda ()
+           (linum-mode -1)
+           (highlight-current-line-on nil)))
+
+
+(add-to-list 'term-bind-key-alist '("C-c C-n" . multi-term-next))
+(add-to-list 'term-bind-key-alist '("C-c C-p" . multi-term-prev))
+(add-to-list 'term-bind-key-alist '("C-c C-j" . term-line-mode))
+(add-to-list 'term-bind-key-alist '("C-c C-k" . term-char-mode))
+
+(provide 'init-multi-term)

diff --git a/emacs.d/config/init-org.el b/emacs.d/config/init-org.el
index 10d171a..9f14e0f 100644 (file)
--- a/emacs.d/config/init-org.el
+++ b/emacs.d/config/init-org.el
@@ -19,8 +19,11 @@
 ;;                      (define-key yas/keymap [tab] 'yas/next-field-or-maybe-expand)))
 
 
+;(org-indent-mode 1)
+
 
 ;; org-todo
+;; define more state of todo
 (setq org-todo-keywords
       (quote ((sequence "TODO(t)" "STARTED(s)" "|" "DONE(d)")
               (sequence "WAITING(w@/!)" "HOLD(h@/!)" "|" "CANCELLED(c@/!)" ))))
@@ -36,8 +39,11 @@
               ("PHONE" :foreground "forest green" :weight bold))))
 
 (setq org-use-fast-todo-selection t)
+
+;; allow S-left/right to rotate state not set timestamp and add note
 (setq org-treat-S-cursor-todo-selection-as-state-change nil)
 
+;; trigger a tags for the task when changing state
 (setq org-todo-state-tags-triggers
       (quote (("CANCELLED" ("CANCELLED" . t))
               ("WAITING" ("WAITING" . t))
@@ -54,5 +60,75 @@
 (define-key global-map "\C-cc" 'org-capture)
 
 
+(setq org-refile-targets (quote ((nil :maxlevel . 9)
+                                 (org-agenda-files :maxlevel . 9))))
+
+
+
+
+;; Capture templates for: TODO tasks, Notes, appointments, phone calls, meetings, and org-protocol
+;(setq org-capture-templates
+;      (quote (("t" "todo" entry (file "~/git/org/refile.org")
+;               "* TODO %?\n%U\n%a\n" :clock-in t :clock-resume t)
+;              ("r" "respond" entry (file "~/git/org/refile.org")
+;               "* NEXT Respond to %:from on %:subject\nSCHEDULED: %t\n%U\n%a\n" :clock-in t :clock-resume t :immediate-finish t)
+;              ("n" "note" entry (file "~/git/org/refile.org")
+;               "* %? :NOTE:\n%U\n%a\n" :clock-in t :clock-resume t)
+;              ("j" "Journal" entry (file+datetree "~/git/org/diary.org")
+;               "* %?\n%U\n" :clock-in t :clock-resume t)
+;              ("w" "org-protocol" entry (file "~/git/org/refile.org")
+;               "* TODO Review %c\n%U\n" :immediate-finish t)
+;              ("m" "Meeting" entry (file "~/git/org/refile.org")
+;               "* MEETING with %? :MEETING:\n%U" :clock-in t :clock-resume t)
+;              ("p" "Phone call" entry (file "~/git/org/refile.org")
+;               "* PHONE %? :PHONE:\n%U" :clock-in t :clock-resume t)
+;              ("h" "Habit" entry (file "~/git/org/refile.org")
+;               "* NEXT %?\n%U\n%a\nSCHEDULED: %(format-time-string \"%<<%Y-%m-%d %a .+1d/3d>>\")\n:PROPERTIES:\n:STYLE: habit\n:REPEAT_TO_STATE: NEXT\n:END:\n"))))
+
+
+;;; org-tag
+; Tags with fast selection keys
+(setq org-tag-alist (quote ((:startgroup)
+                            ("@errand" . ?e)
+                            ("@office" . ?o)
+                            ("@home" . ?H)
+                            ("@farm" . ?f)
+                            (:endgroup)
+                            ("WAITING" . ?w)
+                            ("HOLD" . ?h)
+                            ("PERSONAL" . ?P)
+                            ("WORK" . ?W)
+                            ("FARM" . ?F)
+                            ("ORG" . ?O)
+                            ("NORANG" . ?N)
+                            ("crypt" . ?E)
+                            ("NOTE" . ?n)
+                            ("CANCELLED" . ?c)
+                            ("FLAGGED" . ??))))
+
+; Allow setting single tags without the menu
+(setq org-fast-tag-selection-single-key (quote expert))
+
+; For tag searches ignore tasks with scheduled and deadline dates
+(setq org-agenda-tags-todo-honor-ignore-options t)
+
+
+;; Always hilight the current agenda line
+(add-hook 'org-agenda-mode-hook
+          '(lambda () (hl-line-mode 1))
+          'append)
+
+
+
+;; The following custom-set-faces create the highlights
+(custom-set-faces
+  ;; custom-set-faces was added by Custom.
+  ;; If you edit it by hand, you could mess it up, so be careful.
+  ;; Your init file should contain only one such instance.
+  ;; If there is more than one, they won't work right.
+ '(org-mode-line-clock ((t (:background "grey75" :foreground "red" :box (:line-width -1 :style released-button)))) t))
+
+
+
 
 (provide 'init-org)

diff --git a/emacs.d/config/init-project.el b/emacs.d/config/init-project.el
index 25d1539..18795d7 100644 (file)
--- a/emacs.d/config/init-project.el
+++ b/emacs.d/config/init-project.el
@@ -8,11 +8,5 @@
 
 
 
-(require 'projectile)
-(projectile-global-mode)
-(setq projectile-enable-caching t)
-
-
-(require 'projectile-speedbar)
 
 (provide 'init-project)

diff --git a/emacs.d/config/init-projectile.el b/emacs.d/config/init-projectile.el
new file mode 100644 (file)
index 0000000..866cf7e
--- /dev/null
+++ b/emacs.d/config/init-projectile.el
@@ -0,0 +1,30 @@
+
+
+
+(require 'projectile)
+
+
+(projectile-global-mode)
+(setq projectile-enable-caching t)
+
+
+(require 'projectile-speedbar)
+
+
+
+(provide 'init-projectile)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

diff --git a/emacs.d/config/init-workgroup2.el b/emacs.d/config/init-workgroup2.el
index 8f90e07..ebef2cb 100644 (file)
--- a/emacs.d/config/init-workgroup2.el
+++ b/emacs.d/config/init-workgroup2.el
@@ -3,7 +3,7 @@
 
 
 (setq wg-prefix-key (kbd "C-c z"))
-(setq wg-session-file "~/.emacs.d/.emacs_workgroups")
+(setq wg-session-file "~/.emacs.d/temp/.emacs_workgroups")
 (setq wg-mode-line-display-on t)          ; Default: (not (featurep 'powerline))
 (setq wg-flag-modified t)                 ; Display modified flags as well
 (setq wg-mode-line-decor-left-brace "["

diff --git a/emacs.d/config/my-packages.el b/emacs.d/config/my-packages.el
index 39faf48..05feef0 100644 (file)
--- a/emacs.d/config/my-packages.el
+++ b/emacs.d/config/my-packages.el
@@ -37,7 +37,6 @@
     tangotango-theme
     cyberpunk-theme
     hydra
-    projectile
     projectile-speedbar
     ecb
     ggtags
@@ -59,6 +58,10 @@
     use-package
     helm-gtags
     icicles
+    ace-window
+    multi-term
+    projectile
+    page-break-lines
   ) "a list of packages to ensure are installed at launch.")
 
 (require 'cl)

diff --git a/emacs.d/init.el b/emacs.d/init.el
index efd6193..07ef18f 100644 (file)
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,8 +1,3 @@
-;;;(if (eq system-type 'darwin)
-;;;  (setenv "PATH"
-;;;)   (concat (getenv "path") ":/usr/local/bin:~/bin/")
-;;;  )
-
 
 (setenv "PATH" (concat (getenv "PATH") ":/usr/local/bin"))
 (setq exec-path (append exec-path '("/usr/local/bin")))
@@ -12,8 +7,6 @@
 
 (add-to-list 'load-path "~/.emacs.d/config")
 
-(global-set-key "\C-s" 'isearch-forward-regexp)
-(global-set-key "\C-r" 'isearch-backward-regexp)
 
 (require 'init-base)
 (require 'init-font)
@@ -23,28 +16,24 @@
 (require 'init-color-theme)
 ;(require 'init-ido)
 (require 'init-magit)
-;(require 'init-evil)
+(require 'init-evil)
 (require 'init-project)
 (require 'init-ggtags)
 
-(setq scroll-margin 5)
-(setq scroll-conservatively 10000)
-(show-paren-mode t)
-
 
 ;;;; conflict with C-c . in org-mode, disable it temporarily
 ;;;;(require 'init-c-cpp)
 (require 'init-key-binding)
 (require 'init-winner)
 (require 'init-minibuffer)
-
+(require 'init-eshell)
 
 ;; http://stackoverflow.com/questions/11484225/fix-an-auto-complete-mode-and-linum-mode-annoyance
 ;;;(ac-linum-workaround)
 
 
 (require 'init-mode-line)
-(require 'init-workgroup2)
+;(require 'init-workgroup2)
 (require 'init-perl)
 
 ;(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/")
@@ -119,25 +108,33 @@
 ;(icy-mode 1)
 
 
-(require 'init-org)
+;(require 'init-org)
 (setq help-window-select t)
 
 
-  (add-to-list 'load-path "~/.emacs.d/site-lisp/eim")
-  (autoload 'eim-use-package "eim" "Another emacs input method")
-
-  (register-input-method
-   "eim-wb" "euc-cn" 'eim-use-package
-   "五笔" "汉字五笔输入法" "~/.emacs.d/site-lisp/eim/wb.txt")
-  (register-input-method
-   "eim-py" "euc-cn" 'eim-use-package
-   "拼音" "汉字拼音输入法" "~/.emacs.d/site-lisp/eim/py.txt")
-
+;;  (add-to-list 'load-path "~/.emacs.d/site-lisp/eim")
+;;  (autoload 'eim-use-package "eim" "Another emacs input method")
+;;
+;;  (register-input-method
+;;   "eim-wb" "euc-cn" 'eim-use-package
+;;   "五笔" "汉字五笔输入法" "~/.emacs.d/site-lisp/eim/wb.txt")
+;;  (register-input-method
+;;   "eim-py" "euc-cn" 'eim-use-package
+;;   "拼音" "汉字拼音输入法" "~/.emacs.d/site-lisp/eim/py.txt")
+;;
 ;(require 'init-keychord)
 
-(setq hydra-examples-verbatim t)
+;(setq hydra-examples-verbatim t)
 (require 'init-hydra)
 
 
-(require 'ace-window)
-(global-set-key (kbd "M-p") 'ace-window)
+;(require 'ace-window)
+;(global-set-key (kbd "M-p") 'ace-window)
+
+
+(require 'init-multi-term)
+(require 'init-projectile)
+
+(require 'page-break-lines)
+;(turn-on-page-break-lines-mode)
+(global-page-break-lines-mode 1)

diff --git a/vimperatorrc b/vimperatorrc
index baf1849..282473d 100644 (file)
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -32,7 +32,7 @@ nmap <Leader>h :help<Space>
 nmap <Leader>, :source ~/.vimperatorrc<CR>
 
 
-noremap <C-o>  <Esc>
+"noremap <C-o> <Esc>
 
 
 set "editor=/usr/local/bin/mvim --remote-silent"
@@ -48,7 +48,7 @@ nnoremap B b
 nnoremap b :bmarks! -tags<SPACE>
 nnoremap e b
 
-"set gui=nonavigation
+set gui=nonavigation
 
 ":tab addons
 ":tab downloads
@@ -57,4 +57,5 @@ nnoremap e b
 ":tab javascript!
 ":tab preferences!
 "
-
+noremap <C-SPACE> <C-^>
+noremap v <C-^>

diff --git a/zsh/zshrc b/zsh/zshrc
index 0ade8e7..9301e4a 100644 (file)
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -229,3 +229,5 @@ alias tw='open -a /Applications/TextWrangler.app/'
 #    zle -N percol_select_history
 #    bindkey '^R' percol_select_history
 #fi
+export LANG='en_US.UTF-8'
+export LC_ALL="en_US.UTF-8"