summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.el10
-rw-r--r--lisp/general.el11
2 files changed, 15 insertions, 6 deletions
diff --git a/init.el b/init.el
index aaddf6b..8efd5c1 100644
--- a/init.el
+++ b/init.el
@@ -14,7 +14,7 @@
(setq package-list
- '(ido-vertical-mode smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org))
+ '(counsel smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org))
;; Fetch the list of packages available
(unless package-archive-contents
@@ -60,6 +60,12 @@
'(org-agenda-files (list org-directory))
'(org-directory "~/Documents/org")
'(package-selected-packages
- '(ido-vertical-mode ## smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org)))
+ '(counsel ## smartparens xref-js2 eglot json-mode markdown-mode emojify tern rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org)))
;;; init.el ends here
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
diff --git a/lisp/general.el b/lisp/general.el
index 9af73d0..d22e813 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -51,10 +51,13 @@
(define-key projectile-mode-map [?\s-p] 'projectile-find-file)
;; Ido mode text matching
-(ido-mode t)
-(setq ido-enable-flex-matching t)
-(require 'ido-vertical-mode)
-(ido-vertical-mode)
+(require 'ivy)
+(ivy-mode 1)
+(global-set-key (kbd "C-x C-f") 'counsel-find-file)
+;(ido-mode t)
+;(setq ido-enable-flex-matching t)
+;(require 'ido-vertical-mode)
+;(ido-vertical-mode)
;; Tree
(require 'neotree)