 ;; (add-hook 'c-mode-hook 'electric-pair-local-mode)
 ;; (add-hook 'c++-mode-hook 'electric-pair-local-mode)
 
-(require 'helm-xref)
-(setq xref-show-xrefs-function 'helm-xref-show-xrefs)
+(require 'ivy-xref)
+(setq xref-show-xrefs-function 'ivy-xref-show-xrefs)
 
 (require 'smartparens-config)
 


(bind-keys :map c-mode-base-map
           ("<C-tab>" . company-complete)
           ("C-." . helm-imenu)
           ("M-o" . my-find-other-file)
           ("M-." . dumb-jump-go)
           ("M-," . pop-tag-mark))      ;; dumb-jump-back

(require 'dired)
(require 'dired-collapse)
(require 'dired-subtree)
(require 'ivy-dired-history)
(add-to-list 'savehist-additional-variables 'ivy-dired-history-variable)

(when *osx* (setq dired-use-ls-dired nil))

