 
 (use-package yasnippet
   :diminish yas-minor-mode
-  :config
-  (progn
-    (global-set-key (kbd "M-/") 'company-yasnippet)
+  :bind ("M-/" . company-yasnippet)
+  :config
+  (progn
     (defun my-disable-yas-in-term ()
       (yas-minor-mode -1))
     (add-to-list 'yas-snippet-dirs "~/.emacs.d/snippets/")

  (setq projectile-completion-system 'ivy)
  :config
  (ivy-mode 1)
  ;; ido-style keybindings
  (define-key ivy-minibuffer-map (kbd "C-j") #'ivy-immediate-done)
  (define-key ivy-minibuffer-map (kbd "RET") #'ivy-alt-done)

  (use-package flx)
  (use-package ivy-hydra)

(use-package ivy
  :demand
  :diminish ""
  ;; ido-style keybindings
  :bind (:map ivy-minibuffer-map
              ("C-j" . ivy-immediate-done)
              ("RET" . ivy-alt-done))
  :init
  (setq ivy-use-virtual-buffers t)
  (setq ivy-count-format "")
