about summary refs log tree commit diff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/tazjin/emacs/config/bindings.el3
-rw-r--r--users/tazjin/emacs/config/custom.el2
-rw-r--r--users/tazjin/emacs/config/init.el14
-rw-r--r--users/tazjin/emacs/config/modes.el3
-rw-r--r--users/tazjin/emacs/default.nix1
5 files changed, 3 insertions, 20 deletions
diff --git a/users/tazjin/emacs/config/bindings.el b/users/tazjin/emacs/config/bindings.el
index 17740b1950a7..d8b63e33e402 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 <tab> do? Well, it depends ...
-(define-key prog-mode-map (kbd "<tab>") #'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 91eaf69ae59b..3e9a9dcd0679 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 7233ec9c6d6b..9d78af8964a4 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 7a51e674772b..1936365e5bdb 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 12f5ac21f93f..8e175cad37ce 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