Redo bindings

private/my-bindings.el

@@ -24,12 +24,15 @@
  "M-="  'text-scale-increase
  "M--"  'text-scale-decrease
 
+ ;; debug
+ "<f9>" 'what-face
+
  "M-b"  'narf:build
  "M-t"  'helm-projectile-find-file
- "<f9>" 'what-face
  "A-`"  'narf-switch-to-iterm
- "C-`"  'narf/popup-toggle
+ "C-`"  'popwin:messages
  "C-~"  'rtog/toggle-repl
+ "M-`"  'narf/popup-toggle
 
  "M-w"  'evil-window-delete
  "M-W"  'delete-frame
@@ -42,6 +45,9 @@
  "C-h"  'evil-window-left
  "C-l"  'evil-window-right
 
+ "C-<escape>" 'evil-emacs-state
+ :e "C-<escape>" 'evil-normal-state
+
  :m "M-j"  'narf/multi-next-line
  :m "M-k"  'narf/multi-previous-line
 
@@ -91,7 +97,7 @@
 
  :m ";" 'evil-ex
  (:leader
-  :nv ","   (λ (if (narf/project-p) (helm-projectile-switch-to-buffer) (helm-buffers-list)))
+   :nv ","  'narf/helm-buffers-dwim
    :nv "<"  'helm-buffers-list
    :nv "."  'helm-find-files
    :nv ">"  'helm-projectile-find-file-in-known-projects
@@ -100,55 +106,75 @@
    :nv ":"  'helm-imenu-in-all-buffers
    :nv "]"  'helm-etags-select
    :nv "a"  'helm-projectile-find-other-file
-  :nv "E"  (λ (in! narf-emacs-dir (helm-projectile-find-file)))
+   :nv "E"  'narf/helm-projectile-in-emacsd
    :nv "m"  'helm-recentf
    :nv "M"  'helm-projectile-recentf  ; recent PROJECT files
    :nv "P"  'helm-projectile-switch-project
    :v  "="  'align-regexp
-  :nv "r"   'emr-show-refactor-menu
-  :n  "R"   'narf/reset-theme
 
-  :n  "s"  (λ (narf:yas-snippets t))        ; ido snippets dir
+   :n  "h"  'help-command
-  :n  "h"  'diff-hl-diff-goto-hunk
-  :n  "e"  'narf/flycheck-errors
    :nv "p"  'helm-show-kill-ring
+   :n  "R"  'narf/reset-theme
+   :n  "e"  'narf/flycheck-errors
+   :n  "s"  'yas-visit-snippet-file
+   :n  "S"  'narf/yas-find-file
+   :n  "d"  'narf/vcs-show-hunk
 
    :n  "b"  'helm-bookmarks
    :n  "w"  'narf:workgroup-display
    :n  "W"  'narf:helm-wg
 
-  :nv "n"  'narf/neotree-toggle
+   :n  "n"  'narf/neotree-toggle
-  :nv "N"  'narf/neotree-find
+   :n  "N"  'narf/neotree-find
-  :nv "t"  'narf-switch-to-iterm
    :nv "l"  'narf/nlinum-toggle
-  :nv "\\"  'evil-emacs-state
 
    :nv "qq" 'evil-save-and-quit
    :nv "QQ" 'narf/kill-all-buffers-do-not-remember
 
+   ;; Tmux
+   (:prefix "t"
+     :n  "." 'narf/tmux-cd-to-here
+     :n  "/" 'narf/tmux-cd-to-project
+     :n  "s" 'narf/tmux-split-window
+     :n  "v" 'narf/tmux-vsplit-window
+     :n  "c" 'narf/tmux-new-window
+     :v  "r" 'narf:tmux)
+
    ;; Open with O/S
-  :n  "oo"  'narf-open-with
+   :n "O" 'os-reveal
-  :n  "ob"  (λ (narf-open-with "Google Chrome"))
+   (:prefix "o"
-  :n  "of"  (λ (narf-open-with "Finder.app" default-directory))
+     :n  "o" 'os-open-in-default-program
-  :n  "oF"  (λ (narf-open-with "Finder.app" (narf/project-root)))
+     :n  "p" 'os-reveal-project
-  :n  "ou"  (λ (narf-open-with "Transmit"))
+     :n  "b" 'os-open-in-chrome
-  :n  "oU"  (λ (narf-open-with "Transmit" default-directory))
+     :n  "u" 'os-upload
-  :n  "ol"  (λ (narf-open-with "LaunchBar"))
+     :n  "U" 'os-upload-folder
-  :n  "oL"  (λ (narf-open-with "LaunchBar" default-directory))
+     :n  "l" 'os-send-to-launchbar
-  :n  "ot"  (λ (narf:tmux-chdir nil t))
+     :n  "L" 'os-send-project-to-launchbar
-  :n  "oT"  'narf:tmux-chdir
+     :n  "t" 'os-switch-to-term
+     :n  "T" 'os-switch-to-term-and-cd)
 
    ;; Org notes
-  :nv "x."  (λ (in! org-directory (let ((helm-ff-skip-boring-files t)) (helm-find-files-1 org-directory))))
+   :n "X" 'narf/org-open-notes
-  :nv "x/"  'narf/helm-org
+   (:prefix "x"
-  :nv "xp"  'narf/helm-org-crm-projects
+     :n  "." 'narf/helm-org-find-files
-  :nv "xc"  'narf/helm-org-crm-contacts
+     :n  "/" 'narf/helm-org
-  :nv "xi"  'narf/helm-org-crm-invoices
+     :n  "p" 'narf/helm-org-crm-projects
-  :nv "xw"  'narf/helm-org-writing)
+     :n  "c" 'narf/helm-org-crm-contacts
+     :n  "i" 'narf/helm-org-crm-invoices
+     :n  "w" 'narf/helm-org-writing))
 
  (:localleader
-  :n  "\\" 'narf/neotree-toggle
+   :n  "b" 'narf:build
-  :n  "."  'narf/neotree-find)
+   :n  "R" 'narf:repl
+   :v  "R" 'narf:repl-eval
+   :v  "r" 'narf:eval-region
+   (:prefix "r"
+     :n  "e" 'emr-show-refactor-menu
+     :n  "r" 'narf:eval-buffer
+     :n  "b" 'narf:build)
+
+   ;; :n "t" unit tests prefix
+   )
 
  :nv "K"  'smart-up
 
@@ -163,8 +189,8 @@
 
  :n  "]b" 'narf/next-real-buffer
  :n  "[b" 'narf/previous-real-buffer
- :m "]g"  'diff-hl-next-hunk
+ :m  "]d" 'narf/vcs-next-hunk
- :m "[g"  'diff-hl-previous-hunk
+ :m  "[d" 'narf/vcs-prev-hunk
  :m  "]e" 'narf/flycheck-next-error
  :m  "[e" 'narf/flycheck-previous-error
  ;; Switch workgroups
@@ -182,7 +208,6 @@
  :n  "gr" 'narf:eval-region
  :n  "gR" 'narf:eval-buffer
  :v  "gR" 'narf:eval-region-and-replace
- :m "gl"  'avy-goto-line
  :m  "g]" 'smart-right
  :m  "g[" 'smart-left
  :v  "@"  'narf/evil-macro-on-all-lines
@@ -200,8 +225,8 @@
              (evil-visual-restore))
 
  ;; undo/redo for regions
- :nv "u"    'undo-tree-undo
+ ;; :nv "u"   'undo-tree-undo
- :nv "C-r"  'undo-tree-redo
+ ;; :nv "C-r" 'undo-tree-redo
 
  :v  "*"   'evil-visualstar/begin-search-forward
  :v  "#"   'evil-visualstar/begin-search-backward
@@ -267,17 +292,18 @@
 
  ;; Vim omni-complete emulation
  :i "C-SPC"     'company-complete-common
- :i "C-x C-l"   'narf/company-whole-lines
+ (:prefix "C-x"
- :i "C-x C-k"   'company-dict
+   :i "C-l"   'narf/company-whole-lines
- :i "C-x C-f"   'company-files
+   :i "C-k"   'company-dict
- :i "C-x C-]"   'company-tags
+   :i "C-f"   'company-files
- :i "C-x s"     'company-ispell
+   :i "C-]"   'company-tags
- :i "C-x C-s"   'company-yasnippet
+   :i "s"     'company-ispell
- :i "C-x C-o"   'company-semantic
+   :i "C-s"   'company-yasnippet
- :i "C-x C-n"   'company-dabbrev-code
+   :i "C-o"   'company-semantic
- :i "C-x C-p"   (λ (let ((company-selection-wrap-around t))
+   :i "C-n"   'company-dabbrev-code
+   :i "C-p"   (λ (let ((company-selection-wrap-around t))
                    (call-interactively 'company-dabbrev-code)
-                     (company-select-previous-or-abort)))
+                   (company-select-previous-or-abort))))
 
  (:after company
    (:map company-active-map
@@ -299,18 +325,18 @@
      [escape]     'company-search-abort))
 
  (:after help-mode
+   (:map help-map
+     "e" 'narf:popup-messages
+     ;; Remove slow/annoying help subsections
+     "h" nil
+     "g" nil)
    (:map help-mode-map
      :n "]]" 'help-go-forward
      :n "[[" 'help-go-back
      :n "<escape>" (λ (kill-buffer)
                       (if (narf/popup-p (current-buffer))
                           (narf/popup-close)
-                        (evil-window-delete)))))
+                        (evil-window-delete))))))
-
- (:map view-mode-map
-   "<escape>" 'View-quit-all)
-
- (:map evil-ex-completion-map "C-a" 'move-beginning-of-line))
 
 ;; Line-wise mouse selection on margin
 (global-set-key (kbd "<left-margin> <down-mouse-1>") 'narf/mouse-drag-line)
@@ -331,8 +357,8 @@
       :i "<C-tab>" 'indent-for-tab-command
 
       ;; No dumb-tab for lisp
-      :i :map lisp-mode-map        [remap narf/dumb-indent] 'indent-for-tab-command
+      (:map lisp-mode-map        :i [remap narf/dumb-indent] 'indent-for-tab-command)
-      :i :map emacs-lisp-mode-map  [remap narf/dumb-indent] 'indent-for-tab-command
+      (:map emacs-lisp-mode-map  :i [remap narf/dumb-indent] 'indent-for-tab-command)
 
       ;; Highjacks space/backspace to:
       ;;   a) delete spaces on either side of the cursor, if present ( | ) -> (|)
@@ -373,7 +399,7 @@
       :n "<S-M-return>"  (λ (save-excursion (evil-insert-newline-above)))
 
       ;; Make ESC quit all the things
-      :e [escape] 'narf-minibuffer-quit
+      :e [escape] 'evil-normal-state
       (:map (minibuffer-local-map
              minibuffer-local-ns-map
              minibuffer-local-completion-map
@@ -382,23 +408,18 @@
         [escape] 'narf-minibuffer-quit
         "C-r" 'evil-paste-from-register)
 
-      :map read-expression-map "C-w" 'backward-kill-word)
+      (:map read-expression-map "C-w" 'backward-kill-word)
 
+      (:map view-mode-map "<escape>" 'View-quit-all)
+
+      (:map evil-ex-completion-map "C-a" 'move-beginning-of-line))
+
+;; Common unicode characters
 (map! :i "A-o" (λ (insert "ø"))
       :i "A-O" (λ (insert "Ø"))
 
       :i "A--" (λ (insert "–"))
       :i "A-_" (λ (insert "—")))
 
-;; Disable the global drag-mouse map; clicking in new buffers often sends evil
-;; into visual mode, which is UN...ACCEPTAABBLLLEEEE!
-(global-unset-key (kbd "<drag-mouse-1>"))
-
-(define-key help-map "e" 'narf:popup-messages)
-
-;; Remove slow/annoying help subsections
-(define-key help-map "h" nil)
-(define-key help-map "g" nil)
-
 (provide 'my-bindings)
 ;;; my-bindings.el ends here