                             (flycheck-mode)))
 
 (require 'dumb-jump)
-(setq dumb-jump-selector 'ivy
+(setq dumb-jump-selector 'helm
       dumb-jump-prefer-searcher 'rg)    ;; because https://github.com/jacktasia/dumb-jump/issues/129
 
 (add-to-list 'dumb-jump-language-file-exts '(:language "c++" :ext "mm" :agtype "cpp" :rgtype "cpp"))

  (semantic-mode 1)
  (bind-keys :map prog-mode-map
             ("<C-tab>" . company-complete)
             ("C-." . counsel-semantic-or-imenu)))

(add-hook 'text-mode-hook 'auto-fill-mode)
(add-hook 'text-mode-hook 'my-non-special-modes-setup)


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