[emacs] Massive rewrite

1 files changed, 40 insertions, 12 deletions

diff --git a/emacs.d/modules/module-ivy.el b/emacs.d/config/fcuny-project.el
index 8259921..c94c40b 100644
--- a/emacs.d/modules/module-ivy.el
+++ b/emacs.d/config/fcuny-project.el
@@ -1,9 +1,9 @@
-(require 'config-package)
-
-(use-package swiper)
+(eval-when-compile
+  (require 'use-package))
 
 (use-package counsel
-  :bind*
+  :ensure t
+  :bind
   (("M-x"     . counsel-M-x)
    ("C-s"     . counsel-grep-or-swiper)
    ("C-x C-f" . counsel-find-file)
@@ -11,17 +11,16 @@
    ("C-c f"   . counsel-git)
    ("C-c s"   . counsel-git-grep)
    ("C-c /"   . counsel-ag))
-
+  :custom
+  (counsel-find-file-at-point t)
   :config
-  (setq counsel-find-file-at-point t))
-
-(use-package counsel-projectile)
+  (use-package swiper :ensure t)
+  (use-package counsel-projectile :ensure t))
 
 (use-package ivy
+  :ensure t
   :diminish (ivy-mode . "")
-
   :bind ("C-c m" . ivy-switch-project)
-
   :config
   (ivy-mode 1)
   (setq ivy-use-virtual-buffers t
@@ -51,6 +50,35 @@
      ("c" projectile-compile-project "Compile project")
      ("r" projectile-remove-known-project "Remove project(s)"))))
 
-(use-package ivy-hydra)
+(use-package projectile
+  :ensure t
+  :diminish projectile-mode
+  :bind-keymap ("C-c p" . projectile-command-map)
+
+  :init
+  (add-hook 'after-init-hook #'projectile-mode)
+
+  :config
+  (setq projectile-switch-project-action 'projectile-dired
+        projectile-enable-caching t
+        projectile-completion-system 'ivy
+        projectile-known-projects-file (expand-file-name "var/projectile-bookmarks.eld" user-emacs-directory)
+        projectile-cache-file (expand-file-name "var/projectile.cache" user-emacs-directory)
+        projectile-globally-ignored-directories (append fcuny-projects-ignored-dirs
+                                                        projectile-globally-ignored-directories)
+        projectile-globally-ignored-files (append 
+                                                  projectile-globally-ignored-files)))
+
+(use-package ag
+  :ensure t
+  :bind (:map ag-mode-map
+              ("p" . compilation-previous-error)
+              ("n" . compilation-next-error)
+              ("N" . compilation-next-file)
+              ("P" . compilation-previous-file))
+  :custom
+  (ag-highlight-search t)
+  (ag-reuse-buffers t)
+  (ag-reuse-window t))
 
-(provide 'module-ivy)
+(provide 'fcuny-project)