diff --git a/config-ext.org b/config-ext.org index 38e35ba..4465d7b 100644 --- a/config-ext.org +++ b/config-ext.org @@ -279,6 +279,52 @@ :config (slime-setup '(slime-fancy slime-asdf slime-company))) #+END_SRC +** rust +#+begin_src emacs-lisp + (use-package cargo) + (use-package rust-mode) + (use-package rustic) +#+end_src +** golang +#+begin_src emacs-lisp + (use-package go-mode + :hook (go-mode . (lambda () + (add-hook 'before-save-hook 'gofmt-before-save nil t) + (setq indent-tabs-mode nil))) + :config + ;; This is for lsp to work + (add-to-list 'exec-path "~/go/bin/")) +#+end_src +** python +#+begin_src emacs-lisp + (use-package elpy) + (elpy-enable) + (use-package ein) + (add-to-list 'exec-path + "/home/benson/anaconda3/bin/") +#+end_src +** web stuff +#+begin_src emacs-lisp + (use-package web-mode + :commands web-mode + :init + (add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode)) + (add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode)) + (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode)) + (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode)) + (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode)) + (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode)) + (add-to-list 'auto-mode-alist '("\\.djhtml\\'" . web-mode)) + (add-to-list 'auto-mode-alist '("\\.cshtml\\'" . web-mode)) + (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)) + :config + (setq web-mode-auto-close-style 2)) + + (use-package js2-mode + :commands js2-mode + :init + (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))) +#+end_src * colorful compilation buffer #+begin_src emacs-lisp (require 'ansi-color) diff --git a/config-min.org b/config-min.org index 8f49bc6..2e736c2 100644 --- a/config-min.org +++ b/config-min.org @@ -297,7 +297,7 @@ ;; Magit (use-package magit) (use-package magit-popup) - (use-package magit-todos) + (use-package magit-todos) (global-set-key (kbd "C-x g") 'magit-status) (global-set-key (kbd "C-x M-g") 'magit-dispatch) diff --git a/config-programming.org b/config-programming.org index 236322d..ff14c6c 100644 --- a/config-programming.org +++ b/config-programming.org @@ -168,44 +168,6 @@ #+BEGIN_SRC emacs-lisp (use-package rjsx-mode) #+END_SRC -* Golang -#+BEGIN_SRC emacs-lisp - (use-package go-mode) - (add-hook 'go-mode-hook - (lambda () - (add-hook 'before-save-hook 'gofmt-before-save nil t) - (setq indent-tabs-mode nil))) - ;; This is for lsp to work - (add-to-list 'exec-path "~/go/bin/") -#+END_SRC -* Elpy -#+BEGIN_SRC emacs-lisp - (use-package elpy) - (elpy-enable) -#+END_SRC -* EIN -#+BEGIN_SRC emacs-lisp - (use-package ein) - (add-to-list 'exec-path - "/home/benson/anaconda3/bin/") -#+END_SRC -* Web-mode -#+BEGIN_SRC emacs-lisp - (use-package web-mode - :commands web-mode - :init - (add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode)) - (add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode)) - (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode)) - (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode)) - (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode)) - (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode)) - (add-to-list 'auto-mode-alist '("\\.djhtml\\'" . web-mode)) - (add-to-list 'auto-mode-alist '("\\.cshtml\\'" . web-mode)) - (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)) - :config - (setq web-mode-auto-close-style 2)) -#+END_SRC * Processing #+BEGIN_SRC emacs-lisp (use-package processing-mode) @@ -233,10 +195,6 @@ (use-package indent-guide) ;(indent-guide-global-mode) #+end_src -* rust cargo -#+begin_src emacs-lisp - (use-package cargo) -#+end_src * maven support #+begin_src emacs-lisp (use-package mvn)