From ae2de6a719738103e094956ec5efcda7d92e80fa Mon Sep 17 00:00:00 2001 From: Ade Attwood Date: Sat, 19 Feb 2022 22:15:11 +0000 Subject: [PATCH] feat(emacs): go full quelpa Move all of the package installation from the default package.el to quelpa. This has the main advantage of being able to update packages better. I have also got a few package coming from forks and custom repos. This also removes all of the `ensure t` from the use-package statements as we have already set `use-package-always-ensure` so its not needed. --- site-modules/core/files/emacs/src/development.el | 10 +++------- site-modules/core/files/emacs/src/evil.el | 2 +- site-modules/core/files/emacs/src/general.el | 2 -- site-modules/core/files/emacs/src/lang/c-sharp.el | 1 - site-modules/core/files/emacs/src/lang/docker.el | 2 -- site-modules/core/files/emacs/src/lang/go.el | 1 - site-modules/core/files/emacs/src/lang/json.el | 3 +-- site-modules/core/files/emacs/src/lang/php.el | 3 +-- site-modules/core/files/emacs/src/lang/shell.el | 2 +- site-modules/core/files/emacs/src/lang/yaml.el | 1 - site-modules/core/files/emacs/src/language-tool.el | 1 - site-modules/core/files/emacs/src/org.el | 1 - site-modules/core/files/emacs/src/packages.el | 1 + site-modules/core/files/emacs/src/projectile.el | 2 -- site-modules/core/files/emacs/src/puppet.el | 1 - 15 files changed, 8 insertions(+), 25 deletions(-) diff --git a/site-modules/core/files/emacs/src/development.el b/site-modules/core/files/emacs/src/development.el index 28bdd00..72d2151 100644 --- a/site-modules/core/files/emacs/src/development.el +++ b/site-modules/core/files/emacs/src/development.el @@ -73,7 +73,6 @@ company-box-icons-alist 'company-box-icons-all-the-icons)) (use-package flycheck - :ensure t :init (global-flycheck-mode) :config (setq flycheck-check-syntax-automatically '(mode-enabled save)) @@ -103,23 +102,20 @@ (setq display-line-numbers-type 'relative) (add-hook 'prog-mode-hook 'display-line-numbers-mode) -(use-package tree-sitter :ensure t) -(use-package tree-sitter-langs :ensure t) +(use-package tree-sitter) +(use-package tree-sitter-langs) (use-package magit - :quelpa t - :ensure t :init ;; Force magit status to go full screen (setq magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)) (use-package magit-todos - :quelpa t :init (magit-todos-mode 1) (global-hl-todo-mode)) -(use-package martparens +(use-package smartparens :config (require 'smartparens-config) :init diff --git a/site-modules/core/files/emacs/src/evil.el b/site-modules/core/files/emacs/src/evil.el index e94a34a..9923b88 100644 --- a/site-modules/core/files/emacs/src/evil.el +++ b/site-modules/core/files/emacs/src/evil.el @@ -53,4 +53,4 @@ (use-package evil-multiedit :after evil-collection :config - (evil-multiedit-default-keybinds)) \ No newline at end of file + (evil-multiedit-default-keybinds)) diff --git a/site-modules/core/files/emacs/src/general.el b/site-modules/core/files/emacs/src/general.el index 0a480a1..443fa44 100644 --- a/site-modules/core/files/emacs/src/general.el +++ b/site-modules/core/files/emacs/src/general.el @@ -42,7 +42,6 @@ (setq ispell-dictionary "british")) (use-package yasnippet - :ensure t :config (yas-global-mode) :init @@ -70,7 +69,6 @@ (load custom-file 'noerror) (use-package edit-server - :ensure t :commands edit-server-start :init (if after-init-time (edit-server-start) diff --git a/site-modules/core/files/emacs/src/lang/c-sharp.el b/site-modules/core/files/emacs/src/lang/c-sharp.el index a93b6d5..f95a545 100644 --- a/site-modules/core/files/emacs/src/lang/c-sharp.el +++ b/site-modules/core/files/emacs/src/lang/c-sharp.el @@ -7,5 +7,4 @@ ;; https://www.practically.io/copyright/ (use-package csharp-mode - :ensure t :hook (csharp-mode . lsp-deferred)) diff --git a/site-modules/core/files/emacs/src/lang/docker.el b/site-modules/core/files/emacs/src/lang/docker.el index aaa0044..801db1c 100644 --- a/site-modules/core/files/emacs/src/lang/docker.el +++ b/site-modules/core/files/emacs/src/lang/docker.el @@ -7,10 +7,8 @@ ;; https://www.practically.io/copyright/ (use-package docker - :ensure t :bind ("C-c d" . docker)) (use-package dockerfile-mode - :ensure t :hook (dockerfile-mode . lsp-deferred) :mode "\\Dockerfile\\'") diff --git a/site-modules/core/files/emacs/src/lang/go.el b/site-modules/core/files/emacs/src/lang/go.el index bb531cc..ba58804 100644 --- a/site-modules/core/files/emacs/src/lang/go.el +++ b/site-modules/core/files/emacs/src/lang/go.el @@ -8,6 +8,5 @@ (setenv "PATH" (concat (getenv "PATH") ":" (getenv "HOME") "/.local/share/go/bin")) (use-package go-mode - :ensure t :hook (go-mode . lsp-deferred) :mode "\\.go\\'") diff --git a/site-modules/core/files/emacs/src/lang/json.el b/site-modules/core/files/emacs/src/lang/json.el index e88f531..d6b3d35 100644 --- a/site-modules/core/files/emacs/src/lang/json.el +++ b/site-modules/core/files/emacs/src/lang/json.el @@ -7,8 +7,7 @@ ;; https://www.practically.io/copyright/ (use-package json-mode - :ensure t :hook (json-mode . lsp-deferred) :mode "\\.json\\'") -(use-package jsonnet-mode :ensure t) +(use-package jsonnet-mode) diff --git a/site-modules/core/files/emacs/src/lang/php.el b/site-modules/core/files/emacs/src/lang/php.el index 7d7323a..cac95e7 100644 --- a/site-modules/core/files/emacs/src/lang/php.el +++ b/site-modules/core/files/emacs/src/lang/php.el @@ -8,7 +8,6 @@ (use-package php-mode - :ensure t :hook ((php-mode . (lambda() (setq flycheck-local-checkers '((lsp . ((next-checkers . (php)))))))) (php-mode . lsp-deferred) (php-mode . tree-sitter-hl-mode)) @@ -16,4 +15,4 @@ (("\\.php\\'" . php-mode) ("\\.phpstub\\'" . php-mode))) -(use-package flycheck-psalm :ensure t) +(use-package flycheck-psalm) diff --git a/site-modules/core/files/emacs/src/lang/shell.el b/site-modules/core/files/emacs/src/lang/shell.el index 1dcede8..d4441d0 100644 --- a/site-modules/core/files/emacs/src/lang/shell.el +++ b/site-modules/core/files/emacs/src/lang/shell.el @@ -18,4 +18,4 @@ :init (add-hook 'sh-mode-hook 'flymake-shellcheck-load)) -(use-package bats-mode :ensure t); +(use-package bats-mode); diff --git a/site-modules/core/files/emacs/src/lang/yaml.el b/site-modules/core/files/emacs/src/lang/yaml.el index 1b7c856..4693dae 100644 --- a/site-modules/core/files/emacs/src/lang/yaml.el +++ b/site-modules/core/files/emacs/src/lang/yaml.el @@ -7,6 +7,5 @@ ;; https://www.practically.io/copyright/ (use-package yaml-mode - :ensure t :hook (yaml-mode . lsp-deferred) :mode "\\.\\(yml\\|yaml\\)\\'") diff --git a/site-modules/core/files/emacs/src/language-tool.el b/site-modules/core/files/emacs/src/language-tool.el index c0124d0..f0ee260 100644 --- a/site-modules/core/files/emacs/src/language-tool.el +++ b/site-modules/core/files/emacs/src/language-tool.el @@ -7,7 +7,6 @@ ;; https://www.practically.io/copyright/ (use-package languagetool - :quelpa t :config (setq languagetool-default-language "en-GB") (setq languagetool-language-tool-jar diff --git a/site-modules/core/files/emacs/src/org.el b/site-modules/core/files/emacs/src/org.el index 0453b26..d1c27c9 100644 --- a/site-modules/core/files/emacs/src/org.el +++ b/site-modules/core/files/emacs/src/org.el @@ -135,7 +135,6 @@ :after org) (use-package evil-org - :ensure t :after org :hook (org-mode . (lambda () evil-org-mode)) :config diff --git a/site-modules/core/files/emacs/src/packages.el b/site-modules/core/files/emacs/src/packages.el index 2434b30..d53ec00 100644 --- a/site-modules/core/files/emacs/src/packages.el +++ b/site-modules/core/files/emacs/src/packages.el @@ -23,6 +23,7 @@ (setq use-package-always-ensure t) (use-package quelpa) +(setq use-package-ensure-function 'quelpa) (quelpa '(quelpa-use-package diff --git a/site-modules/core/files/emacs/src/projectile.el b/site-modules/core/files/emacs/src/projectile.el index f855e36..73dcfe7 100644 --- a/site-modules/core/files/emacs/src/projectile.el +++ b/site-modules/core/files/emacs/src/projectile.el @@ -7,7 +7,6 @@ ;; https://www.practically.io/copyright/ (use-package projectile - :quelpa t :diminish projectile-mode :config (projectile-mode) :custom ((projectile-completion-system 'ivy)) @@ -20,7 +19,6 @@ (setq projectile-switch-project-action #'projectile-dired)) (use-package counsel-projectile - :quelpa t :config (counsel-projectile-mode)) (defun projectile--get-php-test-command () diff --git a/site-modules/core/files/emacs/src/puppet.el b/site-modules/core/files/emacs/src/puppet.el index ced11c2..4dc46ff 100644 --- a/site-modules/core/files/emacs/src/puppet.el +++ b/site-modules/core/files/emacs/src/puppet.el @@ -7,6 +7,5 @@ ;; https://www.practically.io/copyright/ (use-package puppet-mode - :ensure t :defer :mode "\\.pp\\'")