Cleanup + add dash keymaps

init/core-editor.el

@@ -84,8 +84,8 @@
   (progn (key-chord-mode 1)
          (setq key-chord-two-keys-delay 0.5)))
 
-(use-package saveplace :ensure t
+(use-package saveplace
-  :idle
+  :init
   (progn (setq-default save-place t)
          (setq save-place-file (expand-file-name "saveplace" my/tmp-dir))))
 
@@ -110,8 +110,7 @@
       (mc/keyboard-quit) ad-do-it)))
 
 (use-package smex :ensure t
-  :bind (("M-x" . smex)
+  :commands (smex smex-major-mode-commands)
-         ("M-X" . smex-major-mode-commands))
   :config
   (progn (smex-initialize)
          ;; Hook up smex to auto-update, rather than update on every run

init/core-keymaps.el

@@ -1,17 +1,16 @@
 ;; Global keymaps ;;;;;;;;;;;;;;;
-
 (global-set-key (kbd "<C-escape>") 'my/open-scratch)
 (global-set-key (kbd "C-c C-p")	 'package-list-packages)
+(global-set-key (kbd "M-x")	 'smex)
+(global-set-key (kbd "M-X")	 'smex-major-mode-commands)
 
 (when is-mac
+  ;; TODO: Open in tmux
   (nmap my/mode-map
         (kbd "C-c o")   'send-dir-to-finder
         (kbd "C-c u")   'send-to-transmit
         (kbd "C-c l")   'send-to-launchbar
-        (kbd "C-c L")   'send-dir-to-launchbar
+        (kbd "C-c L")   'send-dir-to-launchbar)
-        ;; TODO: Open in tmux
-        ;; (kbd "C-c t")   (λ (shell))
-        )
 
   ;; Evaluating elisp
   (nmap my/mode-map (kbd "C-c x") 'eval-buffer)
@@ -52,13 +51,10 @@
           (kbd "<s-backspace>")	'backward-kill-line
 
           ;; Fixes delete
-          (kbd "<kp-delete>")   'delete-char)
+          (kbd "<kp-delete>")   'delete-char)))
-    )
-)
 
 
 ;; Local keymaps ;;;;;;;;;;;;;;;;
-
 (evil-leader/set-leader ",")
 (evil-leader/set-key
   "`"       'my/notes
@@ -66,6 +62,7 @@
   "\""		'mc/mark-all-like-this
   "e"       'ido-find-file
   "E"       'my/initfiles
+  "d"       'dash-at-point
   "f"       'projectile-find-file
   "F"       'projectile-ag
   "m"       'helm-recentf 					; recent GLOBAL files
@@ -79,8 +76,7 @@
   "="       'align-regexp
   "x"       'my/kill-other-buffers
   "X"       'my/kill-all-buffers
-  (kbd "RET") 'org-capture
+  (kbd "RET") 'org-capture)
-)
 
 (nmap my/mode-map
   ";"           'evil-ex            ; Remap ; to : - SPC and shift-SPC replace ; and ,
@@ -105,8 +101,7 @@
 
   ;; Increment/decrement number under cursor
   (kbd "<C-tab>")    'evil-numbers/inc-at-pt
-  (kbd "<S-C-tab>")  'evil-numbers/dec-at-pt
+  (kbd "<S-C-tab>")  'evil-numbers/dec-at-pt)
-)
 
 (vmap my/mode-map
   ; vnoremap < <gv
@@ -116,14 +111,12 @@
   ; vnoremap > >gv
   ">"      (λ (evil-shift-right (region-beginning) (region-end))
               (evil-normal-state)
-              (evil-visual-restore))
+              (evil-visual-restore)))
-  )
 
 (imap my/mode-map
   (kbd "s-j")         'evil-join
   (kbd "M-SPC")       'expand-space
-  (kbd "<C-return>")  'indent-new-comment-line
+  (kbd "<C-return>")  'indent-new-comment-line)
-  )
 
 (emap my/mode-map
   ;; Preserve buffer-movement in emacs mode
@@ -136,8 +129,7 @@
   (kbd "C-w k") 'evil-window-up
 
   (kbd "s-j") "5j"
-  (kbd "s-k") "5k"
+  (kbd "s-k") "5k")
-  )
 
 ;; Commenting lines
 (nmap my/mode-map "gcc" 'evilnc-comment-or-uncomment-lines)
@@ -158,13 +150,12 @@
            (if func (find-function func)))))
 
 ;;;; Ex Commands ;;;;;;;;;;;;;;;;
-
 (evil-ex-define-cmd "retab" 'untabify) ; TODO: Implement proper retab defun
 (evil-ex-define-cmd "msg" 'view-echo-area-messages)
-
+(evil-ex-define-cmd "gtd" 'open-gtd)
+(evil-ex-define-cmd "notes" 'open-notes)
 
 ;;;; Keymap fixes ;;;;;;;;;;;;;;;
-
 ;; Make ESC quit all the things
 (nmap my/mode-map [escape] 'keyboard-quit)
 (vmap my/mode-map [escape] 'keyboard-quit)
@@ -199,9 +190,7 @@
     (define-key ido-completion-map "\C-b" 'ido-prev-match)
 
     ;; Auto-complete on tab/space (why is it called ido-exit-minibuffer?)
-    (define-key ido-completion-map " " 'ido-exit-minibuffer)
+    (define-key ido-completion-map " " 'ido-exit-minibuffer)))
-    ))
-
 
 ;;
 (defun backward-kill-line ()

init/mod-dev.el

@@ -6,9 +6,7 @@
   :config
   (progn
     (add-to-list 'dash-at-point-mode-alist '(ruby-mode . "rb"))
-    (add-to-list 'dash-at-point-mode-alist '(python-mode . "py2"))
+    (add-to-list 'dash-at-point-mode-alist '(python-mode . "py2"))))
-    )
-  )
 
 (use-package yaml-mode :ensure t :mode "\\.yaml\\'")
 
@@ -35,9 +33,7 @@
     (define-key python-mode-map [backspace] nil)
     (my/setup-run-code python-mode-map "python"))
   :init
-  (add-hook 'python-mode-hook 'jedi:ac-setup)
+  (add-hook 'python-mode-hook 'jedi:ac-setup))
-  ;; (evil-define-key 'insert ac-mode-map (kbd "C-SPC") 'jedi:complete)
-  )
 
 (use-package ruby-mode
   :mode (("\\.rb\\'" . ruby-mode)
@@ -65,8 +61,7 @@
 
     ;;
     (my/setup-run-code ruby-mode-map "ruby")
-    (nmap ruby-mode-map "gd" 'rsense-jump-to-definition)
+    (nmap ruby-mode-map "gd" 'rsense-jump-to-definition)))
-    ))
 
 
 ;;

init/mod-org.el

@@ -1,7 +1,3 @@
-;; Ex-commands
-(evil-ex-define-cmd "gtd" 'open-gtd)
-(evil-ex-define-cmd "notes" 'open-notes)
-
 ;; Defuns
 (defun my/org-insert-list-item ()
   "Force insertion of org item"
@@ -22,7 +18,7 @@
   :init
   (progn
     (setq org-directory "~/Dropbox/notes")
-    (setq org-default-notes-file (concat org-directory "/notes.org"))
+    (setq org-default-notes-file "~/Dropbox/notes/notes.org")
     (setq org-archive-location "~/Dropbox/notes/archives.org")
     (setq org-agenda-files '("~/Dropbox/notes/gtd.org"
                              "~/Dropbox/notes/notes.org"
@@ -46,22 +42,20 @@
                           ("@coding" . ?c)
                           ("@phone" . ?p)
                           ("@reading" . ?r)
-                          ("@computer" . ?l)
                           ("projects" . ?q)
                           ("easy" . ?0)
                           ("hard" . ?1)))
 
     (setq org-capture-templates
-          '(("t" "TODO" entry (file+headline (concat org-directory "/gtd.org") "Inbox") "* TODO %? %u")
+          '(("t" "TODO" entry (file+headline "~/Dropbox/notes/gtd.org" "Inbox") "* TODO %? %u")
-            ("T" "TODO Someday" entry (file+headline (concat org-directory "/gtd.org") "Someday") "* TODO %? %u :someday:")
+            ("T" "TODO Someday" entry (file+headline "~/Dropbox/notes/gtd.org" "Someday") "* TODO %? %u :someday:")
-            ("c" "Changelog" entry (file+headline (concat default-directory "/CHANGELOG.org") "Unsorted") "** %u %? :unsorted:" :prepend t)
+            ("c" "Changelog" entry (file+headline (concat (projectile-project-root) "/CHANGELOG.org") "Unsorted") "** %u %? :unsorted:" :prepend t)
-            ("i" "Invoice" entry (file+headline (concat org-directory "/invoices.org") "Invoices") "** TODO %?" :prepend t)
+            ("i" "Invoice" entry (file+headline "~/Dropbox/notes/invoices.org" "Invoices") "** TODO %?" :prepend t)
-            ("n" "Note" entry (file+datetree (concat org-directory "/notes.org")) "** %?")
+            ("n" "Note" entry (file+datetree org-default-notes-file) "** %?")
-            ("b" "Blog" entry (file+datetree (concat org-directory "/blog.org")) "** %?")
+            ("b" "Blog" entry (file+datetree "~/Dropbox/notes/blog.org") "** %?")
-            ("j" "Journal" entry (file+datetree (concat org-directory "/journal.org")) "** %?%^g\n%?\nAdded: %U")
+            ("j" "Journal" entry (file+datetree "~/Dropbox/notes/journal.org") "** %?%^g\n%?\nAdded: %U")
-            ("v" "Vocab" entry (file (concat org-directory "/vocab.org")) "* %?" :prepend t)
+            ("v" "Vocab" entry (file "~/Dropbox/notes/vocab.org") "* %?" :prepend t)
-            ("e" "Excerpt" entry (file (concat org-directory "/excerpts.org")) "* %?" :prepend t)
+            ("e" "Excerpt" entry (file "~/Dropbox/notes/excerpts.org") "* %?" :prepend t)))
-            ))
 
     (setq org-agenda-custom-commands
           '(("x" agenda)
@@ -88,8 +82,7 @@
           (kbd "<s-return>") 'org-insert-heading-after-current)
 
     (vmap evil-org-mode-map
-          ",l" 'org-insert-link
+          ",l" 'org-insert-link)
-          )
 
     (nmap evil-org-mode-map
           ",l" 'org-insert-link
@@ -120,8 +113,7 @@
           (kbd "RET") (lambda() (interactive) (org-insert-heading-after-current) (evil-insert-state))
           (kbd "SPC") 'org-todo
           (kbd "M-SPC") (lambda() (interactive) (org-todo "DONE"))
-          (kbd "TAB") 'org-cycle
+          (kbd "TAB") 'org-cycle)
-          )
 
     ;; normal & insert state shortcuts.
     (mapc (lambda (state)