From 94347e9e735dc86da8ff0400da5b7e0fcf4b93cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Fri, 2 Jul 2021 15:52:20 -0500 Subject: [PATCH 1/3] disable capitalize word (M-c) for default by @saravia --- modules/init-gui.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/init-gui.el b/modules/init-gui.el index 1e70495..7b83c4b 100644 --- a/modules/init-gui.el +++ b/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 "") '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 From b4d28e2324a233fd6fbcba132028d10ab2009dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Thu, 8 Jul 2021 14:40:19 -0500 Subject: [PATCH 2/3] change to 2 spaces in javascript --- modules/init-js-two.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/init-js-two.el b/modules/init-js-two.el index eba6ed6..fef9bb9 100644 --- a/modules/init-js-two.el +++ b/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 From 3fe51a5a87a2ceda9c5d5bb952f5d732e7b03da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Thu, 8 Jul 2021 14:40:58 -0500 Subject: [PATCH 3/3] Enable editorconfig package --- custom.el | 2 +- init.el | 2 +- modules/init-editorconfig.el | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/custom.el b/custom.el index 61117e2..532a366 100644 --- a/custom.el +++ b/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. diff --git a/init.el b/init.el index 66dcf0d..2d989c3 100644 --- a/init.el +++ b/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) diff --git a/modules/init-editorconfig.el b/modules/init-editorconfig.el index c8466b8..0ac6121 100644 --- a/modules/init-editorconfig.el +++ b/modules/init-editorconfig.el @@ -7,6 +7,7 @@ ;; EditorConfig ;;---------------------------------------------------------------------------- (use-package editorconfig + :ensure t :config (when (and (require 'editorconfig nil t) (fboundp 'editorconfig-mode))