From 8bf9543e2a6d9834090371f0a9c6ca5077d8cd9c Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Sat, 8 Sep 2018 20:06:15 +0300 Subject: [PATCH] Remove dead config --- config/behaviour.el | 16 ---------------- config/emacs | 2 +- config/key-bindings.el | 19 +++++++++---------- config/packages.el | 3 --- languages/ruby.el | 11 +++++++---- languages/web.el | 23 +++++++++++++---------- 6 files changed, 30 insertions(+), 44 deletions(-) diff --git a/config/behaviour.el b/config/behaviour.el index fbaf253..7f41bef 100644 --- a/config/behaviour.el +++ b/config/behaviour.el @@ -192,25 +192,9 @@ (require 'projectile) (projectile-mode) -(defun projectile-regenerate-tags-if-exist () - "Only regenerate tags if a tag file is present in the folder." - (interactive) - (let ((default-directory (projectile-project-root))) - (when (or (file-exists-p (expand-file-name "TAGS")) - (file-exists-p (expand-file-name projectile-tags-file-name))) - (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) -(setq tags-add-tables nil) - -;; Run the tags if project was changed -(add-hook 'projectile-after-switch-project-hook - 'projectile-regenerate-tags-if-exist) - ;; Show projectile lists by most recently active (setq projectile-sort-order (quote recently-active)) diff --git a/config/emacs b/config/emacs index 80ce39f..ad60ba1 100644 --- a/config/emacs +++ b/config/emacs @@ -17,7 +17,7 @@ '(hl-paren-colors (quote ("#ecf0f1" "#ecf0f1" "#c0392b"))) '(package-selected-packages (quote - (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))) + (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 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 dd0a88c..f464676 100644 --- a/config/key-bindings.el +++ b/config/key-bindings.el @@ -34,10 +34,17 @@ "gl" 'windmove-right "gh" 'windmove-left) +;; Magit (evil-leader/set-key "gs" 'magit-status - "gL" 'magit-log - "gco" 'magit-checkout) + "gco" 'magit-checkout + "gb" 'magit-blame + "gq" 'magit-blame-quit) + +;; width keys +(evil-leader/set-key + "100" 'set-width-100 + "80" 'set-width-80) (evil-leader/set-key "al" 'align-regexp) (evil-leader/set-key "ir" 'indent-region) @@ -63,12 +70,4 @@ (define-key evil-insert-state-map "\C-a" 'company-complete) (define-key evil-insert-state-map "\C-q" 'company-yasnippet) - -;;; The things below are experimental, need to be fixed -(define-key evil-insert-state-map "\M-." 'find-tag) -(define-key evil-insert-state-map "\M-*" 'pop-tag-mark) - -;;; VIM browse mode things -(define-key evil-motion-state-map "\M-." 'find-tag) -(define-key evil-motion-state-map "\M-*" 'pop-tag-mark) ;;; key-bindings.el ends here diff --git a/config/packages.el b/config/packages.el index f3c3418..bd1480b 100644 --- a/config/packages.el +++ b/config/packages.el @@ -37,9 +37,6 @@ (package-install 'rainbow-mode)) ;; Indentation and line length -(unless (package-installed-p 'indent-guide) - (package-install 'indent-guide)) - (unless (package-installed-p 'column-enforce-mode) (package-install 'column-enforce-mode)) diff --git a/languages/ruby.el b/languages/ruby.el index cdef6dc..7a6b1e9 100644 --- a/languages/ruby.el +++ b/languages/ruby.el @@ -12,18 +12,21 @@ "Setup editor for Ruby." ;; Indentation and line length - (if (string-match-p "internetee/" (buffer-file-name)) + (if (string-match-p "internetee" (buffer-file-name)) (set-width-100) (set-width-80)) + ;; Set default indentation (set-indent 2) - (setq ruby-deep-indent-paren nil) ;; Do not align 'begin' and 'while' ;; (setq ruby-align-to-stmt-keywords '(if begin case elseif rescue)) ;; Do not indent inside the parenthasis - (setq ruby-deep-indent-paren nil) + ;; (setq ruby-deep-indent-paren nil) + + ;; Automatically insert second pair of <% + (define-key web-mode-map "<%" 'electric-pair) ;; Do not insert encoding comments (setq ruby-insert-encoding-magic-comment nil)) @@ -64,7 +67,7 @@ (add-hook 'ruby-mode-hook 'minitest-ruby-mode-config) ;; Use longer lines for HAML -(add-hook 'haml-mode-hook 'set-width-120) +(add-hook 'haml-mode-hook 'set-width-100) (provide 'ruby) ;;; ruby.el ends here diff --git a/languages/web.el b/languages/web.el index af28268..1b7119a 100644 --- a/languages/web.el +++ b/languages/web.el @@ -8,15 +8,18 @@ "Editor configuration for Web." (set-width-120) - (if (string-match-p "internetee/" (buffer-file-name)) - ((set-indent 4) - (setq web-mode-markup-indent-offset 4) - (setq web-mode-code-indent-offset 4) - (setq css-indent-offset 4)) - ((set-indent 2) - (setq web-mode-markup-indent-offset 2) - (setq web-mode-code-indent-offset 2) - (setq css-indent-offset 2)))) + (if (string-match-p "internetee" (buffer-file-name)) + ((lambda + ((set-indent 4) + (setq web-mode-markup-indent-offset 4) + (setq web-mode-code-indent-offset 4) + (setq css-indent-offset 4))) + ((set-indent 2) + (setq web-mode-markup-indent-offset 2) + (setq web-mode-code-indent-offset 2) + (setq css-indent-offset 2))) + + (define-key web-mode-map "<%" 'electric-pair))) ;;========== Code completion ======================= (defun completion-config-web () @@ -26,7 +29,7 @@ (flymake-mode) (set (make-local-variable 'company-backends) '((company-capf company-dabbrev-code company-yasnippet - company-files)))) + company-files)))) ;;========== Hooks ================================= ;; Use web-mode for erb