summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
authorAlan Pearce2019-06-17 23:05:31 +0200
committerAlan Pearce2019-06-17 23:05:31 +0200
commitcb27a8e9e1e51b83d31c2a543a50da5dadb6e770 (patch)
tree3ae6a6f080fa0650d197e4966ee11b4b25f05341 /emacs
parent7bad4cc1c3af84c31446872d6d30d1870f0f292f (diff)
downloadnixfiles-cb27a8e9e1e51b83d31c2a543a50da5dadb6e770.tar.lz
nixfiles-cb27a8e9e1e51b83d31c2a543a50da5dadb6e770.tar.zst
nixfiles-cb27a8e9e1e51b83d31c2a543a50da5dadb6e770.zip
Emacs: use company-tng
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/main.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 16f29f60..7f064633 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -174,7 +174,6 @@ With two prefix arguments, write out the day and month name."
 (use-package evil
   :demand t
   :commands (evil-mode evil-delete-buffer evil-ex-define-cmd)
-  :after (undo-tree)
   :init (progn
 	  (defvar evil-want-integration)
 	  (defvar evil-want-keybinding)
@@ -190,10 +189,11 @@ With two prefix arguments, write out the day and month name."
 	   ";" #'evil-ex))
 
 (use-package evil-collection
-  :after evil
+  :after (evil)
+  :demand t
   :commands (evil-collection-init)
-  :custom ((evil-collection-company-use-tng nil))
-  :config (evil-collection-init))
+  :config (progn
+	    (evil-collection-init)))
 
 (general-create-definer my-leader-def
   :keymaps 'override
@@ -294,12 +294,12 @@ With two prefix arguments, write out the day and month name."
 (use-package company
   :commands (company-explicit-action-p)
   :custom ((global-company-mode +1)
-           (company-idle-delay .2)
+           (company-idle-delay .5)
            (company-begin-commands '(self-insert-command))
            (company-auto-complete #'company-explicit-action-p)
            (company-auto-complete-chars '(?\ ?\( ?\) ?.)))
   :general (:states 'insert
-                    "TAB" #'company-complete))
+		    "TAB" #'company-complete))
 
 (use-package all-the-icons)
 (use-package company-box