From 6257322d751dc36eaaf509682da164f6aef3ff90 Mon Sep 17 00:00:00 2001 From: Matthew Kosarek Date: Sat, 3 Sep 2022 12:01:26 -0400 Subject: Big upgrade to javascript/typescript to use a lanugage server --- init.el | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'init.el') diff --git a/init.el b/init.el index 831af75..a4dbbd3 100644 --- a/init.el +++ b/init.el @@ -1,3 +1,6 @@ + +;;; Code: + ;; Load path (add-to-list 'load-path "~/.emacs.d/lisp/") (add-to-list 'custom-theme-load-path "~/.emacs.d/themes") @@ -5,9 +8,6 @@ ;; Melpa support (require 'package) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) -;; Comment/uncomment this line to enable MELPA Stable if desired. See `package-archive-priorities` -;; and `package-pinned-packages`. Most users will not need or want to do this. -;;(add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/") t) ;; https://stackoverflow.com/questions/31079204/emacs-package-install-script-in-init-file (package-initialize) @@ -16,11 +16,11 @@ (setq package-list '(tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org web-mode cmake-ide rtags emojify)) -; fetch the list of packages available +;; Fetch the list of packages available (unless package-archive-contents (package-refresh-contents)) -; install the missing packages +; Install the missing packages (dolist (package package-list) (unless (package-installed-p package) (package-install package))) @@ -44,22 +44,11 @@ (evil-mode 1) (require 'general) -(setup-general) - (require 'cpp) -(add-hook 'c-mode-common-hook 'setup-c) - (require 'text) -(add-hook 'text-mode-hook 'setup-text-mode) - (require 'org-custom) -(add-hook 'org-mode-hook 'org-custom-hook) - -(require 'js-mode-custom) -(setup-js) - -(require 'ts-custom) -(setup-ts) +(require 'web) +(require 'markdown) (require 'latex-custom) (setup-latex) @@ -74,10 +63,11 @@ '(org-agenda-files (list org-directory)) '(org-directory "~/Documents/org") '(package-selected-packages - '(emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org))) + '(eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. ) +;;; init.el ends here -- cgit v1.2.1