Small changes in ispell and windows configuration
Change projectile evil keys from "P" to "p" Change dumb jump from keys from "J" to "j" Remove magit-status hook in projectile-after-switch-project-hook
This commit is contained in:
parent
a58be4c734
commit
df6c4fb449
5 changed files with 36 additions and 11 deletions
|
|
@ -58,7 +58,6 @@
|
||||||
|
|
||||||
;; Show trailing whitespace and remove whitespace on save
|
;; Show trailing whitespace and remove whitespace on save
|
||||||
(require 'whitespace)
|
(require 'whitespace)
|
||||||
(setq-default show-trailing-whitespace t)
|
|
||||||
(add-hook 'prog-mode-hook 'whitespace-mode)
|
(add-hook 'prog-mode-hook 'whitespace-mode)
|
||||||
(setq whitespace-style '(face trailing empty))
|
(setq whitespace-style '(face trailing empty))
|
||||||
|
|
||||||
|
|
@ -163,8 +162,8 @@
|
||||||
|
|
||||||
;; Show projectile lists by most recently active
|
;; Show projectile lists by most recently active
|
||||||
(setq projectile-sort-order (quote recently-active))
|
(setq projectile-sort-order (quote recently-active))
|
||||||
(add-hook 'projectile-after-switch-project-hook 'magit-status)
|
|
||||||
|
|
||||||
|
;; (add-hook 'projectile-after-switch-project-hook 'magit-status)
|
||||||
;; (add-hook 'projectile-find-file-hook 'projectile-invalidate-cache)
|
;; (add-hook 'projectile-find-file-hook 'projectile-invalidate-cache)
|
||||||
|
|
||||||
; Use VIM mode
|
; Use VIM mode
|
||||||
|
|
|
||||||
|
|
@ -41,19 +41,17 @@
|
||||||
(evil-leader/set-key "ir" 'indent-region)
|
(evil-leader/set-key "ir" 'indent-region)
|
||||||
(evil-leader/set-key "ac" 'align-to-colon)
|
(evil-leader/set-key "ac" 'align-to-colon)
|
||||||
(evil-leader/set-key "cl" 'evilnc-comment-or-uncomment-lines)
|
(evil-leader/set-key "cl" 'evilnc-comment-or-uncomment-lines)
|
||||||
(evil-leader/set-key "WC" 'whitespace-cleanup)
|
|
||||||
|
|
||||||
(evil-leader/set-key "Ps" 'helm-projectile-switch-project)
|
(evil-leader/set-key "ps" 'helm-projectile-switch-project)
|
||||||
(evil-leader/set-key "t" 'helm-projectile-find-file)
|
(evil-leader/set-key "t" 'helm-projectile-find-file)
|
||||||
(evil-leader/set-key "ag" 'helm-projectile-ag)
|
(evil-leader/set-key "pa" 'helm-projectile-ag)
|
||||||
(evil-leader/set-key "Pc" 'projectile-invalidate-cache)
|
(evil-leader/set-key "pc" 'projectile-invalidate-cache)
|
||||||
(evil-leader/set-key "b" 'helm-buffers-list)
|
(evil-leader/set-key "b" 'helm-buffers-list)
|
||||||
|
|
||||||
(evil-leader/set-key "<SPC>" 'company-yasnippet)
|
(evil-leader/set-key "<SPC>" 'company-yasnippet)
|
||||||
(evil-leader/set-key "rC" 'load-file "~/.emacs")
|
|
||||||
|
|
||||||
(evil-leader/set-key "Jl" 'dumb-jump-go); Jump to declaration
|
(evil-leader/set-key "jl" 'dumb-jump-go); Jump to declaration
|
||||||
(evil-leader/set-key "Jh" 'dumb-jump-back); Jump back from declariation
|
(evil-leader/set-key "jh" 'dumb-jump-back); Jump back from declariation
|
||||||
|
|
||||||
;; Dash integration
|
;; Dash integration
|
||||||
(require 'dash-at-point)
|
(require 'dash-at-point)
|
||||||
|
|
|
||||||
18
languages.el
18
languages.el
|
|
@ -3,7 +3,14 @@
|
||||||
|
|
||||||
;;; Code:
|
;;; Code:
|
||||||
;;;; Major languages ;;;;
|
;;;; Major languages ;;;;
|
||||||
|
;;; Intial imports
|
||||||
|
(require 'company)
|
||||||
|
|
||||||
;;; Ruby
|
;;; Ruby
|
||||||
|
(require 'ruby-mode)
|
||||||
|
(require 'robe)
|
||||||
|
(require 'rvm)
|
||||||
|
(require 'rspec-mode)
|
||||||
(defun ruby-mode-config ()
|
(defun ruby-mode-config ()
|
||||||
"Setup editor for Ruby."
|
"Setup editor for Ruby."
|
||||||
(remove-hook 'rust-mode-hook 'rust-mode-config)
|
(remove-hook 'rust-mode-hook 'rust-mode-config)
|
||||||
|
|
@ -26,6 +33,7 @@
|
||||||
;; Use robe
|
;; Use robe
|
||||||
(add-hook 'ruby-mode-hook 'robe-mode)
|
(add-hook 'ruby-mode-hook 'robe-mode)
|
||||||
(defadvice inf-ruby-console-auto (before activate-rvm-for-robe activate)
|
(defadvice inf-ruby-console-auto (before activate-rvm-for-robe activate)
|
||||||
|
"Activate proper RVM on activation of Robe."
|
||||||
(rvm-activate-corresponding-ruby))
|
(rvm-activate-corresponding-ruby))
|
||||||
|
|
||||||
(eval-after-load 'company
|
(eval-after-load 'company
|
||||||
|
|
@ -63,6 +71,7 @@
|
||||||
(add-hook 'rust-mode-hook 'set-width-99)
|
(add-hook 'rust-mode-hook 'set-width-99)
|
||||||
|
|
||||||
;;; Python
|
;;; Python
|
||||||
|
(require 'elpy)
|
||||||
(defun python-mode-config ()
|
(defun python-mode-config ()
|
||||||
"Setup editor for Python."
|
"Setup editor for Python."
|
||||||
(remove-hook 'ruby-mode-hook 'ruby-mode-config)
|
(remove-hook 'ruby-mode-hook 'ruby-mode-config)
|
||||||
|
|
@ -170,6 +179,7 @@
|
||||||
(setq js-indent-level 2)
|
(setq js-indent-level 2)
|
||||||
|
|
||||||
;;; Web-mode
|
;;; Web-mode
|
||||||
|
(require 'web-mode)
|
||||||
(defun web-mode-config ()
|
(defun web-mode-config ()
|
||||||
"Setup web mode."
|
"Setup web mode."
|
||||||
(remove-hook 'rust-mode-hook 'rust-mode-config)
|
(remove-hook 'rust-mode-hook 'rust-mode-config)
|
||||||
|
|
@ -194,7 +204,15 @@
|
||||||
(defun markdown-mode-config ()
|
(defun markdown-mode-config ()
|
||||||
"Setup markdown mode."
|
"Setup markdown mode."
|
||||||
(set-indent 2))
|
(set-indent 2))
|
||||||
|
|
||||||
(add-hook 'markdown-mode-hook 'markdown-mode-config)
|
(add-hook 'markdown-mode-hook 'markdown-mode-config)
|
||||||
(add-hook 'markdown-mode-hook 'set-width-80)
|
(add-hook 'markdown-mode-hook 'set-width-80)
|
||||||
|
|
||||||
|
;; Shell things
|
||||||
|
(defun shell-mode-config ()
|
||||||
|
"Setup shell mode."
|
||||||
|
)
|
||||||
|
|
||||||
|
(setq ansi-color-for-comint-mode t) ;; Properly display colors in shell mode
|
||||||
|
|
||||||
;;; languages.el ends here
|
;;; languages.el ends here
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,10 @@
|
||||||
(require 'ispell)
|
(require 'ispell)
|
||||||
;; Highlight misspelled words
|
;; Highlight misspelled words
|
||||||
(setq ispell-program-name "aspell")
|
(setq ispell-program-name "aspell")
|
||||||
|
(setq ispell-extra-args
|
||||||
|
'("--run-together" "--run-together-limit=5" "--run-together-min=2"))
|
||||||
(add-hook 'prog-mode-hook 'flyspell-mode)
|
(add-hook 'prog-mode-hook 'flyspell-mode)
|
||||||
|
|
||||||
(provide 'spelling)
|
(provide 'spelling)
|
||||||
|
|
||||||
;;; spelling.el ends here
|
;;; spelling.el ends here
|
||||||
|
|
|
||||||
11
windows.el
11
windows.el
|
|
@ -9,8 +9,13 @@
|
||||||
(add-to-list 'purpose-user-mode-purposes '(fundamental-mode . code))
|
(add-to-list 'purpose-user-mode-purposes '(fundamental-mode . code))
|
||||||
|
|
||||||
;; Test
|
;; Test
|
||||||
(add-to-list 'purpose-user-regexp-purposes '("_spec.rb\\(<.*>\\)?$" . test))
|
(add-to-list 'purpose-user-regexp-purposes
|
||||||
(add-to-list 'purpose-user-regexp-purposes '("_test.exs\\(<.*>\\)?$" . test))
|
'("_spec\\.rb\\(<.*>\\)?$" . test)) ;; Rspec
|
||||||
|
(add-to-list 'purpose-user-regexp-purposes
|
||||||
|
'("_test\\.exs\\(<.*>\\)?$" . test)) ;; Exunit
|
||||||
|
(add-to-list 'purpose-user-regexp-purposes
|
||||||
|
'("test_.*\\.py\\(<.*>\\)?$" . test)) ;; Pytest
|
||||||
|
|
||||||
(add-to-list 'purpose-user-mode-purposes '(shell-mode . test))
|
(add-to-list 'purpose-user-mode-purposes '(shell-mode . test))
|
||||||
(add-to-list 'purpose-user-mode-purposes '(magit-diff-mode . test))
|
(add-to-list 'purpose-user-mode-purposes '(magit-diff-mode . test))
|
||||||
|
|
||||||
|
|
@ -26,6 +31,7 @@
|
||||||
(add-to-list 'purpose-user-mode-purposes '(java-mode . code))
|
(add-to-list 'purpose-user-mode-purposes '(java-mode . code))
|
||||||
(add-to-list 'purpose-user-mode-purposes '(python-mode . code))
|
(add-to-list 'purpose-user-mode-purposes '(python-mode . code))
|
||||||
(add-to-list 'purpose-user-mode-purposes '(javascript-mode . code))
|
(add-to-list 'purpose-user-mode-purposes '(javascript-mode . code))
|
||||||
|
(add-to-list 'purpose-user-mode-purposes '(xml-mode . code))
|
||||||
|
|
||||||
;; Tools
|
;; Tools
|
||||||
(add-to-list 'purpose-user-mode-purposes '(dired-mode . tools))
|
(add-to-list 'purpose-user-mode-purposes '(dired-mode . tools))
|
||||||
|
|
@ -33,6 +39,7 @@
|
||||||
(add-to-list 'purpose-user-mode-purposes '(help-mode . tools))
|
(add-to-list 'purpose-user-mode-purposes '(help-mode . tools))
|
||||||
(add-to-list 'purpose-user-mode-purposes '(helm-mode . tools))
|
(add-to-list 'purpose-user-mode-purposes '(helm-mode . tools))
|
||||||
(add-to-list 'purpose-user-mode-purposes '(compilation-mode . tools))
|
(add-to-list 'purpose-user-mode-purposes '(compilation-mode . tools))
|
||||||
|
(add-to-list 'purpose-user-mode-purposes '(reb-mode . tools)) ;; Regexp builder
|
||||||
|
|
||||||
;; Markdown and others
|
;; Markdown and others
|
||||||
(add-to-list 'purpose-user-mode-purposes '(markdown-mode . code))
|
(add-to-list 'purpose-user-mode-purposes '(markdown-mode . code))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue