From 262c2d96b06afca01b537883b3105167e930ff1c Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Mon, 23 Jul 2018 20:19:59 +0300 Subject: [PATCH] Install emacs refactoring engine and additional Ruby packages --- .gitignore | 1 + config/behaviour.el | 1 + config/emacs | 2 +- config/packages.el | 10 ++++++++++ config/themes.el | 5 +++-- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d593ddf..2415f9c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ elpa recentf .python-environments* TAGS +eshell/history diff --git a/config/behaviour.el b/config/behaviour.el index 2289ff7..fbaf253 100644 --- a/config/behaviour.el +++ b/config/behaviour.el @@ -201,6 +201,7 @@ (projectile-regenerate-tags)))) (setq projectile-enable-caching t) +(setq projectile-file-exists-local-cache-expire (* 3 60)) ;; Always create a new tag table list and reload without asking (setq tags-revert-without-query t) diff --git a/config/emacs b/config/emacs index 02aa2e5..80ce39f 100644 --- a/config/emacs +++ b/config/emacs @@ -17,7 +17,7 @@ '(hl-paren-colors (quote ("#ecf0f1" "#ecf0f1" "#c0392b"))) '(package-selected-packages (quote - (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))) + (ruby-refactor emr ruby-hash-syntax 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/packages.el b/config/packages.el index 923f7c8..f3c3418 100644 --- a/config/packages.el +++ b/config/packages.el @@ -176,6 +176,12 @@ (unless (package-installed-p 'flymake-ruby) (package-install 'flymake-ruby)) +(unless (package-installed-p 'ruby-hash-syntax) + (package-install 'ruby-hash-syntax)) + +(unless (package-installed-p 'ruby-refactor) + (package-install 'ruby-refactor)) + ; Web mode for editing erb (unless (package-installed-p 'web-mode) (package-install 'web-mode)) @@ -200,6 +206,10 @@ (unless (package-installed-p 'ansible) (package-install 'ansible)) +;; Emacs refactor mode +(unless (package-installed-p 'emr) + (package-install 'emr)) + ;; Apache (unless (package-installed-p 'apache-mode) (package-install 'apache-mode)) diff --git a/config/themes.el b/config/themes.el index 3770302..9b75131 100644 --- a/config/themes.el +++ b/config/themes.el @@ -16,6 +16,7 @@ (load-theme 'flatui t t) (load "~/.emacs.d/config/base16-not-harmonic-theme.el") (load-theme 'base16-not-harmonic t t) +(load-theme 'base16-solarized-light t t) (load-theme 'base16-mexico-light t t) (load-theme 'base16-unikitty-light t t) (load-theme 'base16-summerfruit-light t t) @@ -50,8 +51,8 @@ (require 'helm-themes) (if (display-graphic-p) (progn - (enable-theme 'base16-not-harmonic) - (base16-harmonic-custom)) + (enable-theme 'base16-mexico-light) + (base16-summerfruit-light-custom)) (progn (color-theme-approximate-on) (enable-theme 'flatui)))