diff --git a/init/core-editor.el b/init/core-editor.el index 4c6933b4e..7825d5769 100644 --- a/init/core-editor.el +++ b/init/core-editor.el @@ -40,8 +40,6 @@ (add-hook 'text-mode-hook 'enable-hard-wrap) (add-hook 'prog-mode-hook 'enable-comment-hard-wrap) (add-hook 'before-save-hook 'delete-trailing-whitespace) -;; Autosave buffers on focus-out (emacs 24.4 only) -(add-hook! 'focus-out-hook (save-some-buffers t)) ;;;; Evil-mode ;;;;;;;;;;;;;;;;;;;;;;; (use-package evil @@ -292,7 +290,7 @@ returns nil." (setq recentf-max-menu-items 0 recentf-max-saved-items 100 recentf-auto-cleanup 'never - recentf-exclude '("/tmp/" "/ssh:" "\\.ido\\.last\\'" "\\.revive\\'")))) + recentf-exclude '("/tmp/" "/ssh:" "\\.ido\\.last\\'" "\\.revive\\'", "TAGS", "GEMTAGS")))) (use-package re-builder :defer t diff --git a/init/core-ui.el b/init/core-ui.el index 0282b6227..b9ec48c1c 100644 --- a/init/core-ui.el +++ b/init/core-ui.el @@ -57,6 +57,7 @@ " yas" " Fly" " EvilOrg" + " Abbrev" )) :init (progn diff --git a/init/init-fly.el b/init/init-fly.el index 07e39bae6..0a91a2705 100644 --- a/init/init-fly.el +++ b/init/init-fly.el @@ -1,15 +1,15 @@ (provide 'init-fly) (use-package flycheck - :config - (setq flycheck-indication-mode 'right-fringe - ;; Removed checks on idle/change for snappiness - flycheck-check-syntax-automatically - '(save new-line mode-enabled) - flycheck-disabled-checkers - '(emacs-lisp emacs-lisp-checkdoc)) :init - (add-hook 'after-init-hook #'global-flycheck-mode)) + (progn + (setq-default flycheck-indication-mode 'right-fringe + ;; Removed checks on idle/change for snappiness + flycheck-check-syntax-automatically + '(save new-line mode-enabled) + flycheck-disabled-checkers + '(emacs-lisp emacs-lisp-checkdoc)) + (add-hook 'after-init-hook #'global-flycheck-mode))) (use-package flyspell :commands flyspell-mode diff --git a/init/init-org.el b/init/init-org.el index cf7304601..5ff65cf88 100644 --- a/init/init-org.el +++ b/init/init-org.el @@ -48,6 +48,10 @@ (shut-up (load-library "ox-opml")) +;; Remove occur highlights on ESC in normal mode +(defadvice evil-force-normal-state (before evil-esc-org-remove-highlights activate) + (org-remove-occur-highlights)) + (setq org-export-backends '(ascii html latex md opml)) (add-hook 'find-file-hooks 'set-buffer-file-format-to-opml) (add-to-list 'auto-mode-alist '("\\.opml$" . org-mode)) @@ -66,7 +70,7 @@ org-hide-leading-stars t org-todo-keywords '((sequence "TODO(t)" "|" "DONE(d)") - (sequence "STARTED(s)" "VERIFY(v)" "WAITING(w)") + (sequence "DOING(s)" "PENDING(p)") (sequence "|" "CANCELLED(c)"))) (org-babel-do-load-languages 'org-babel-load-languages diff --git a/init/init-project.el b/init/init-project.el index 430ebcb9b..58f06b968 100644 --- a/init/init-project.el +++ b/init/init-project.el @@ -24,9 +24,7 @@ :config (progn (projectile-global-mode) (setq projectile-completion-system 'grizzl - projectile-enable-caching t - projectile-cache-file (concat *tmp-dir "projectile.cache") - projectile-known-projects-file (concat *tmp-dir "projectile-bookmarks.eld")))) + projectile-enable-caching t))) (use-package ag :commands (ag ag-search ag-regexp) diff --git a/init/init-python.el b/init/init-python.el index 0f8b60ce8..b0b0cb71e 100644 --- a/init/init-python.el +++ b/init/init-python.el @@ -15,10 +15,9 @@ (add-hook 'python-mode-hook 'jedi:ac-setup) (setq python-shell-interpreter "ipython") - ;; Dont' remap DEL please... + ;; Interferes with smartparens (defmap python-mode-map (kbd "DEL") nil) - ;;; Keybindings (add-hook! 'python-mode-hook (setq my-switch-to-repl-func 'python-shell-switch-to-shell my-send-region-to-repl-func 'python-shell-send-region diff --git a/init/my-commands.el b/init/my-commands.el index f1271582a..2f25c1d0d 100644 --- a/init/my-commands.el +++ b/init/my-commands.el @@ -115,6 +115,7 @@ to abort the minibuffer." (cdr (buffer-list (current-buffer))) (buffer-list)))) (delete-other-windows) + (tags-reset-tags-tables) (mapc 'kill-buffer buffers))) (evil-define-command my:ex:init-files (&optional bang) :repeat nil diff --git a/init/my-keymaps.el b/init/my-keymaps.el index d66056d27..3c9b7bf21 100644 --- a/init/my-keymaps.el +++ b/init/my-keymaps.el @@ -240,16 +240,43 @@ ",tV" 'nosetests-pdb-module)) (after org + (imap org-mode-map [remap my.inflate-space-maybe] 'self-insert-command) (define-key org-mode-map (kbd "RET") nil) (define-key org-mode-map (kbd "C-j") nil) (define-key org-mode-map (kbd "C-k") nil) + (mapc (lambda (state) + (evil-define-key state evil-org-mode-map + (kbd "M-l") 'org-metaright + (kbd "M-h") 'org-metaleft + (kbd "M-k") 'org-metaup + (kbd "M-j") 'org-metadown + (kbd "M-L") 'org-shiftmetaright + (kbd "M-H") 'org-shiftmetaleft + (kbd "M-K") 'org-shiftmetaup + (kbd "M-J") 'org-shiftmetadown + (kbd "M-o") '(lambda () (interactive) + (evil-org-eol-call + '(lambda() + (org-insert-heading) + (org-metaright)))) + (kbd "M-t") '(lambda () (interactive) + (evil-org-eol-call + '(lambda() + (org-insert-todo-heading nil) + (org-metaright)))) + )) + '(normal insert)) + ;; Formatting shortcuts (imap evil-org-mode-map (kbd "s-b") (λ (my/org-surround "*")) ; bold (kbd "s-u") (λ (my/org-surround "_")) ; underline (kbd "s-i") (λ (my/org-surround "/")) ; italics (kbd "s-`") (λ (my/org-surround "+")) ; strikethrough + + (kbd "") (λ (evil-move-beginning-of-line) (org-insert-heading)) + (kbd "") (λ (org-insert-heading-after-current)) ) (nvmap evil-org-mode-map @@ -267,7 +294,7 @@ ",A" 'org-attach-open ",t" 'org-todo ",T" 'org-show-todo-tree - ",/" 'org-match-sparse-tree + ",/" 'org-sparse-tree ",?" 'org-tags-view ",+" 'org-align-all-tags ",r" 'org-refile @@ -277,6 +304,7 @@ "gl" 'outline-next-visible-heading "go" 'org-open-at-point "ga" 'org-agenda + "gt" 'org-show-todo-tree "H" 'org-beginning-of-line "L" 'org-end-of-line "$" 'org-end-of-line @@ -288,7 +316,8 @@ (kbd "") (λ (evil-move-beginning-of-line) (org-insert-heading) (evil-insert-state)) (kbd "") (λ (org-insert-heading-after-current) (evil-insert-state)) (kbd "RET") (λ (if (org-entry-is-todo-p) (org-todo 'done))) - (kbd "TAB") 'org-cycle)) + (kbd "TAB") 'org-cycle) + ) (after ruby-mode (nmap ruby-mode-map "gd" 'rsense-jump-to-definition))