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
095a63f9ae
1 changed files with 63 additions and 11 deletions
|
@ -217,12 +217,24 @@
|
||||||
(lsp-treemacs-sync-mode 1))
|
(lsp-treemacs-sync-mode 1))
|
||||||
|
|
||||||
;; Git
|
;; Git
|
||||||
|
|
||||||
(use-package magit
|
(use-package magit
|
||||||
:bind ("C-M-;" . magit-status)
|
:bind ("C-M-;" . magit-status)
|
||||||
:commands (magit-status magit-get-current-branch)
|
:commands (magit-status magit-get-current-branch)
|
||||||
:custom
|
:custom
|
||||||
(magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
|
(magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
|
||||||
|
|
||||||
|
;; Project management
|
||||||
|
|
||||||
|
(use-package projectile
|
||||||
|
:init
|
||||||
|
(projectile-mode +1)
|
||||||
|
:bind-keymap
|
||||||
|
(("C-M-p" . projectile-find-file)
|
||||||
|
("C-c p" . projectile-command-map))
|
||||||
|
:bind (:map projectile-mode-map
|
||||||
|
("C-c p" . projectile-command-map)))
|
||||||
|
|
||||||
;; LSP & debugging
|
;; LSP & debugging
|
||||||
|
|
||||||
(use-package lsp-mode
|
(use-package lsp-mode
|
||||||
|
@ -295,14 +307,12 @@
|
||||||
("C-n" . company-select-next)
|
("C-n" . company-select-next)
|
||||||
("C-p" . company-select-previous)))
|
("C-p" . company-select-previous)))
|
||||||
|
|
||||||
;; Full terminal applications within Emacs
|
|
||||||
(use-package vterm
|
|
||||||
:commands vterm
|
|
||||||
:config
|
|
||||||
(setq vterm-max-scrollback 10000))
|
|
||||||
|
|
||||||
;;; Languages
|
;;; Languages
|
||||||
|
|
||||||
|
(use-package apheleia
|
||||||
|
:init
|
||||||
|
(apheleia-global-mode +1))
|
||||||
|
|
||||||
;; C/C++
|
;; C/C++
|
||||||
|
|
||||||
(setq-default c-default-style "k&r")
|
(setq-default c-default-style "k&r")
|
||||||
|
@ -320,20 +330,62 @@
|
||||||
|
|
||||||
;(use-package lsp-java)
|
;(use-package lsp-java)
|
||||||
|
|
||||||
;; JavaScript/TypeScript
|
;; JavaScript/TypeScript, HTML, CSS
|
||||||
|
|
||||||
|
(setq css-indent-level 2)
|
||||||
|
(setq css-indent-offset 2)
|
||||||
(setq js-indent-level 2)
|
(setq js-indent-level 2)
|
||||||
|
|
||||||
(use-package typescript-mode
|
|
||||||
:config
|
|
||||||
(setq typescript-indent-level 2))
|
|
||||||
|
|
||||||
(use-package js2-mode
|
(use-package js2-mode
|
||||||
:config
|
:config
|
||||||
(add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode))
|
(add-to-list 'interpreter-mode-alist '("#!/usr/bin/env node" . js2-mode))
|
||||||
(setq js2-mode-show-strict-warnings nil)
|
(setq js2-mode-show-strict-warnings nil)
|
||||||
:hook ('js-mode-hook 'js2-minor-mode))
|
:hook ('js-mode-hook 'js2-minor-mode))
|
||||||
|
|
||||||
|
(use-package typescript-mode
|
||||||
|
:config
|
||||||
|
(setq typescript-indent-level 2)
|
||||||
|
:mode ("\\.ts\\'" . typescript-mode))
|
||||||
|
|
||||||
|
(use-package restclient
|
||||||
|
:init
|
||||||
|
(use-package company-restclient))
|
||||||
|
|
||||||
|
(use-package rainbow-mode
|
||||||
|
:hook
|
||||||
|
((js-mode . rainbow-mode)
|
||||||
|
(typescript-mode . rainbow-mode)
|
||||||
|
(web-mode . rainbow-mode)))
|
||||||
|
|
||||||
|
(use-package skewer-mode
|
||||||
|
:init
|
||||||
|
(setq httpd-port 8123)
|
||||||
|
:hook
|
||||||
|
(('js2-mode-hook 'skewer-mode)
|
||||||
|
('css-mode-hook 'skewer-css-mode)
|
||||||
|
('html-mode-hook 'skewer-html-mode)))
|
||||||
|
|
||||||
|
(use-package skewer-reload-stylesheets
|
||||||
|
:hook
|
||||||
|
(('css-mode-hook 'skewer-reload-stylesheets-start-editing)
|
||||||
|
('scss-mode-hook 'skewer-reload-stylesheets-start-editing)))
|
||||||
|
|
||||||
|
(use-package web-mode
|
||||||
|
:config
|
||||||
|
(setq web-mode-code-indent-offset 2)
|
||||||
|
(setq web-mode-markup-indent-offset 2)
|
||||||
|
(setq web-mode-attribute-indent-offset 2)
|
||||||
|
:mode
|
||||||
|
(("\\.phtml\\'" . web-mode)
|
||||||
|
("\\.tpl\\.php\\'" . web-mode)
|
||||||
|
("\\.jsp\\'" . web-mode)
|
||||||
|
("\\.as[cp]x\\'" . web-mode)
|
||||||
|
("\\.erb\\'" . web-mode)
|
||||||
|
("\\.mustache\\'" . web-mode)
|
||||||
|
("\\.djhtml\\'" . web-mode)
|
||||||
|
("\\.jst.ejs\\'" . web-mode)
|
||||||
|
("\\.html?\\'" . web-mode)))
|
||||||
|
|
||||||
;; LaTeX
|
;; LaTeX
|
||||||
|
|
||||||
(use-package lsp-latex)
|
(use-package lsp-latex)
|
||||||
|
|
Loading…
Reference in a new issue