From 2b39d5b0d7746086d36e4f7d61c6c0362bdb72f4 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 22 Apr 2022 23:25:56 +0100 Subject: [PATCH] chore(use-package): use :preface in favor of :init when defining things --- modules/editor/siren-folding.el | 2 +- modules/editor/siren-recentf.el | 2 +- modules/editor/siren-vertico.el | 5 ++-- modules/formatting/siren-prettier-js.el | 2 +- modules/languages/siren-applescript.el | 2 +- modules/languages/siren-caddyfile.el | 2 +- modules/languages/siren-coffee.el | 2 +- modules/languages/siren-conf.el | 2 +- modules/languages/siren-css.el | 2 +- modules/languages/siren-cucumber.el | 2 +- modules/languages/siren-dart.el | 13 +++++----- modules/languages/siren-dockerfile.el | 3 ++- modules/languages/siren-golang.el | 22 +++++++++-------- modules/languages/siren-groovy.el | 2 +- modules/languages/siren-haml.el | 2 +- modules/languages/siren-haskell.el | 2 +- modules/languages/siren-jinja2.el | 2 +- modules/languages/siren-js.el | 4 ++-- modules/languages/siren-json.el | 4 ++-- modules/languages/siren-jsonnet.el | 2 +- modules/languages/siren-jsx.el | 2 +- modules/languages/siren-lua.el | 4 ++-- modules/languages/siren-makefile.el | 9 +++---- modules/languages/siren-markdown.el | 2 +- modules/languages/siren-mermaid.el | 2 +- modules/languages/siren-nginx.el | 2 +- modules/languages/siren-php.el | 2 +- modules/languages/siren-plantuml.el | 2 +- modules/languages/siren-protobuf.el | 2 +- modules/languages/siren-ruby.el | 24 ++++++++++--------- modules/languages/siren-rust.el | 2 +- modules/languages/siren-sass.el | 2 +- modules/languages/siren-scss.el | 2 +- modules/languages/siren-sh.el | 4 ++-- modules/languages/siren-slim.el | 2 +- modules/languages/siren-sql.el | 2 +- modules/languages/siren-ssh-config.el | 2 +- modules/languages/siren-terraform.el | 2 +- modules/languages/siren-thrift.el | 2 +- modules/languages/siren-toml.el | 2 +- modules/languages/siren-typescript.el | 2 +- modules/languages/siren-vue.el | 2 +- modules/languages/siren-web-mode.el | 2 +- modules/languages/siren-xml.el | 2 +- modules/languages/siren-yaml.el | 4 ++-- modules/lsp/siren-lsp.el | 2 +- modules/major-modes/siren-fundamental-mode.el | 2 +- modules/major-modes/siren-prog-mode.el | 10 ++++---- modules/major-modes/siren-special-mode.el | 2 +- modules/major-modes/siren-text-mode.el | 2 +- modules/misc/siren-zone.el | 2 +- modules/navigation/siren-consult.el | 2 +- modules/navigation/siren-dired+.el | 2 +- modules/navigation/siren-dired.el | 3 +-- modules/navigation/siren-direx.el | 2 +- modules/navigation/siren-helm.el | 4 ++-- modules/navigation/siren-recursive-narrow.el | 2 +- modules/org-mode/siren-ob-go.el | 2 +- modules/org-mode/siren-ob-http.el | 2 +- modules/org-mode/siren-ob-mermaid.el | 2 +- modules/org-mode/siren-org-mode.el | 2 +- modules/org-mode/siren-ox-gfm.el | 2 +- modules/org-mode/siren-ox-jira.el | 2 +- modules/org-mode/siren-ox-pandoc.el | 2 +- modules/projects/siren-all-the-icons.el | 6 +++-- modules/projects/siren-neotree.el | 2 +- modules/projects/siren-treemacs.el | 2 +- modules/shell/siren-vterm.el | 2 +- modules/shell/siren-xterm-color.el | 2 +- modules/themes/siren-doom-themes.el | 2 +- modules/tools/siren-kubernetes.el | 2 +- modules/version-control/siren-diff-hl.el | 2 +- modules/version-control/siren-forge.el | 2 +- .../version-control/siren-git-timemachine.el | 2 +- modules/version-control/siren-magit.el | 4 ++-- modules/workspaces/siren-escreen.el | 2 +- modules/workspaces/siren-persp-mode.el | 15 ++++++------ 77 files changed, 134 insertions(+), 124 deletions(-) diff --git a/modules/editor/siren-folding.el b/modules/editor/siren-folding.el index 45272df..28592b7 100644 --- a/modules/editor/siren-folding.el +++ b/modules/editor/siren-folding.el @@ -13,7 +13,7 @@ ("C-=" 'siren-folding-toggle-selective-display) ("C-c C-h" 'siren-folding-toggle) - :init + :preface (defun siren-folding (&optional arg) "Activate or deactivate code folding. Optional ARG is passed directly to mode toggle function." diff --git a/modules/editor/siren-recentf.el b/modules/editor/siren-recentf.el index 9b8ef11..f6ac467 100644 --- a/modules/editor/siren-recentf.el +++ b/modules/editor/siren-recentf.el @@ -17,7 +17,7 @@ (recentf-auto-cleanup 'never) (recentf-exclude '("\\.git.*" "\\.hg.*" "\\.svn.*")) - :init + :preface (defun siren-recentf-exclude-p (file) "A predicate to decide whether to exclude FILE from recentf." (let ((file-dir (file-truename (file-name-directory file)))) diff --git a/modules/editor/siren-vertico.el b/modules/editor/siren-vertico.el index 4ae82ac..bf65df7 100644 --- a/modules/editor/siren-vertico.el +++ b/modules/editor/siren-vertico.el @@ -16,7 +16,7 @@ (enable-recursive-minibuffers t) (read-extended-command-predicate #'command-completion-default-include-p) - :init + :preface (defun siren-crm-indicator (args) (cons (concat "[CRM] " (car args)) (cdr args))) @@ -41,7 +41,7 @@ (:keymaps 'vertico-map "C-l" 'vertico-directory-up) - :init + :preface ;; Hacky minor-mode to toggle vertico-directory features on and off. (define-minor-mode vertico-directory-mode "Remap vertico keybindings to handle files/folders better." @@ -61,6 +61,7 @@ (define-key map (kbd "DEL") 'backward-delete-char) (define-key map (kbd "M-DEL") 'backward-kill-word))))) + :init (with-eval-after-load 'projectile ;; Hackily disable vertico-directory-mode when completing things for ;; projectile. This avoids breaking projectile-switch-project command. diff --git a/modules/formatting/siren-prettier-js.el b/modules/formatting/siren-prettier-js.el index 9a6733d..bce95a5 100644 --- a/modules/formatting/siren-prettier-js.el +++ b/modules/formatting/siren-prettier-js.el @@ -10,7 +10,7 @@ :defer t :hook (prettier-js-mode . siren-prettier-js-mode-setup) - :init + :preface (defun siren-prettier-js-mode-setup ())) (provide 'siren-prettier-js) diff --git a/modules/languages/siren-applescript.el b/modules/languages/siren-applescript.el index fe1f9b2..483fc4e 100644 --- a/modules/languages/siren-applescript.el +++ b/modules/languages/siren-applescript.el @@ -15,7 +15,7 @@ :hook (applescript-mode . siren-applescript-mode-setup) - :init + :preface (defun siren-applescript-mode-setup () (run-hooks 'prog-mode-hook) (setq tab-width 4) diff --git a/modules/languages/siren-caddyfile.el b/modules/languages/siren-caddyfile.el index 496ea20..617d77b 100644 --- a/modules/languages/siren-caddyfile.el +++ b/modules/languages/siren-caddyfile.el @@ -15,7 +15,7 @@ :hook (caddyfile-mode . siren-caddyfile-mode-setup) - :init + :preface (defun siren-caddyfile-mode-setup () (setq-local tab-width 4 indent-tabs-mode nil) diff --git a/modules/languages/siren-coffee.el b/modules/languages/siren-coffee.el index 4379c08..ea6dbf9 100644 --- a/modules/languages/siren-coffee.el +++ b/modules/languages/siren-coffee.el @@ -16,7 +16,7 @@ :custom (coffee-tab-width 2) - :init + :preface (defun siren-coffee-mode-setup () ;; remove the "Generated by CoffeeScript" header (add-to-list 'coffee-args-compile "--no-header") diff --git a/modules/languages/siren-conf.el b/modules/languages/siren-conf.el index 17ecdad..693f68b 100644 --- a/modules/languages/siren-conf.el +++ b/modules/languages/siren-conf.el @@ -19,7 +19,7 @@ :hook (conf-mode . siren-conf-mode-setup) - :init + :preface (defun siren-conf-mode-setup () (run-hooks 'prog-mode-hook) (setq tab-width 2))) diff --git a/modules/languages/siren-css.el b/modules/languages/siren-css.el index 8ae2f01..e7e63db 100644 --- a/modules/languages/siren-css.el +++ b/modules/languages/siren-css.el @@ -20,7 +20,7 @@ :custom (css-indent-offset 2) - :init + :preface (defun siren-css-mode-setup () (setq tab-width 2) diff --git a/modules/languages/siren-cucumber.el b/modules/languages/siren-cucumber.el index 6fd5a78..4cc12c5 100644 --- a/modules/languages/siren-cucumber.el +++ b/modules/languages/siren-cucumber.el @@ -13,7 +13,7 @@ :interpreter "cucumber" :hook (feature-mode . siren-feature-mode-setup) - :init + :preface (defun siren-feature-mode-setup () (run-hooks 'prog-mode-hook) (setq tab-width 2))) diff --git a/modules/languages/siren-dart.el b/modules/languages/siren-dart.el index 05c0e3f..f047c91 100644 --- a/modules/languages/siren-dart.el +++ b/modules/languages/siren-dart.el @@ -21,11 +21,7 @@ (dart-format-on-save t) (dart-enable-analysis-server t) - :init - (with-eval-after-load "projectile" - (add-to-list 'projectile-project-root-files-bottom-up "pubspec.yaml") - (add-to-list 'projectile-project-root-files-bottom-up "BUILD")) - + :preface (defun siren-dart-mode-setup () (when (fboundp 'highlight-symbol-mode) (highlight-symbol-mode -1)) @@ -34,7 +30,12 @@ (lsp-deferred) (siren-folding) - (subword-mode +1))) + (subword-mode +1)) + + :init + (with-eval-after-load "projectile" + (add-to-list 'projectile-project-root-files-bottom-up "pubspec.yaml") + (add-to-list 'projectile-project-root-files-bottom-up "BUILD"))) (provide 'siren-dart) ;;; siren-dart.el ends here diff --git a/modules/languages/siren-dockerfile.el b/modules/languages/siren-dockerfile.el index 962a47c..4ff7e63 100644 --- a/modules/languages/siren-dockerfile.el +++ b/modules/languages/siren-dockerfile.el @@ -10,7 +10,7 @@ :hook (dockerfile-mode . siren-dockerfile-mode-setup) - :init + :preface (defun siren-dockerfile-mode-setup () (with-eval-after-load 'flycheck (flycheck-select-checker 'hadolint)) @@ -18,6 +18,7 @@ (lsp-deferred) (lsp-format-buffer-on-save-mode +1)) + :init (with-eval-after-load 'flycheck ;; Define fixed Hadolint checker, built-in checker expects lines to start ;; with ":", but when input is provided via STDIN, the each line diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el index ff4b662..2994465 100644 --- a/modules/languages/siren-golang.el +++ b/modules/languages/siren-golang.el @@ -27,12 +27,7 @@ :hook (go-mode . siren-go-mode-setup) - :init - (with-eval-after-load "projectile" - (add-to-list 'projectile-globally-ignored-directories "Godeps") - (add-to-list 'projectile-globally-ignored-directories "vendor/github.com") - (add-to-list 'projectile-globally-ignored-directories "vendor/gopkg.in")) - + :preface (defun siren-go-mode-setup () (setq-local tab-width 4 company-minimum-prefix-length 1 @@ -56,6 +51,12 @@ :args '("-t" "4" "-m" "80" "--no-reformat-tags") :lighter "GOLINES")) + :init + (with-eval-after-load "projectile" + (add-to-list 'projectile-globally-ignored-directories "Godeps") + (add-to-list 'projectile-globally-ignored-directories "vendor/github.com") + (add-to-list 'projectile-globally-ignored-directories "vendor/gopkg.in")) + :config (siren-define-golines-format-mode) @@ -97,7 +98,7 @@ (lsp-configuration-section "golangci-lint"))))) (add-to-list 'lsp-language-id-configuration '(go-mode . "golangci-lint")) - :init + :preface (defun siren-lsp-go-mode-setup () (setq-local siren-lsp-format-buffer-func 'siren-lsp-go-format-buffer) (lsp-format-buffer-on-save-mode t) @@ -131,13 +132,14 @@ :custom (go-test-verbose t) - :init + :preface (defun siren-gotest-setup () (let ((extra-args "-count=1 -race")) (if (and (boundp 'go-test-local) go-test-local) (setq-local go-test-args (concat go-test-args " " extra-args)) (setq-local go-test-args extra-args)))) + :init (when (not (version< emacs-version "28.0")) ;; Change ff-other-file-name to ff-find-the-other-file in Emacs 28.x and ;; later. @@ -161,7 +163,7 @@ For example, if the current buffer is `foo.go', the buffer for (:keymaps 'dap-mode-map "C-c , d" 'siren-dap-go-debug-current-test) - :init + :preface (defun siren-dap-go-debug-current-test () (interactive) (let ((name (go-test--get-current-test))) @@ -193,7 +195,7 @@ For example, if the current buffer is `foo.go', the buffer for ;; prevent go-projectile from screwing up GOPATH (go-projectile-switch-gopath 'never) - :init + :preface (defun siren-go-projectile-setup ())) (use-package go-playground diff --git a/modules/languages/siren-groovy.el b/modules/languages/siren-groovy.el index c23ac52..33f097d 100644 --- a/modules/languages/siren-groovy.el +++ b/modules/languages/siren-groovy.el @@ -11,7 +11,7 @@ :hook (groovy-mode . siren-groovy-mode-setup) - :init + :preface (defun siren-groovy-mode-setup () (setq groovy-highlight-assignments t groovy-indent-offset 4 diff --git a/modules/languages/siren-haml.el b/modules/languages/siren-haml.el index dc057ac..ab6e19c 100644 --- a/modules/languages/siren-haml.el +++ b/modules/languages/siren-haml.el @@ -10,7 +10,7 @@ :mode "\\.haml\\'" "\\.hamlc\\'" :hook (haml-mode . siren-haml-mode-setup) - :init + :preface (defun siren-haml-mode-setup () (setq tab-width 2))) diff --git a/modules/languages/siren-haskell.el b/modules/languages/siren-haskell.el index 46ac9b2..49bdd7c 100644 --- a/modules/languages/siren-haskell.el +++ b/modules/languages/siren-haskell.el @@ -16,7 +16,7 @@ :hook (haskell-mode . siren-haskell-mode-setup) - :init + :preface (defun siren-haskell-mode-setup () (siren-folding) (subword-mode +1))) diff --git a/modules/languages/siren-jinja2.el b/modules/languages/siren-jinja2.el index fe2f85a..95e2d1f 100644 --- a/modules/languages/siren-jinja2.el +++ b/modules/languages/siren-jinja2.el @@ -12,7 +12,7 @@ :hook (jinja2-mode . siren-jinja2-mode-setup) - :init + :preface (defun siren-jinja2-mode-setup () (run-hooks 'prog-mode-hook) (subword-mode +1))) diff --git a/modules/languages/siren-js.el b/modules/languages/siren-js.el index 67e12d0..fc49c29 100644 --- a/modules/languages/siren-js.el +++ b/modules/languages/siren-js.el @@ -24,7 +24,7 @@ :hook (js-mode . siren-js-mode-setup) - :init + :preface (defun siren-js-mode-setup () "Default tweaks for `js-mode'." (let ((width 2)) @@ -42,7 +42,7 @@ :hook (js-mode . siren-lsp-js-mode-setup) - :init + :preface (defun siren-lsp-js-mode-setup () (lsp-deferred) (lsp-format-buffer-on-save-mode))) diff --git a/modules/languages/siren-json.el b/modules/languages/siren-json.el index c818566..3e3569d 100644 --- a/modules/languages/siren-json.el +++ b/modules/languages/siren-json.el @@ -22,7 +22,7 @@ :hook (json-mode . siren-json-mode-setup) - :init + :preface (defun siren-json-mode-setup () "Default tweaks for `json-mode'." @@ -39,7 +39,7 @@ :hook (json-mode . siren-lsp-json-mode-setup) - :init + :preface (defun siren-lsp-json-mode-setup () (lsp-deferred) (lsp-format-buffer-on-save-mode))) diff --git a/modules/languages/siren-jsonnet.el b/modules/languages/siren-jsonnet.el index 00cd96b..9b7d98e 100644 --- a/modules/languages/siren-jsonnet.el +++ b/modules/languages/siren-jsonnet.el @@ -19,7 +19,7 @@ :custom (jsonnet-library-search-directories '("vendor")) - :init + :preface (defun siren-jsonnet-mode-setup () "Default tweaks for `jsonnet-mode'." (jsonnet-format-buffer-on-save-mode t) diff --git a/modules/languages/siren-jsx.el b/modules/languages/siren-jsx.el index a3127f3..294619b 100644 --- a/modules/languages/siren-jsx.el +++ b/modules/languages/siren-jsx.el @@ -14,7 +14,7 @@ :hook (rjsx-mode . siren-rjsx-mode-setup) - :init + :preface (defun siren-rjsx-mode-setup () (prettier-js-mode +1) (subword-mode +1) diff --git a/modules/languages/siren-lua.el b/modules/languages/siren-lua.el index a139ced..37b8b30 100644 --- a/modules/languages/siren-lua.el +++ b/modules/languages/siren-lua.el @@ -10,7 +10,7 @@ :hook (lua-mode . siren-lua-mode-setup) - :init + :preface (defun siren-lua-mode-setup () (setq lua-indent-level 2 whitespace-action '(auto-cleanup)) @@ -27,7 +27,7 @@ (lsp-lua-hint-enable t) (lsp-lua-telemetry-enable nil) - :init + :preface (defun siren-lsp-lua-mode-setup () (lsp-deferred))) diff --git a/modules/languages/siren-makefile.el b/modules/languages/siren-makefile.el index c6dc8a0..ee00c04 100644 --- a/modules/languages/siren-makefile.el +++ b/modules/languages/siren-makefile.el @@ -18,13 +18,14 @@ (:keymaps 'makefile-mode-map "C-c C-m" 'makefile-executor-execute-project-target) - :init - (add-to-list 'siren-indent-sensitive-modes 'makefile-mode) - + :preface (defun siren-makefile-mode-setup () (subword-mode +1) (siren-display-indentation -1) - (setq tab-width 4))) + (setq tab-width 4)) + + :init + (add-to-list 'siren-indent-sensitive-modes 'makefile-mode)) (provide 'siren-makefile) ;;; siren-makefile.el ends here diff --git a/modules/languages/siren-markdown.el b/modules/languages/siren-markdown.el index 5d416d7..5a9b848 100644 --- a/modules/languages/siren-markdown.el +++ b/modules/languages/siren-markdown.el @@ -39,7 +39,7 @@ :custom-face (markdown-code-face ((t nil))) - :init + :preface (defun siren-markdown-mode-setup () ;; Configure prettier after local vars are processed, allowing local ;; override of fill-column and have prettier respect it. diff --git a/modules/languages/siren-mermaid.el b/modules/languages/siren-mermaid.el index da510a3..3b0d3a0 100644 --- a/modules/languages/siren-mermaid.el +++ b/modules/languages/siren-mermaid.el @@ -14,7 +14,7 @@ :hook (mermaid-mode . siren-mermaid-mode-setup) - :init + :preface (defun siren-mermaid-mode-setup () (run-hooks 'prog-mode-hook))) diff --git a/modules/languages/siren-nginx.el b/modules/languages/siren-nginx.el index cce255e..56ab431 100644 --- a/modules/languages/siren-nginx.el +++ b/modules/languages/siren-nginx.el @@ -14,7 +14,7 @@ (nginx-indent-level 4) (nginx-indent-tabs-mode nil) - :init + :preface (defun siren-nginx-mode-setup () (setq tab-width 4))) diff --git a/modules/languages/siren-php.el b/modules/languages/siren-php.el index 485adc8..f12133a 100644 --- a/modules/languages/siren-php.el +++ b/modules/languages/siren-php.el @@ -17,7 +17,7 @@ :hook (php-mode . siren-php-mode-setup) - :init + :preface (defun siren-php-mode-setup () (tree-sitter-mode +1) (prettier-js-mode) diff --git a/modules/languages/siren-plantuml.el b/modules/languages/siren-plantuml.el index 5bd4859..5f890c6 100644 --- a/modules/languages/siren-plantuml.el +++ b/modules/languages/siren-plantuml.el @@ -14,7 +14,7 @@ :custom (plantuml-default-exec-mode 'executable) - :init + :preface (defun siren-plantuml-mode-setup () (setq tab-width 2))) diff --git a/modules/languages/siren-protobuf.el b/modules/languages/siren-protobuf.el index 6b2cc72..668b7d3 100644 --- a/modules/languages/siren-protobuf.el +++ b/modules/languages/siren-protobuf.el @@ -15,7 +15,7 @@ :hook (protobuf-mode . siren-protobuf-mode-setup) - :init + :preface (defun siren-protobuf-mode-setup () (run-hooks 'prog-mode-hook) (setq tab-width 2) diff --git a/modules/languages/siren-ruby.el b/modules/languages/siren-ruby.el index 5ddeaf0..57f8aa9 100644 --- a/modules/languages/siren-ruby.el +++ b/modules/languages/siren-ruby.el @@ -52,11 +52,7 @@ :hook (ruby-mode . siren-ruby-mode-setup) - :init - (with-eval-after-load "projectile" - (add-to-list 'projectile-globally-ignored-directories "vendor/bundle") - (add-to-list 'projectile-globally-ignored-directories "vendor/ruby")) - + :preface (defun siren-ruby-mode-setup () (setq-local c-tab-always-indent nil ruby-align-chained-calls t @@ -68,6 +64,11 @@ (siren-folding) (subword-mode +1)) + :init + (with-eval-after-load "projectile" + (add-to-list 'projectile-globally-ignored-directories "vendor/bundle") + (add-to-list 'projectile-globally-ignored-directories "vendor/ruby")) + :config ;; Use M-' instead to togle quote styles (unbind-key "C-c '" ruby-mode-map) @@ -93,12 +94,13 @@ (lsp-solargraph-multi-root nil) (lsp-solargraph-log-level "warn") + :preface + (defun siren-lsp-ruby-mode-setup () + (lsp-deferred)) + :init (add-to-list 'safe-local-variable-values - '(lsp-solargraph-use-bundler . t)) - - (defun siren-lsp-ruby-mode-setup () - (lsp-deferred))) + '(lsp-solargraph-use-bundler . t))) (use-package rufo :defer t @@ -125,7 +127,7 @@ (inf-ruby-mode . siren-inf-ruby-mode-setup) (compilation-filter . inf-ruby-auto-enter) - :init + :preface (defun siren-inf-ruby-mode-setup () (if (fboundp 'company-mode) (company-mode -1))) @@ -146,7 +148,7 @@ (rspec-use-opts-file-when-available nil) (rspec-use-spring-when-possible nil) - :init + :preface (defun siren-rspec-mode-setup ()) :config diff --git a/modules/languages/siren-rust.el b/modules/languages/siren-rust.el index 1d054c1..d01127f 100644 --- a/modules/languages/siren-rust.el +++ b/modules/languages/siren-rust.el @@ -21,7 +21,7 @@ :hook (rust-mode . siren-rust-mode-setup) - :init + :preface (defun siren-rust-mode-setup () (setq rust-format-on-save t) diff --git a/modules/languages/siren-sass.el b/modules/languages/siren-sass.el index 4c34179..6ad2dc6 100644 --- a/modules/languages/siren-sass.el +++ b/modules/languages/siren-sass.el @@ -18,7 +18,7 @@ ;; Turn off annoying auto-compile on save. (sass-compile-at-save nil) - :init + :preface (defun siren-sass-mode-setup () (siren-css-mode-css))) diff --git a/modules/languages/siren-scss.el b/modules/languages/siren-scss.el index bf0851e..48f673b 100644 --- a/modules/languages/siren-scss.el +++ b/modules/languages/siren-scss.el @@ -18,7 +18,7 @@ ;; Turn off annoying auto-compile on save. (scss-compile-at-save nil) - :init + :preface (defun siren-scss-mode-setup () (siren-css-mode-setup))) diff --git a/modules/languages/siren-sh.el b/modules/languages/siren-sh.el index 9fd416e..759be46 100644 --- a/modules/languages/siren-sh.el +++ b/modules/languages/siren-sh.el @@ -33,7 +33,7 @@ (sh-indentation 2) (sh-indent-after-continuation 'always) - :init + :preface (defun siren-sh-mode-setup () (setq tab-width 2 whitespace-action '(auto-cleanup)) @@ -47,7 +47,7 @@ :hook (sh-mode . siren-lsp-bash-mode-setup) - :init + :preface (defun siren-lsp-bash-mode-setup () (if (member sh-shell '(bash sh)) (lsp-deferred)))) diff --git a/modules/languages/siren-slim.el b/modules/languages/siren-slim.el index a53590a..7ee6b5f 100644 --- a/modules/languages/siren-slim.el +++ b/modules/languages/siren-slim.el @@ -10,7 +10,7 @@ :mode "\\.slim\\'" :hook (slim-mode . siren-slim-mode-hook) - :init + :preface (defun siren-slim-mode-setup ())) (provide 'siren-slim) diff --git a/modules/languages/siren-sql.el b/modules/languages/siren-sql.el index 858c5d5..9adb06c 100644 --- a/modules/languages/siren-sql.el +++ b/modules/languages/siren-sql.el @@ -13,7 +13,7 @@ :mode "\\.sql\\'" :hook (sql-mode . siren-sql-mode-setup) - :init + :preface (defun siren-sql-mode-setup () (setq tab-width 2))) diff --git a/modules/languages/siren-ssh-config.el b/modules/languages/siren-ssh-config.el index 4871cea..5e44a9e 100644 --- a/modules/languages/siren-ssh-config.el +++ b/modules/languages/siren-ssh-config.el @@ -13,7 +13,7 @@ "/\\.local/ssh/config\\(\\.d/.*\\.conf\\)?\\'" :hook (ssh-config-mode . siren-ssh-config-mode-setup) - :init + :preface (defun siren-ssh-config-mode-setup () (run-hooks 'prog-mode-hook) (setq tab-width 2))) diff --git a/modules/languages/siren-terraform.el b/modules/languages/siren-terraform.el index 5f1b16e..8bb2c72 100644 --- a/modules/languages/siren-terraform.el +++ b/modules/languages/siren-terraform.el @@ -16,7 +16,7 @@ :custom (terraform-indent-level 2) - :init + :preface (defun siren-terraform-mode-setup () (setq-local tab-width 2) (terraform-format-on-save-mode 1) diff --git a/modules/languages/siren-thrift.el b/modules/languages/siren-thrift.el index ec0fcdf..9e11f79 100644 --- a/modules/languages/siren-thrift.el +++ b/modules/languages/siren-thrift.el @@ -12,7 +12,7 @@ :mode "\\.thrift\\'" :hook (thrift-mode . siren-thrift-mode-setup) - :init + :preface (defun siren-thrift-mode-setup () (run-hooks 'prog-mode-hook) (setq tab-width 2) diff --git a/modules/languages/siren-toml.el b/modules/languages/siren-toml.el index 478c9f0..1d5a14b 100644 --- a/modules/languages/siren-toml.el +++ b/modules/languages/siren-toml.el @@ -14,7 +14,7 @@ :mode "\\.toml\\'" :hook (conf-toml-mode . siren-toml-mode-setup) - :init + :preface (defun siren-toml-mode-setup () (run-hooks 'prog-mode-hook) (setq tab-width 2) diff --git a/modules/languages/siren-typescript.el b/modules/languages/siren-typescript.el index 00ed609..056f3ef 100644 --- a/modules/languages/siren-typescript.el +++ b/modules/languages/siren-typescript.el @@ -24,7 +24,7 @@ "C-j" 'newline-and-indent "C-c C-h" 'siren-folding-toggle) - :init + :preface (defun siren-typescript-mode-setup () (let ((width 2)) (setq typescript-indent-level width diff --git a/modules/languages/siren-vue.el b/modules/languages/siren-vue.el index 589e3e8..bd4ab7e 100644 --- a/modules/languages/siren-vue.el +++ b/modules/languages/siren-vue.el @@ -13,7 +13,7 @@ :hook (vue-mode . siren-vue-mode-setup) - :init + :preface (defun siren-vue-mode-setup () (prettier-js-mode) (lsp-deferred) diff --git a/modules/languages/siren-web-mode.el b/modules/languages/siren-web-mode.el index 4d3d871..08b9793 100644 --- a/modules/languages/siren-web-mode.el +++ b/modules/languages/siren-web-mode.el @@ -30,7 +30,7 @@ (web-mode-sql-indent-offset 2) (web-mode-engines-alist '(("go" . "\\.tpl\\'"))) - :init + :preface (defun siren-web-mode-setup () "Default tweaks for `web-mode'." (setq tab-width 2) diff --git a/modules/languages/siren-xml.el b/modules/languages/siren-xml.el index b71c94e..763cf05 100644 --- a/modules/languages/siren-xml.el +++ b/modules/languages/siren-xml.el @@ -18,7 +18,7 @@ (nxml-attribute-indent 2) (nxml-child-indent 2) - :init + :preface (defun siren-xml-setup () (run-hooks 'prog-mode-hook) (setq tab-width 2) diff --git a/modules/languages/siren-yaml.el b/modules/languages/siren-yaml.el index aceb1f8..81ec8d5 100644 --- a/modules/languages/siren-yaml.el +++ b/modules/languages/siren-yaml.el @@ -18,7 +18,7 @@ :hook (yaml-mode . siren-yaml-mode-setup) - :init + :preface (defun siren-yaml-mode-setup () (run-hooks 'prog-mode-hook) @@ -31,7 +31,7 @@ :hook (yaml-mode . siren-lsp-yaml-mode-setup) - :init + :preface (defun siren-lsp-yaml-mode-setup () (lsp-deferred) (lsp-format-buffer-on-save-mode))) diff --git a/modules/lsp/siren-lsp.el b/modules/lsp/siren-lsp.el index 1c522d8..d38ea34 100644 --- a/modules/lsp/siren-lsp.el +++ b/modules/lsp/siren-lsp.el @@ -48,7 +48,7 @@ ;; https://emacs-lsp.github.io/lsp-mode/page/performance/ (read-process-output-max (* 1024 1024)) - :init + :preface (defun siren-lsp-mode-setup () (setq-local company-idle-delay 0.1 company-minimum-prefix-length 1)) diff --git a/modules/major-modes/siren-fundamental-mode.el b/modules/major-modes/siren-fundamental-mode.el index 56fad9f..28e5791 100644 --- a/modules/major-modes/siren-fundamental-mode.el +++ b/modules/major-modes/siren-fundamental-mode.el @@ -13,7 +13,7 @@ :hook (fundamental-mode . siren-fundamental-mode-setup) - :init + :preface (defun siren-fundamental-mode-setup () (hl-line-mode t))) diff --git a/modules/major-modes/siren-prog-mode.el b/modules/major-modes/siren-prog-mode.el index 230433a..a385d57 100644 --- a/modules/major-modes/siren-prog-mode.el +++ b/modules/major-modes/siren-prog-mode.el @@ -13,10 +13,7 @@ :hook (prog-mode . siren-prog-mode-setup) - :init - (add-to-list 'safe-local-variable-values - '(fill-column . 120)) - + :preface (defun siren-prog-mode-setup () "Default coding hook, useful with any programming language." (setq-local fill-column 80) @@ -28,7 +25,10 @@ (hl-line-mode t) (visual-line-mode t) - (whitespace-mode t))) + (whitespace-mode t)) + + :init + (add-to-list 'safe-local-variable-values '(fill-column . 120))) (provide 'siren-prog-mode) ;;; siren-prog-mode.el ends here diff --git a/modules/major-modes/siren-special-mode.el b/modules/major-modes/siren-special-mode.el index 07161e1..d96b2d9 100644 --- a/modules/major-modes/siren-special-mode.el +++ b/modules/major-modes/siren-special-mode.el @@ -13,7 +13,7 @@ :hook (special-mode . siren-special-mode-setup) - :init + :preface (defun siren-special-mode-setup () (hl-line-mode t))) diff --git a/modules/major-modes/siren-text-mode.el b/modules/major-modes/siren-text-mode.el index 3337d2f..e830b43 100644 --- a/modules/major-modes/siren-text-mode.el +++ b/modules/major-modes/siren-text-mode.el @@ -10,7 +10,7 @@ :straight (:type built-in) :defer t :hook (text-mode . siren-text-mode-setup) - :init + :preface (defun siren-text-mode-setup () (setq-local fill-column 80) diff --git a/modules/misc/siren-zone.el b/modules/misc/siren-zone.el index 853a939..9b49495 100644 --- a/modules/misc/siren-zone.el +++ b/modules/misc/siren-zone.el @@ -10,7 +10,7 @@ :straight (:type built-in) :defer t - :init + :preface (defun zone-choose (pgm) "Choose a PGM to run for `zone'." (interactive diff --git a/modules/navigation/siren-consult.el b/modules/navigation/siren-consult.el index f252f19..b0491aa 100644 --- a/modules/navigation/siren-consult.el +++ b/modules/navigation/siren-consult.el @@ -28,7 +28,7 @@ :config (setq consult-project-root-function 'projectile-project-root) - :init + :preface (defun siren-consult-imenu () "Intelligently trigger consult-lsp-file-symbols or consult-imenu." (interactive) diff --git a/modules/navigation/siren-dired+.el b/modules/navigation/siren-dired+.el index f2cdb98..c701cb0 100644 --- a/modules/navigation/siren-dired+.el +++ b/modules/navigation/siren-dired+.el @@ -15,7 +15,7 @@ :hook (dired-mode . siren-diredp-mode-setup) - :init + :preface (defun siren-diredp-mode-setup () (toggle-diredp-find-file-reuse-dir 1)) diff --git a/modules/navigation/siren-dired.el b/modules/navigation/siren-dired.el index 7e560e3..d2ccc08 100644 --- a/modules/navigation/siren-dired.el +++ b/modules/navigation/siren-dired.el @@ -23,7 +23,7 @@ :custom (siren-dired-clean-up-dired-buffers-after-deletion nil) - :init + :preface (defun siren-dired-mode-setup () (hl-line-mode +1)) @@ -86,7 +86,6 @@ :group 'siren-dired) :config - ;; Replace built-in dired buffer cleanup function with a custom patched ;; version that allows separately configuring if dired buffers are cleaned up ;; along with file buffers. Without this, whenever you delete a file in dired, diff --git a/modules/navigation/siren-direx.el b/modules/navigation/siren-direx.el index 18cd052..8423cc9 100644 --- a/modules/navigation/siren-direx.el +++ b/modules/navigation/siren-direx.el @@ -16,7 +16,7 @@ (direx:closed-icon " + ") (direx:open-icon " - ") - :init + :preface (defun siren-direx-mode-setup ())) (provide 'siren-direx) diff --git a/modules/navigation/siren-helm.el b/modules/navigation/siren-helm.el index 8432367..2d70170 100755 --- a/modules/navigation/siren-helm.el +++ b/modules/navigation/siren-helm.el @@ -58,7 +58,7 @@ (siren-helm-auto-toggle-neotree t) (siren-helm-auto-toggle-treemacs t) - :init + :preface (defgroup siren-helm nil "Siren specific settings for helm." :group 'helm) @@ -209,7 +209,7 @@ (helm-posframe-parameters '((left-fringe . 10) (right-fringe . 10))) (helm-posframe-width 500) - :init + :preface ;; helm-posframe does not come with a minor mode to toggle it on/off, so let's ;; make one to make life easier. (define-minor-mode helm-posframe-mode diff --git a/modules/navigation/siren-recursive-narrow.el b/modules/navigation/siren-recursive-narrow.el index a86a543..b8e958b 100644 --- a/modules/navigation/siren-recursive-narrow.el +++ b/modules/navigation/siren-recursive-narrow.el @@ -18,7 +18,7 @@ (add-hook 'recursive-narrow-dwim-functions 'siren-recursive-narrow-markdown-edit-code-block) - :init + :preface (defun siren-recursive-narrow-org-edit-src-code() (ignore-errors (org-edit-src-code) t)) diff --git a/modules/org-mode/siren-ob-go.el b/modules/org-mode/siren-ob-go.el index be64144..d4b9729 100644 --- a/modules/org-mode/siren-ob-go.el +++ b/modules/org-mode/siren-ob-go.el @@ -14,7 +14,7 @@ :hook (org-mode . siren-ob-go-setup) - :init + :preface (defun siren-ob-go-setup () (require 'ob-go))) diff --git a/modules/org-mode/siren-ob-http.el b/modules/org-mode/siren-ob-http.el index 85d7d92..3c0e0af 100644 --- a/modules/org-mode/siren-ob-http.el +++ b/modules/org-mode/siren-ob-http.el @@ -14,7 +14,7 @@ :hook (org-mode . siren-ob-http-setup) - :init + :preface (defun siren-ob-http-setup () (require 'ob-http))) diff --git a/modules/org-mode/siren-ob-mermaid.el b/modules/org-mode/siren-ob-mermaid.el index 3ac19a5..1059796 100644 --- a/modules/org-mode/siren-ob-mermaid.el +++ b/modules/org-mode/siren-ob-mermaid.el @@ -14,7 +14,7 @@ :hook (org-mode . siren-ob-mermaid-setup) - :init + :preface (defun siren-ob-mermaid-setup () (require 'ob-mermaid))) diff --git a/modules/org-mode/siren-org-mode.el b/modules/org-mode/siren-org-mode.el index f9aab3b..40a5748 100644 --- a/modules/org-mode/siren-org-mode.el +++ b/modules/org-mode/siren-org-mode.el @@ -78,7 +78,7 @@ (sql . t) (sqlite . t))) - :init + :preface (defun siren-org-mode-setup () (setq fill-column 80 whitespace-action '(auto-cleanup) diff --git a/modules/org-mode/siren-ox-gfm.el b/modules/org-mode/siren-ox-gfm.el index 7d77139..b8b8c6b 100644 --- a/modules/org-mode/siren-ox-gfm.el +++ b/modules/org-mode/siren-ox-gfm.el @@ -14,7 +14,7 @@ :hook (org-mode . siren-ox-gfm-setup) - :init + :preface (defun siren-ox-gfm-setup () (require 'ox-gfm))) diff --git a/modules/org-mode/siren-ox-jira.el b/modules/org-mode/siren-ox-jira.el index e9c3b32..1949f3e 100644 --- a/modules/org-mode/siren-ox-jira.el +++ b/modules/org-mode/siren-ox-jira.el @@ -14,7 +14,7 @@ :hook (org-mode . siren-ox-jira-setup) - :init + :preface (defun siren-ox-jira-setup () (require 'ox-jira))) diff --git a/modules/org-mode/siren-ox-pandoc.el b/modules/org-mode/siren-ox-pandoc.el index 342439b..6a5a421 100644 --- a/modules/org-mode/siren-ox-pandoc.el +++ b/modules/org-mode/siren-ox-pandoc.el @@ -19,7 +19,7 @@ (org-pandoc-options-for-markdown '((columns . "80"))) (org-pandoc-options-for-org '((columns . "80"))) - :init + :preface (defun siren-ox-pandoc-setup () (require 'ox-pandoc))) diff --git a/modules/projects/siren-all-the-icons.el b/modules/projects/siren-all-the-icons.el index 763327c..f1c532e 100644 --- a/modules/projects/siren-all-the-icons.el +++ b/modules/projects/siren-all-the-icons.el @@ -16,15 +16,17 @@ (use-package all-the-icons-ibuffer :after all-the-icons :if window-system - :init (all-the-icons-ibuffer-mode 1)) + :init + (all-the-icons-ibuffer-mode 1)) (use-package all-the-icons-completion :after (marginalia all-the-icons) + :if window-system :hook (marginalia-mode . all-the-icons-completion-marginalia-setup) :init (all-the-icons-completion-mode) - :config + :config ;; Override default category lookup function. (defun all-the-icons-completion-get-icon (cand cat) "Return the icon for the candidate CAND of completion category CAT." diff --git a/modules/projects/siren-neotree.el b/modules/projects/siren-neotree.el index c1ee4f8..88ade78 100644 --- a/modules/projects/siren-neotree.el +++ b/modules/projects/siren-neotree.el @@ -26,7 +26,7 @@ (neo-vc-integration '(face char)) (neo-window-width 54) - :init + :preface (defun neotree-project-dir () "Open NeoTree using the project root, using find-file-in-project, or the current buffer directory." diff --git a/modules/projects/siren-treemacs.el b/modules/projects/siren-treemacs.el index be9ec67..96c64e3 100644 --- a/modules/projects/siren-treemacs.el +++ b/modules/projects/siren-treemacs.el @@ -30,7 +30,7 @@ (treemacs-last-error-persist-file (expand-file-name "treemacs-persist-at-last-error" siren-cache-dir)) - :init + :preface (defgroup siren-treemacs nil "Siren specific settings for treemacs." :group 'treemacs) diff --git a/modules/shell/siren-vterm.el b/modules/shell/siren-vterm.el index d6d4a25..71eada6 100644 --- a/modules/shell/siren-vterm.el +++ b/modules/shell/siren-vterm.el @@ -33,7 +33,7 @@ (vterm-kill-buffer-on-exit t) (vterm-max-scrollback 50000) - :init + :preface (defun siren-vterm-mode-setup () (hl-line-mode -1)) diff --git a/modules/shell/siren-xterm-color.el b/modules/shell/siren-xterm-color.el index aa13982..80b2705 100644 --- a/modules/shell/siren-xterm-color.el +++ b/modules/shell/siren-xterm-color.el @@ -11,7 +11,7 @@ :custom (compilation-environment '("TERM=xterm-256color")) - :init + :preface (defun siren-advice-compilation-filter (f proc string) (funcall f proc (xterm-color-filter string))) diff --git a/modules/themes/siren-doom-themes.el b/modules/themes/siren-doom-themes.el index d92d4ab..8e00084 100644 --- a/modules/themes/siren-doom-themes.el +++ b/modules/themes/siren-doom-themes.el @@ -42,7 +42,7 @@ ;; Corrects (and improves) org-mode's native fontification. (doom-themes-org-config) - :init + :preface (defun siren-doom-themes-load (theme) (interactive (list (completing-read "Choose theme: " (siren-doom-themes-list)))) diff --git a/modules/tools/siren-kubernetes.el b/modules/tools/siren-kubernetes.el index 3b9ec49..e6c53b8 100644 --- a/modules/tools/siren-kubernetes.el +++ b/modules/tools/siren-kubernetes.el @@ -9,7 +9,7 @@ (use-package kubernetes :defer t - :init + :preface (defalias 'ko 'kubernetes-overview)) (provide 'siren-kubernetes) diff --git a/modules/version-control/siren-diff-hl.el b/modules/version-control/siren-diff-hl.el index db68b02..25d6c90 100644 --- a/modules/version-control/siren-diff-hl.el +++ b/modules/version-control/siren-diff-hl.el @@ -27,7 +27,7 @@ (unknown . "?") (ignored . "i"))) - :init + :preface (defun siren-turn-on-diff-hl-mode () (turn-on-diff-hl-mode) (diff-hl-flydiff-mode 1)) diff --git a/modules/version-control/siren-forge.el b/modules/version-control/siren-forge.el index 861c98e..4940c38 100644 --- a/modules/version-control/siren-forge.el +++ b/modules/version-control/siren-forge.el @@ -35,7 +35,7 @@ :hook (forge-post-mode . siren-forge-post-mode-setup) - :init + :preface (defun siren-forge-post-mode-setup () (setq-local prettier-js-args '("--parser" "markdown" "--print-width" "80" diff --git a/modules/version-control/siren-git-timemachine.el b/modules/version-control/siren-git-timemachine.el index 3ebfe5c..4d6f483 100644 --- a/modules/version-control/siren-git-timemachine.el +++ b/modules/version-control/siren-git-timemachine.el @@ -8,7 +8,7 @@ (use-package git-timemachine :defer t - :init + :preface (defalias 'gt 'git-timemachine)) (provide 'siren-git-timemachine) diff --git a/modules/version-control/siren-magit.el b/modules/version-control/siren-magit.el index c9fb084..487963f 100644 --- a/modules/version-control/siren-magit.el +++ b/modules/version-control/siren-magit.el @@ -37,7 +37,7 @@ (magit-revert-buffers 'silent) (magit-status-buffer-switch-function 'switch-to-buffer) - :init + :preface (defalias 'bl 'magit-blame) (defun siren-magit-mode-setup ()) @@ -75,7 +75,7 @@ (magit-delta-default-light-theme "OneHalfLight") (siren-magit-delta-enabled nil) - :init + :preface (defgroup siren-magit-delta nil "Siren specific options for magit-delta." :group 'magit-delta) diff --git a/modules/workspaces/siren-escreen.el b/modules/workspaces/siren-escreen.el index 40c78e4..3aaca0d 100644 --- a/modules/workspaces/siren-escreen.el +++ b/modules/workspaces/siren-escreen.el @@ -28,7 +28,7 @@ :hook (escreen-goto-screen . siren-escreen-get-active-screen) - :init + :preface (defun siren-escreen-get-active-screen () "what the name says" (interactive) diff --git a/modules/workspaces/siren-persp-mode.el b/modules/workspaces/siren-persp-mode.el index ded8ac0..251e881 100644 --- a/modules/workspaces/siren-persp-mode.el +++ b/modules/workspaces/siren-persp-mode.el @@ -63,13 +63,7 @@ (persp-keymap-prefix "") (persp-nil-name "nil") - :init - ;; Do not auto save/load in terminal. My main instance of Emacs runs in GUI, - ;; terminal based instances are for smaller random things. - (when (not window-system) - (setq persp-auto-resume-time -1 - persp-auto-save-opt 0)) - + :preface (defun siren-persp-mode-filter-magit-buffers (buf) (string-prefix-p "magit" (buffer-name buf))) @@ -176,6 +170,13 @@ ARG counts from 1." (let ((name (nth arg (persp-names-current-frame-fast-ordered)))) (if name (persp-switch name)))) + :init + ;; Do not auto save/load in terminal. My main instance of Emacs runs in GUI, + ;; terminal based instances are for smaller random things. + (when (not window-system) + (setq persp-auto-resume-time -1 + persp-auto-save-opt 0)) + :config (persp-mode)