diff --git a/modules/languages/siren-applescript.el b/modules/languages/siren-applescript.el index d733b86..fe1f9b2 100644 --- a/modules/languages/siren-applescript.el +++ b/modules/languages/siren-applescript.el @@ -20,7 +20,6 @@ (run-hooks 'prog-mode-hook) (setq tab-width 4) - (company-mode +1) (highlight-symbol-mode -1) (subword-mode +1))) diff --git a/modules/languages/siren-css.el b/modules/languages/siren-css.el index 705c483..207a8ba 100644 --- a/modules/languages/siren-css.el +++ b/modules/languages/siren-css.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-lsp) (require 'siren-prettier-js) (require 'siren-rainbow) @@ -24,7 +23,6 @@ (defun siren-css-mode-setup () (setq tab-width 2) - (company-mode +1) (prettier-js-mode) (lsp-deferred) (rainbow-mode +1))) diff --git a/modules/languages/siren-dart.el b/modules/languages/siren-dart.el index 6cf5629..05c0e3f 100644 --- a/modules/languages/siren-dart.el +++ b/modules/languages/siren-dart.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-folding) (require 'siren-lsp) (require 'siren-projectile) @@ -33,7 +32,6 @@ (when (fboundp 'auto-highlight-symbol-mode) (auto-highlight-symbol-mode -1)) - (company-mode +1) (lsp-deferred) (siren-folding) (subword-mode +1))) diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el index 5b8f3c2..4b9fabf 100644 --- a/modules/languages/siren-golang.el +++ b/modules/languages/siren-golang.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-dap) (require 'siren-display-indentation) (require 'siren-flycheck) @@ -47,7 +46,6 @@ (tree-sitter-hl-mode +1) (siren-display-indentation -1) - (company-mode +1) (siren-folding) (subword-mode +1)) diff --git a/modules/languages/siren-haskell.el b/modules/languages/siren-haskell.el index 9daacc3..2dc54dc 100644 --- a/modules/languages/siren-haskell.el +++ b/modules/languages/siren-haskell.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-folding) (use-package haskell-mode @@ -18,7 +17,6 @@ :init (defun siren-haskell-mode-setup () - (company-mode +1) (siren-folding) (subword-mode +1))) diff --git a/modules/languages/siren-js.el b/modules/languages/siren-js.el index 7ae3cfd..464df5f 100644 --- a/modules/languages/siren-js.el +++ b/modules/languages/siren-js.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-folding) (require 'siren-lsp) @@ -31,7 +30,6 @@ indent-level width tab-width width)) - (company-mode) (subword-mode) (siren-folding))) diff --git a/modules/languages/siren-jsonnet.el b/modules/languages/siren-jsonnet.el index 4d4ec27..8e5ce54 100644 --- a/modules/languages/siren-jsonnet.el +++ b/modules/languages/siren-jsonnet.el @@ -22,7 +22,6 @@ (defun siren-jsonnet-mode-setup () "Default tweaks for `jsonnet-mode'." (jsonnet-format-buffer-on-save-mode t) - (company-mode) (subword-mode) (siren-folding)) diff --git a/modules/languages/siren-jsx.el b/modules/languages/siren-jsx.el index 5f2f729..a3127f3 100644 --- a/modules/languages/siren-jsx.el +++ b/modules/languages/siren-jsx.el @@ -17,7 +17,6 @@ :init (defun siren-rjsx-mode-setup () (prettier-js-mode +1) - (company-mode +1) (subword-mode +1) (siren-folding))) diff --git a/modules/languages/siren-php.el b/modules/languages/siren-php.el index ffd7512..b867417 100644 --- a/modules/languages/siren-php.el +++ b/modules/languages/siren-php.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-folding) (require 'siren-prettier-js) (require 'siren-rainbow) @@ -21,7 +20,6 @@ (defun siren-php-mode-setup () (prettier-js-mode) (rainbow-mode +1) - (company-mode +1) (subword-mode +1) (siren-folding))) diff --git a/modules/languages/siren-protobuf.el b/modules/languages/siren-protobuf.el index 25c88cc..6b2cc72 100644 --- a/modules/languages/siren-protobuf.el +++ b/modules/languages/siren-protobuf.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-flycheck) (require 'siren-folding) (require 'siren-prog-mode) @@ -23,7 +22,6 @@ (c-add-style "siren" '((c-basic-offset . 2) (indent-tabs-mode . nil)) t) - (company-mode +1) (subword-mode +1) (siren-folding)) diff --git a/modules/languages/siren-ruby.el b/modules/languages/siren-ruby.el index e859c62..bb31ab6 100644 --- a/modules/languages/siren-ruby.el +++ b/modules/languages/siren-ruby.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-dap) (require 'siren-folding) (require 'siren-lsp) @@ -63,7 +62,6 @@ ruby-use-smie t tab-width 2) - (company-mode +1) (siren-folding) (subword-mode +1)) @@ -126,7 +124,8 @@ :init (defun siren-inf-ruby-mode-setup () - (company-mode -1)) + (if (fboundp 'company-mode) + (company-mode -1))) :config (unbind-key "C-c C-b" inf-ruby-minor-mode-map) diff --git a/modules/languages/siren-rust.el b/modules/languages/siren-rust.el index 064468e..7c3c28c 100644 --- a/modules/languages/siren-rust.el +++ b/modules/languages/siren-rust.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-folding) (require 'siren-lsp) @@ -24,7 +23,6 @@ (defun siren-rust-mode-setup () (setq rust-format-on-save t) - (company-mode +1) (lsp-deferred) (siren-folding) (subword-mode +1))) diff --git a/modules/languages/siren-sql.el b/modules/languages/siren-sql.el index 36ea6af..858c5d5 100644 --- a/modules/languages/siren-sql.el +++ b/modules/languages/siren-sql.el @@ -15,9 +15,7 @@ :init (defun siren-sql-mode-setup () - (setq tab-width 2) - - (company-mode +1))) + (setq tab-width 2))) (use-package lsp-sqls :straight lsp-mode diff --git a/modules/languages/siren-terraform.el b/modules/languages/siren-terraform.el index 4d61987..5f1b16e 100644 --- a/modules/languages/siren-terraform.el +++ b/modules/languages/siren-terraform.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-reformatter) (require 'siren-lsp) diff --git a/modules/languages/siren-typescript.el b/modules/languages/siren-typescript.el index 0e6786c..af30c67 100644 --- a/modules/languages/siren-typescript.el +++ b/modules/languages/siren-typescript.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-flycheck) (require 'siren-folding) (require 'siren-lsp) @@ -30,7 +29,6 @@ indent-level width tab-width width)) - (company-mode +1) (lsp-deferred) (subword-mode +1) (siren-folding))) @@ -59,8 +57,7 @@ (prettier-js-mode +1) (flycheck-mode +1) (eldoc-mode +1) - (tide-hl-identifier-mode +1) - (company-mode +1))) + (tide-hl-identifier-mode +1))) (provide 'siren-typescript) ;;; siren-typescript.el ends here diff --git a/modules/languages/siren-vue.el b/modules/languages/siren-vue.el index 6dc6b93..589e3e8 100644 --- a/modules/languages/siren-vue.el +++ b/modules/languages/siren-vue.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-prettier-js) (require 'siren-mmm) @@ -17,7 +16,6 @@ :init (defun siren-vue-mode-setup () (prettier-js-mode) - (company-mode) (lsp-deferred) (subword-mode) (siren-folding))) diff --git a/modules/languages/siren-web-mode.el b/modules/languages/siren-web-mode.el index 28d0154..4405e0d 100644 --- a/modules/languages/siren-web-mode.el +++ b/modules/languages/siren-web-mode.el @@ -6,7 +6,6 @@ ;;; Code: -(require 'siren-company) (require 'siren-display-fill-column) (require 'siren-folding) @@ -38,7 +37,6 @@ (when (version< emacs-version "27.0") (siren-display-fill-column -1)) - (company-mode +1) (siren-folding) (subword-mode +1) (lsp-deferred)))