diff options
Diffstat (limited to 'user')
-rw-r--r-- | user/emacs/init.el | 10 | ||||
-rw-r--r-- | user/settings/development/golang.nix | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el index 27c10ba5..dae7cabd 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -789,6 +789,12 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve (with-eval-after-load 'project (add-to-list 'project-vc-extra-root-markers "go.mod")) +(setq-default go-ts-mode-indent-offset 2) +(use-package templ-ts-mode + :defer t + :config (progn + (setq-default go-ts-mode-indent-offset 2))) + ;;;; nim (use-package nim-mode :defer t @@ -1048,7 +1054,9 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve :defer 2 :config (progn (editorconfig-mode +1) - (setq editorconfig-lisp-use-default-indent t))) + (setq editorconfig-lisp-use-default-indent t) + (setf (alist-get 'templ-ts-mode editorconfig-indentation-alist) + 'go-ts-mode-indent-offset))) (setq-default ispell-dictionary "en_GB-ise-w_accents") (setq ispell-extra-args '("--sug-mode=ultra" "--camel-case")) diff --git a/user/settings/development/golang.nix b/user/settings/development/golang.nix index 6c2916be..a9293a31 100644 --- a/user/settings/development/golang.nix +++ b/user/settings/development/golang.nix @@ -15,6 +15,7 @@ programs.emacs.extraPackages = epkgs: (with epkgs; [ go-eldoc go-tag + templ-ts-mode ]); programs.neovim.plugins = with pkgs.vimPlugins; [ coc-go |