diff options
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.emacs.d/custom.el | 2 | ||||
| -rw-r--r-- | emacs/.emacs.d/init.el | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/emacs/.emacs.d/custom.el b/emacs/.emacs.d/custom.el index af33e4b..4929791 100644 --- a/emacs/.emacs.d/custom.el +++ b/emacs/.emacs.d/custom.el @@ -8,7 +8,7 @@ ("13fa7a304bd53aa4c0beec4c25c4f811de499bce9deb326798265ed0015b3b78" "a41b81af6336bd822137d4341f7e16495a49b06c180d6a6417bf9fd1001b6d2b" "63df625509cec7b2b7deba1d48ef07ffbee99c735a95d130ad9d1fc3df8b9a34" "55c2069e99ea18e4751bd5331b245a2752a808e91e09ccec16eb25dadbe06354" "5f1bd7f67dc1598977e69c6a0aed3c926f49581fdf395a6246f9bc1df86cb030" "6731049cee8f7cbd542d7b3e1c551f3fab716a92119bd7c77f0bd1ef20849fb8" "28caf31770f88ffaac6363acfda5627019cac57ea252ceb2d41d98df6d87e240" "947190b4f17f78c39b0ab1ea95b1e6097cc9202d55c73a702395fc817f899393" "35b0b0e531731e270708ddb342dc2e576a31fb298dcbc56a206596a43afac54f" "274fa62b00d732d093fc3f120aca1b31a6bb484492f31081c1814a858e25c72e" default))) '(package-selected-packages (quote - (windswap projectile-speedbar flycheck prettier-js calfw-org calfw org-ql org-super-agenda org-pomodoro org doom-themes counsel-projectile ivy slime magit company-quickhelp lsp-ui yasnippet typescript-mode company-lsp company-posframe company-c-headers telephone-line dracula-theme evil use-package))) + (zig-mode windswap projectile-speedbar flycheck prettier-js calfw-org calfw org-ql org-super-agenda org-pomodoro org doom-themes counsel-projectile ivy slime magit company-quickhelp lsp-ui yasnippet typescript-mode company-lsp company-posframe company-c-headers telephone-line dracula-theme evil use-package))) '(show-paren-mode t)) (custom-set-faces diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 646840f..b7bd392 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -148,6 +148,13 @@ ;; --- LANGUAGE SERVERS --- (use-package lsp-mode :hook (typescript-mode . lsp-deferred) + :config + (add-to-list 'lsp-language-id-configuration '(zig-mode . "zig")) + (lsp-register-client + (make-lsp-client + :new-connection (lsp-stdio-connection "/opt/zls/zls") + :major-modes '(zig-mode) + :server-id 'zls)) :commands (lsp lsp-deferred)) (use-package lsp-ui @@ -203,6 +210,7 @@ ;; Using tabs in lisp just leads to mixing tabs and spaces, which is yucky (add-hook 'lisp-mode-hook 'disable-tabs) (add-hook 'emacs-lisp-mode-hook 'disable-tabs) +(add-hook 'zig-mode-hook 'disable-tabs) ;; --- GENERAL PREFERENCES --- (setq-default |