diff options
Diffstat (limited to 'user/emacs/init.el')
| -rw-r--r-- | user/emacs/init.el | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el index 335ae410..3cd6f853 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -717,9 +717,7 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve ;;; Editing -(setq-default indent-tabs-mode nil - tab-width 2 - tab-always-indent 'complete) +(setq-default tab-always-indent 'complete) (electric-pair-mode +1) @@ -747,8 +745,6 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve (treesit-auto-add-to-auto-mode-alist))) ;;;; golang -(setq go-mode-indent-offset tab-width - go-ts-mode-indent-offset tab-width) (with-eval-after-load 'project (add-to-list 'project-vc-extra-root-markers "go.mod")) @@ -760,8 +756,7 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve '(nim-mode "nimlsp")))) ;;;; js -(setq js-indent-level 2 - js-enabled-frameworks '(javascript)) +(setq js-enabled-frameworks '(javascript)) ;;;; typescript @@ -783,8 +778,7 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve (add-to-list 'auto-mode-alist '("\\.zsh\\'" . shell-script-mode)) (add-to-list 'auto-mode-alist '("zshenv\\'" . shell-script-mode)) (add-to-list 'auto-mode-alist '("zshrc\\'" . shell-script-mode)) -(setq sh-shell-file "/usr/bin/env zsh" - sh-basic-offset 2) +(setq sh-shell-file "/usr/bin/env zsh") (add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on) @@ -796,11 +790,6 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve :config (progn (setq fish-enable-auto-indent t))) -;;;; make -(general-add-hook 'makefile-mode-hook - (lambda () - (setq-local indent-tabs-mode t))) - ;;;; nix (with-eval-after-load 'nix-mode (setq nix-mode-use-smie t @@ -856,16 +845,11 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve ;;;; web modes (html) (use-package css-mode - :defer t - :config (progn - (setq css-indent-offset 2))) + :defer t) (use-package web-mode :mode (("\\.html?.erb\\'" . web-mode)) :config (setq web-mode-enable-auto-pairing nil - web-mode-code-indent-offset 2 - web-mode-markup-indent-offset 2 - web-mode-css-indent-offset 2 web-mode-style-padding 2 web-mode-script-padding 2 web-mode-engines-alist '(("go" . "\\.html?\\'")))) |