company-mode everywhere

1 files changed, 3 insertions, 5 deletions

diff --git a/emacs.org b/emacs.org
index d4d8944..7b19f03 100644
--- a/emacs.org
+++ b/emacs.org
@@ -384,6 +384,8 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
     of language-servers, as I've had bad experiences with them when I was still using vim
     #+begin_src emacs-lisp :tangle emacsconfig/extras.el
       (use-package company
+        :hook
+        (prog-mode . company-mode)
         :bind
         ("C-SPC" . company-complete))
     #+end_src
@@ -420,8 +422,6 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
       #+begin_src emacs-lisp :tangle emacsconfig/nix.el
         (use-package nix-mode
           :mode "\\.nix\\'"
-          :hook
-          (nix-mode . company-mode)
           :config
           ;; the company-nix backend is not available in melpa, but has no new dependencies
           (unless (package-installed-p 'company-nix)
@@ -430,8 +430,7 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
               (eval-buffer)))
           (add-hook 'nix-mode-hook (lambda ()
                                      (set (make-local-variable 'company-backends)
-                                          '((company-nix)))))
-          (add-hook 'nix-mode-hook 'company-mode))
+                                          '((company-nix))))))
       #+end_src
 ***** Nix package management
       I use nix-sandbox for managing nix package for other languages.
@@ -502,7 +501,6 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
          :after nix-sandbox
          :hook
          (haskell-mode . set-haskell-company-backends)
-         (haskell-mode . company-mode)
          (haskell-mode . haskell-indentation-mode)
          :config
          (setq haskell-env (nix-env-from-packages "Haskell"