From 3f60140402cc8ede665bea5f0f733c54e44a9d47 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 30 Nov 2023 21:20:14 +0300 Subject: chore(tazjin/emacs): remove company-mode I have a suspicion that some strange behaviour I occasionally get is related to company mode. Change-Id: I26f25c31967ae092d15248a806acdf4f28cb4c10 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10176 Reviewed-by: tazjin Autosubmit: tazjin Tested-by: BuildkiteCI --- users/tazjin/emacs/config/bindings.el | 3 --- users/tazjin/emacs/config/custom.el | 2 -- users/tazjin/emacs/config/init.el | 14 +++----------- users/tazjin/emacs/config/modes.el | 3 --- users/tazjin/emacs/default.nix | 1 - 5 files changed, 3 insertions(+), 20 deletions(-) diff --git a/users/tazjin/emacs/config/bindings.el b/users/tazjin/emacs/config/bindings.el index 17740b1950..d8b63e33e4 100644 --- a/users/tazjin/emacs/config/bindings.el +++ b/users/tazjin/emacs/config/bindings.el @@ -6,9 +6,6 @@ (define-key global-map (kbd "C--") 'decrease-default-text-scale) (define-key global-map (kbd "C-x C-0") 'set-default-text-scale) -;; What does do? Well, it depends ... -(define-key prog-mode-map (kbd "") #'company-indent-or-complete-common) - ;; imenu instead of insert-file (global-set-key (kbd "C-x i") 'imenu) diff --git a/users/tazjin/emacs/config/custom.el b/users/tazjin/emacs/config/custom.el index 91eaf69ae5..3e9a9dcd06 100644 --- a/users/tazjin/emacs/config/custom.el +++ b/users/tazjin/emacs/config/custom.el @@ -7,8 +7,6 @@ '(ac-delay 0.2) '(avy-background t) '(cargo-process--enable-rust-backtrace 1) - '(company-auto-complete (quote (quote company-explicit-action-p))) - '(company-idle-delay 0.5) '(custom-safe-themes (quote ("d61fc0e6409f0c2a22e97162d7d151dee9e192a90fa623f8d6a071dbf49229c6" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "89336ca71dae5068c165d932418a368a394848c3b8881b2f96807405d8c6b5b6" default))) diff --git a/users/tazjin/emacs/config/init.el b/users/tazjin/emacs/config/init.el index 7233ec9c6d..9d78af8964 100644 --- a/users/tazjin/emacs/config/init.el +++ b/users/tazjin/emacs/config/init.el @@ -29,10 +29,6 @@ (use-package browse-kill-ring) -(use-package company - :hook ((prog-mode . company-mode)) - :config (setq company-tooltip-align-annotations t)) - (use-package consult :bind ("C-c r g" . consult-ripgrep) @@ -141,9 +137,7 @@ (use-package ielm :hook ((inferior-emacs-lisp-mode . (lambda () - (paredit-mode) - (rainbow-delimiters-mode-enable) - (company-mode))))) + (rainbow-delimiters-mode-enable))))) (use-package jq-mode :config (add-to-list 'auto-mode-alist '("\\.jq\\'" . jq-mode))) @@ -170,8 +164,7 @@ (use-package sly :hook ((sly-mrepl-mode . (lambda () (paredit-mode) - (rainbow-delimiters-mode-enable) - (company-mode)))) + (rainbow-delimiters-mode-enable)))) :config (setq common-lisp-hyperspec-root "file:///home/tazjin/docs/lisp/")) @@ -183,8 +176,7 @@ :config (telega-mode-line-mode 1) :custom (telega-emoji-use-images nil) - (telega-completing-read-function #'completing-read) - :hook (telega-chat-mode . company-mode)) + (telega-completing-read-function #'completing-read)) (use-package terraform-mode) (use-package toml-ts-mode) diff --git a/users/tazjin/emacs/config/modes.el b/users/tazjin/emacs/config/modes.el index 7a51e67477..1936365e5b 100644 --- a/users/tazjin/emacs/config/modes.el +++ b/users/tazjin/emacs/config/modes.el @@ -14,9 +14,6 @@ ;; Enable rainbow-delimiters for all things programming (add-hook 'prog-mode-hook 'rainbow-delimiters-mode) -;; Enable Paredit & Company in Emacs Lisp mode -(add-hook 'emacs-lisp-mode-hook 'company-mode) - ;; Always highlight matching brackets (show-paren-mode 1) diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix index 12f5ac21f9..8e175cad37 100644 --- a/users/tazjin/emacs/default.nix +++ b/users/tazjin/emacs/default.nix @@ -51,7 +51,6 @@ pkgs.makeOverridable browse-kill-ring cargo clojure-mode - company consult deft direnv -- cgit 1.4.1