about summary refs log tree commit diff
path: root/tools/emacs/config/init.el
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-12-14T15·59+0000
committerVincent Ambo <tazjin@google.com>2019-12-14T15·59+0000
commit7315ca331ea36e616f8c2d63b938421596985e60 (patch)
tree12dd159277b5cbb2ed58359d632efcdefc8adf6b /tools/emacs/config/init.el
parent9df9fafd82a03ba0ae7b0db3edd67df44ef46a59 (diff)
chore(emacs.d): Clean up <tab> bindings r/147
One simple rule to rule them all: In prog-mode, <tab> tries to invoke
company.
Diffstat (limited to 'tools/emacs/config/init.el')
-rw-r--r--tools/emacs/config/init.el11
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/emacs/config/init.el b/tools/emacs/config/init.el
index 174c74443162..d50e4baa2ae4 100644
--- a/tools/emacs/config/init.el
+++ b/tools/emacs/config/init.el
@@ -34,8 +34,6 @@
 
 (use-package company
   :hook ((prog-mode . company-mode))
-  :bind (:map rust-mode-map ("<tab>" . company-indent-or-complete-common)
-         :map lisp-mode-map ("<tab>" . company-indent-or-complete-common))
   :init (setq company-tooltip-align-annotations t))
 
 (use-package dash)
@@ -93,8 +91,7 @@
 (use-package f)
 
 (use-package go-mode
-  :bind (:map go-mode-map ("C-c C-r" . recompile)
-         :map go-mode-map ("<tab>" . company-indent-or-complete-common))
+  :bind (:map go-mode-map ("C-c C-r" . recompile))
   :hook ((go-mode . (lambda ()
                       (setq tab-width 2)
                       (setq-local compile-command
@@ -106,7 +103,8 @@
   :init (add-to-list 'auto-mode-alist '("\\.jq\\'" . jq-mode)))
 
 (use-package kotlin-mode
-  :bind (:map kotlin-mode-map ("<tab>" . indent-relative)))
+  :hook ((kotlin-mode . (lambda ()
+                          (setq indent-line-function #'indent-relative)))))
 
 (use-package lsp-mode)
 
@@ -119,7 +117,8 @@
 (use-package markdown-toc)
 
 (use-package nix-mode
-  :bind (:map nix-mode-map ("<tab>" . nix-indent-line)))
+  :hook ((nix-mode . (lambda ()
+                       (setq indent-line-function #'nix-indent-line)))))
 
 (use-package nginx-mode)
 (use-package rust-mode)