From df6c4fb4491d82670a0b2614b0019f3480c89480 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Mon, 28 Aug 2017 13:23:08 +0300 Subject: [PATCH] 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 --- behaviour.el | 3 +-- key-bindings.el | 12 +++++------- languages.el | 18 ++++++++++++++++++ spelling.el | 3 +++ windows.el | 11 +++++++++-- 5 files changed, 36 insertions(+), 11 deletions(-) diff --git a/behaviour.el b/behaviour.el index 438e25f..ed5e566 100644 --- a/behaviour.el +++ b/behaviour.el @@ -58,7 +58,6 @@ ;; Show trailing whitespace and remove whitespace on save (require 'whitespace) -(setq-default show-trailing-whitespace t) (add-hook 'prog-mode-hook 'whitespace-mode) (setq whitespace-style '(face trailing empty)) @@ -163,8 +162,8 @@ ;; Show projectile lists by most 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) ; Use VIM mode diff --git a/key-bindings.el b/key-bindings.el index aabf5f6..14ffdf4 100644 --- a/key-bindings.el +++ b/key-bindings.el @@ -41,19 +41,17 @@ (evil-leader/set-key "ir" 'indent-region) (evil-leader/set-key "ac" 'align-to-colon) (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 "ag" 'helm-projectile-ag) -(evil-leader/set-key "Pc" 'projectile-invalidate-cache) +(evil-leader/set-key "pa" 'helm-projectile-ag) +(evil-leader/set-key "pc" 'projectile-invalidate-cache) (evil-leader/set-key "b" 'helm-buffers-list) (evil-leader/set-key "" '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 "Jh" 'dumb-jump-back); Jump back from declariation +(evil-leader/set-key "jl" 'dumb-jump-go); Jump to declaration +(evil-leader/set-key "jh" 'dumb-jump-back); Jump back from declariation ;; Dash integration (require 'dash-at-point) diff --git a/languages.el b/languages.el index d71389d..00f3069 100644 --- a/languages.el +++ b/languages.el @@ -3,7 +3,14 @@ ;;; Code: ;;;; Major languages ;;;; +;;; Intial imports +(require 'company) + ;;; Ruby +(require 'ruby-mode) +(require 'robe) +(require 'rvm) +(require 'rspec-mode) (defun ruby-mode-config () "Setup editor for Ruby." (remove-hook 'rust-mode-hook 'rust-mode-config) @@ -26,6 +33,7 @@ ;; Use robe (add-hook 'ruby-mode-hook 'robe-mode) (defadvice inf-ruby-console-auto (before activate-rvm-for-robe activate) + "Activate proper RVM on activation of Robe." (rvm-activate-corresponding-ruby)) (eval-after-load 'company @@ -63,6 +71,7 @@ (add-hook 'rust-mode-hook 'set-width-99) ;;; Python +(require 'elpy) (defun python-mode-config () "Setup editor for Python." (remove-hook 'ruby-mode-hook 'ruby-mode-config) @@ -170,6 +179,7 @@ (setq js-indent-level 2) ;;; Web-mode +(require 'web-mode) (defun web-mode-config () "Setup web mode." (remove-hook 'rust-mode-hook 'rust-mode-config) @@ -194,7 +204,15 @@ (defun markdown-mode-config () "Setup markdown mode." (set-indent 2)) + (add-hook 'markdown-mode-hook 'markdown-mode-config) (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 diff --git a/spelling.el b/spelling.el index 601bd9a..46ff5c0 100644 --- a/spelling.el +++ b/spelling.el @@ -9,7 +9,10 @@ (require 'ispell) ;; Highlight misspelled words (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) + (provide 'spelling) ;;; spelling.el ends here diff --git a/windows.el b/windows.el index 02e4ed2..8b1c52f 100644 --- a/windows.el +++ b/windows.el @@ -9,8 +9,13 @@ (add-to-list 'purpose-user-mode-purposes '(fundamental-mode . code)) ;; Test -(add-to-list 'purpose-user-regexp-purposes '("_spec.rb\\(<.*>\\)?$" . test)) -(add-to-list 'purpose-user-regexp-purposes '("_test.exs\\(<.*>\\)?$" . test)) +(add-to-list 'purpose-user-regexp-purposes + '("_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 '(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 '(python-mode . code)) (add-to-list 'purpose-user-mode-purposes '(javascript-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(xml-mode . code)) ;; 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 '(helm-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 (add-to-list 'purpose-user-mode-purposes '(markdown-mode . code))