emacs - tidy up keybinding

diff --git a/emacs.d/config/init-base.el b/emacs.d/config/init-base.el
index 9fb6d2b..cdfd69e 100644 (file)
--- a/emacs.d/config/init-base.el
+++ b/emacs.d/config/init-base.el
@@ -41,6 +41,7 @@
            (linum-mode -1)))
 
 ;; Dired mode
            (linum-mode -1)))
 
 ;; Dired mode

+(require 'dired+)

 ;; create new file  key map
 (define-key dired-mode-map "c" 'find-file)
 ;; ^ goto-up directory
 ;; create new file  key map
 (define-key dired-mode-map "c" 'find-file)
 ;; ^ goto-up directory

diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el
index 96aac9d..63fa63d 100644 (file)
--- a/emacs.d/config/init-evil.el
+++ b/emacs.d/config/init-evil.el
@@ -36,24 +36,15 @@
 ;(evil-leader/set-key "f" 'helm-ls-git-ls)
 (evil-leader/set-key "b" 'helm-mini)
 (evil-leader/set-key "m" 'helm-mini)
 ;(evil-leader/set-key "f" 'helm-ls-git-ls)
 (evil-leader/set-key "b" 'helm-mini)
 (evil-leader/set-key "m" 'helm-mini)

-;(evil-leader/set-key "p" 'helm-projectile-switch-project)

 
 

-;(define-key evil-normal-state-map "M-n" 'persp-next)
-;(define-key evil-normal-state-map "\M-p" 'persp-prev)
-
-
-;(evil-leader/set-key "l" 'persp-switch)
-;(evil-leader/set-key "g" 'persp-switch)

 
 (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)
 
 
 
 (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 ";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)
 
 
 (key-chord-mode 1)
 


@@ -67,20 +58,12 @@
 ;(define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit)
 
 
 ;(define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit)
 
 

-
-;; implement some missing vim normal command
-;; g-; - goto last change
-;; g
-
-
-;; cursor shape

 (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))
 (setq evil-replace-state-cursor '("red" bar))
 (setq evil-operator-state-cursor '("red" hollow))
 (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))
 (setq evil-replace-state-cursor '("red" bar))
 (setq evil-operator-state-cursor '("red" hollow))

-;;Enter an emacs mode in a given state http://wikemacs.org/wiki/Evil

 (loop for (mode . state) in '(
                   (nrepl-mode . insert)
                   (pylookup-mode . emacs)
 (loop for (mode . state) in '(
                   (nrepl-mode . insert)
                   (pylookup-mode . emacs)

diff --git a/emacs.d/config/init-key-binding.el b/emacs.d/config/init-key-binding.el
index 46aec50..76b98bf 100644 (file)
--- a/emacs.d/config/init-key-binding.el
+++ b/emacs.d/config/init-key-binding.el
@@ -1,6 +1,5 @@
 ;; This  file is for some global key binding
 
 ;; This  file is for some global key binding
 

-(require 'key-chord)

 
 (setq mac-command-modifier 'super) ; make cmd key do Meta
 
 
 (setq mac-command-modifier 'super) ; make cmd key do Meta
 


@@ -13,8 +12,6 @@
 (global-set-key (kbd "s-h") 'persp-switch)
 (global-set-key (kbd "s-j") 'helm-projectile-switch-to-buffer)
 (global-set-key (kbd "s-k") 'helm-cmd-t)
 (global-set-key (kbd "s-h") 'persp-switch)
 (global-set-key (kbd "s-j") 'helm-projectile-switch-to-buffer)
 (global-set-key (kbd "s-k") 'helm-cmd-t)

-;(global-set-key (kbd "s-m") 'helm-cmd-t)
-;(global-set-key (kbd "s-u") 'helm-cmd-t)

 
 
 (defun pl-make-keymap (key bindings)
 
 
 (defun pl-make-keymap (key bindings)


@@ -43,7 +40,11 @@
     (helm-mini)))
   
 
     (helm-mini)))
   
 

-;(setq key-chord-two-keys-delay 0.2)
+;; key-chord
+(require 'key-chord)
+
+(setq key-chord-two-keys-delay 0.5)
+

 ;; from emacs conference 2015 workshop
 (defun keychord-keymap (keychord bindings)
   (setq keymap (make-sparse-keymap))
 ;; from emacs conference 2015 workshop
 (defun keychord-keymap (keychord bindings)
   (setq keymap (make-sparse-keymap))


@@ -51,11 +52,6 @@
     (define-key keymap (car binding) (cdr binding)))
   (key-chord-define-global keychord keymap))
 
     (define-key keymap (car binding) (cdr binding)))
   (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)
 (defun switch-to-previous-buffer ()
   "Switch to previously open buffer. Repeated invocations toggle between the two most recently open buffers."
   (interactive)

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 2afcaca..05ed804 100644 (file)
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -12,10 +12,10 @@
 (setq custom-file "~/.emacs.d/custom.el")
 (load custom-file 'noerror)
 
 (setq custom-file "~/.emacs.d/custom.el")
 (load custom-file 'noerror)
 

-(require 'init-base)
-(require 'init-font)

 
 (require 'my-packages)
 
 (require 'my-packages)

+(require 'init-base)
+(require 'init-font)

 
 (require 'init-color-theme)
 ;(require 'init-ido)
 
 (require 'init-color-theme)
 ;(require 'init-ido)


@@ -187,4 +187,3 @@
 
 
 
 
 
 

-(require 'dired+)