Merge branch 'master' of ssh://hgit/software/emacs-personal into master

custom.el

@@ -9,7 +9,7 @@
  '(anzu-replace-to-string-separator " => ")
  '(anzu-search-threshold 1000)
  '(package-selected-packages
-   '(git-gutter-fringe yaml-mode whitespace-cleanup-mode which-key web-mode vue-mode use-package undo-tree smartparens sass-mode rjsx-mode rainbow-mode py-autopep8 projectile pkgbuild-mode pip-requirements php-refactor-mode nginx-mode neotree markdown-mode log4j-mode json-mode js2-refactor ivy-rich ivy-hydra highlight-indent-guides go-mode gitignore-mode gitconfig-mode gitattributes-mode git-timemachine flycheck eslintd-fix emmet-mode elpy dotenv-mode doom-themes doom-modeline dokuwiki-mode diminish crystal-mode counsel company-quickhelp company-php apache-mode anzu dockerfile-mode)))
+   '(editorconfig git-gutter-fringe yaml-mode whitespace-cleanup-mode which-key web-mode vue-mode use-package undo-tree smartparens sass-mode rjsx-mode rainbow-mode py-autopep8 projectile pkgbuild-mode pip-requirements php-refactor-mode nginx-mode neotree markdown-mode log4j-mode json-mode js2-refactor ivy-rich ivy-hydra highlight-indent-guides go-mode gitignore-mode gitconfig-mode gitattributes-mode git-timemachine flycheck eslintd-fix emmet-mode elpy dotenv-mode doom-themes doom-modeline dokuwiki-mode diminish crystal-mode counsel company-quickhelp company-php apache-mode anzu dockerfile-mode)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

init.el

@@ -91,7 +91,7 @@
   (require 'init-emmet-mode)
   (require 'init-nginx)
   (require 'init-git)
-  ;;(require 'init-editorconfig nil 'noerror)
+  (require 'init-editorconfig)
   ;; Languages
   (require 'init-ccc)
   (require 'init-crystal)

modules/init-editorconfig.el

@@ -7,6 +7,7 @@
 ;; EditorConfig
 ;;----------------------------------------------------------------------------
 (use-package editorconfig
+  :ensure t
   :config
   (when (and (require 'editorconfig nil t)
              (fboundp 'editorconfig-mode))

modules/init-gui.el

@@ -64,6 +64,7 @@
 (global-set-key (kbd "s-C--") 'sacha/decrease-font-size)  ; C-- decrease font size
 (global-set-key (kbd "<f12>") 'revert-buffer-no-confirm)
 (global-set-key (kbd "s-h") 'global-hl-line-mode)         ; Highlight current line
+(global-set-key (kbd "M-c") nil) ; disable capitalize-word
 
 ;;---------------------------------------------------------------------------
 ;; FullScreen

modules/init-js-two.el

@@ -13,8 +13,8 @@
                        (company-mode))))
   :config
   ;; have 4 space indentation by default
-  (setq js-indent-level 4
-        js2-basic-offset 4
+  (setq js-indent-level 2
+        js2-basic-offset 2
         js-chain-indent t)
 
   ;; use eslint_d insetad of eslint for faster linting