mirror of
https://codeberg.org/andyscott/dotfiles.git
synced 2024-12-23 02:13:11 -05:00
Merge branch 'main' into single-monitor
This commit is contained in:
commit
ab7b78f00d
1 changed files with 19 additions and 2 deletions
|
@ -122,7 +122,6 @@
|
||||||
(load-theme 'everforest-hard-dark))
|
(load-theme 'everforest-hard-dark))
|
||||||
|
|
||||||
;; (use-package base16-theme
|
;; (use-package base16-theme
|
||||||
;; :ensure t
|
|
||||||
;; :config
|
;; :config
|
||||||
;; (load-theme 'gruvbox-dark-soft t))
|
;; (load-theme 'gruvbox-dark-soft t))
|
||||||
|
|
||||||
|
@ -234,10 +233,13 @@
|
||||||
((c-mode . lsp)
|
((c-mode . lsp)
|
||||||
(c++-mode . lsp)
|
(c++-mode . lsp)
|
||||||
(java-mode . lsp)
|
(java-mode . lsp)
|
||||||
|
(js-mode . lsp)
|
||||||
|
(latex-mode . lsp)
|
||||||
(python-mode . lsp)
|
(python-mode . lsp)
|
||||||
(rust-mode . lsp)
|
(rust-mode . lsp)
|
||||||
(tex-mode . lsp)
|
(tex-mode . lsp)
|
||||||
(latex-mode . lsp)
|
(typescript-mode . lsp)
|
||||||
|
(web-mode . lsp)
|
||||||
(zig-mode . lsp)
|
(zig-mode . lsp)
|
||||||
(lsp-mode . lsp-enable-which-key-integration))
|
(lsp-mode . lsp-enable-which-key-integration))
|
||||||
:config
|
:config
|
||||||
|
@ -302,6 +304,7 @@
|
||||||
;;; Languages
|
;;; Languages
|
||||||
|
|
||||||
;; C/C++
|
;; C/C++
|
||||||
|
|
||||||
(setq-default c-default-style "k&r")
|
(setq-default c-default-style "k&r")
|
||||||
(setq-default c-basic-offset 2)
|
(setq-default c-basic-offset 2)
|
||||||
|
|
||||||
|
@ -317,6 +320,20 @@
|
||||||
|
|
||||||
;(use-package lsp-java)
|
;(use-package lsp-java)
|
||||||
|
|
||||||
|
;; JavaScript/TypeScript
|
||||||
|
|
||||||
|
(setq js-indent-level 2)
|
||||||
|
|
||||||
|
(use-package typescript-mode
|
||||||
|
:config
|
||||||
|
(setq typescript-indent-level 2))
|
||||||
|
|
||||||
|
(use-package js2-mode
|
||||||
|
:config
|
||||||
|
(add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode))
|
||||||
|
(setq js2-mode-show-strict-warnings nil)
|
||||||
|
:hook ('js-mode-hook 'js2-minor-mode))
|
||||||
|
|
||||||
;; LaTeX
|
;; LaTeX
|
||||||
|
|
||||||
(use-package lsp-latex)
|
(use-package lsp-latex)
|
||||||
|
|
Loading…
Reference in a new issue