From 46d9a805a6cbc1abc3a8af5ce2d91d9633c4fa9f Mon Sep 17 00:00:00 2001 From: Hugo Thunnissen Date: Mon, 14 Aug 2023 14:10:17 +0200 Subject: [PATCH] Add some conditionals for package loading --- emacs/init.el | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/emacs/init.el b/emacs/init.el index 7c39f0b..53ea18f 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -52,7 +52,13 @@ (tab-bar-mode) ;; enable flycheck everywhere -(global-flycheck-mode) +(when (require 'flycheck nil t) + (global-flycheck-mode) + (add-to-list 'flycheck-disabled-checkers 'javascript-jshint) + (add-to-list 'flycheck-disabled-checkers 'json-jsonlist) + (setq flycheck-emacs-lisp-load-path 'inherit) + (flycheck-add-mode 'javascript-eslint 'web-mode)) + ;; Save minibuffer history between sessions (savehist-mode 1) @@ -136,7 +142,7 @@ (setq auth-sources '("~/.authinfo.gpg")) (put 'erase-buffer 'disabled nil) -(setq flycheck-emacs-lisp-load-path 'inherit) + (add-to-list 'load-path "~/projects/phpinspect.el") (add-to-list 'load-path "~/projects/qtoot") @@ -196,14 +202,9 @@ ;;;;;;;;;;;;;;;;;;;;;; ;;;;; JAVASCRIPT ;;;;; ;;;;;;;;;;;;;;;;;;;;;; -(require 'flycheck) (add-to-list 'auto-mode-alist '("\\.jsx?$" . web-mode)) (setq web-mode-content-types-alist '(("jsx" . "\\.js[x]?\\'"))) -(add-to-list 'flycheck-disabled-checkers 'javascript-jshint) -(add-to-list 'flycheck-disabled-checkers 'json-jsonlist) - -(flycheck-add-mode 'javascript-eslint 'web-mode) (defun hugot-javascript-web-mode-hook () (when (or (string-match "\\.svelte$" (buffer-name)) (string-match "\\.js$" (buffer-name))) @@ -320,8 +321,7 @@ ;;;;;;;;;;;;;; (require 'go-mode) ;;(require 'company-go) -(require 'go-eldoc) -(require 'flycheck) + (defvar hugot-go-mode-expand-list '(("ern" "if err != nil {\n\n}\n" (17)) @@ -339,6 +339,7 @@ (require 'lsp-mode) (require 'lsp-ui) (require 'expand) + (require 'go-eldoc) (expand-add-abbrevs go-mode-abbrev-table hugot-go-mode-expand-list) (abbrev-mode 1)