From 571182c9c17f96f2c0a23c449487cb12a0bb45a7 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Fri, 18 May 2018 09:51:48 +0300 Subject: [PATCH] Add helm-swoop command --- config/emacs | 2 +- config/key-bindings.el | 1 + config/packages.el | 10 ++++++---- config/themes.el | 4 ++-- config/windows.el | 2 ++ languages/web.el | 3 +++ 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/config/emacs b/config/emacs index 6240726..02aa2e5 100644 --- a/config/emacs +++ b/config/emacs @@ -17,7 +17,7 @@ '(hl-paren-colors (quote ("#ecf0f1" "#ecf0f1" "#c0392b"))) '(package-selected-packages (quote - (vue-mode flymake-go go-flymake flycheck-go company-go go-mode expand-region sql-indent json-mode terraform-mode flycheck-rust company-ghc company-ghci scion hlinum etags-select nvm tide yaml-mode window-purpose web-mode ujelly-theme toml-mode smart-mode-line scala-mode rvm ruby-end rspec-mode robe rainbow-mode rainbow-delimiters racer pyenv-mode noctilux-theme monokai-theme markdown-mode less-css-mode json-reformat jade-mode indent-guide helm-themes helm-projectile helm-ag haskell-mode haml-mode groovy-mode flymake-ruby flymake-cursor flycheck flatui-theme exec-path-from-shell evil-nerd-commenter evil-magit evil-leader elpy dumb-jump dockerfile-mode diff-hl dash-at-point company-tern company-racer company-jedi column-enforce-mode color-theme-approximate base16-theme atom-one-dark-theme alchemist aggressive-indent ag))) + (flymake-go go-flymake flycheck-go company-go go-mode expand-region sql-indent json-mode terraform-mode flycheck-rust company-ghc company-ghci scion hlinum etags-select nvm tide yaml-mode window-purpose web-mode ujelly-theme toml-mode smart-mode-line scala-mode rvm ruby-end rspec-mode robe rainbow-mode rainbow-delimiters racer pyenv-mode noctilux-theme monokai-theme markdown-mode less-css-mode json-reformat jade-mode indent-guide helm-themes helm-projectile helm-ag haskell-mode haml-mode groovy-mode flymake-ruby flymake-cursor flycheck flatui-theme exec-path-from-shell evil-nerd-commenter evil-magit evil-leader elpy dumb-jump dockerfile-mode diff-hl dash-at-point company-tern company-racer company-jedi column-enforce-mode color-theme-approximate base16-theme atom-one-dark-theme alchemist aggressive-indent ag))) '(safe-local-variable-values (quote ((encoding . utf-8)))) '(sml/active-background-color "#34495e") '(sml/active-foreground-color "#ecf0f1") diff --git a/config/key-bindings.el b/config/key-bindings.el index 91cbcb3..dd0a88c 100644 --- a/config/key-bindings.el +++ b/config/key-bindings.el @@ -49,6 +49,7 @@ (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 "/" 'helm-swoop) (evil-leader/set-key "j;" 'dumb-jump-go); Jump to declaration (evil-leader/set-key "jh" 'dumb-jump-back); Jump back from declaration diff --git a/config/packages.el b/config/packages.el index 4e9be8e..923f7c8 100644 --- a/config/packages.el +++ b/config/packages.el @@ -24,10 +24,6 @@ (unless (package-installed-p 'evil-nerd-commenter) (package-install 'evil-nerd-commenter)) -;; Ctags -(unless (package-installed-p 'etags-select) - (package-install 'etags-select)) - ;; Rainbow delimiters (unless (package-installed-p 'rainbow-delimiters) (package-install 'rainbow-delimiters)) @@ -71,6 +67,8 @@ (unless (package-installed-p 'helm-ag) (package-install 'helm-ag)) +(unless (package-installed-p 'helm-swoop) + (package-install 'helm-swoop)) (unless (package-installed-p 'dumb-jump) (package-install 'dumb-jump)) @@ -198,6 +196,10 @@ (unless (package-installed-p 'groovy-mode) (package-install 'groovy-mode)) +;; Ansible +(unless (package-installed-p 'ansible) + (package-install 'ansible)) + ;; Apache (unless (package-installed-p 'apache-mode) (package-install 'apache-mode)) diff --git a/config/themes.el b/config/themes.el index c36c094..3770302 100644 --- a/config/themes.el +++ b/config/themes.el @@ -50,8 +50,8 @@ (require 'helm-themes) (if (display-graphic-p) (progn - (enable-theme 'base16-atelier-forest-light) - (base16-summerfruit-light-custom)) + (enable-theme 'base16-not-harmonic) + (base16-harmonic-custom)) (progn (color-theme-approximate-on) (enable-theme 'flatui))) diff --git a/config/windows.el b/config/windows.el index d7baade..c072b83 100644 --- a/config/windows.el +++ b/config/windows.el @@ -13,6 +13,8 @@ '("_spec\\.rb\\(<.*>\\)?$" . test)) ;; Rspec (add-to-list 'purpose-user-regexp-purposes '("_test\\.rb\\(<.*>\\)?$" . test)) ;; Minitest +(add-to-list 'purpose-user-regexp-purposes + '("_preview\\.rb\\(<.*>\\)?$" . test)) ;; Mailer Previews (add-to-list 'purpose-user-regexp-purposes '("_test\\.exs\\(<.*>\\)?$" . test)) ;; ExUnit (add-to-list 'purpose-user-regexp-purposes diff --git a/languages/web.el b/languages/web.el index 5dba85e..0c920e6 100644 --- a/languages/web.el +++ b/languages/web.el @@ -27,5 +27,8 @@ (add-hook 'html-mode-hook 'editor-config-web) (add-hook 'html-mode-hook 'completion-config-web) +(add-hook 'web-mode-hook 'editor-config-web) +(add-hook 'web-mode-hook 'completion-config-web) + (provide 'web) ;;; web.el ends here