1
0
Fork 0

[oni-projectile] Remove dependency on ivy

This commit is contained in:
Tom Willemse 2022-03-01 23:59:22 -08:00
parent a8f4ffec6a
commit a0f9cbf695

View file

@ -4,8 +4,8 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2021.1123.003113 ;; Version: 2022.0301.235907
;; Package-Requires: (projectile ivy oni-data-dir) ;; Package-Requires: (projectile oni-data-dir)
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by ;; it under the terms of the GNU General Public License as published by
@ -26,7 +26,6 @@
;;; Code: ;;; Code:
(require 'ivy)
(require 'oni-data-dir) (require 'oni-data-dir)
(require 'projectile) (require 'projectile)
@ -37,17 +36,13 @@
(setq projectile-cache-file (oni-data-dir-locate "projectile.cache")) (setq projectile-cache-file (oni-data-dir-locate "projectile.cache"))
(setq projectile-completion-system 'ivy) (setq projectile-completion-system 'auto)
(add-to-list 'projectile-project-root-files "yarn.lock") (add-to-list 'projectile-project-root-files "yarn.lock")
(add-to-list 'projectile-project-root-files "fabfile.py") (add-to-list 'projectile-project-root-files "fabfile.py")
(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map) (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
(ivy-add-actions
'projectile-switch-project
'(("g" magit-status "git status")))
(when (eq system-type 'windows-nt) (when (eq system-type 'windows-nt)
(setq projectile-enable-caching nil) (setq projectile-enable-caching nil)
(setq projectile-generic-command "\"C:\\msys64\\usr\\bin\\find.exe\" . -type d \"(\" -path \"*/node_modules\" -o -path \"*/upload-test\" -o -path \"*/dlls\" -o -path \"*/apps/*/img\" -o -path \"*/apps/*/video\" -o -path \"*/apps/*/font\" -o -path \"*/apps/*/content\" -o -path \"*/apps/*/favicons\" -o -path \"*/apps/*/pages.*\" -o -path \"*/.intl\" \")\" -prune -o -type f -print0") (setq projectile-generic-command "\"C:\\msys64\\usr\\bin\\find.exe\" . -type d \"(\" -path \"*/node_modules\" -o -path \"*/upload-test\" -o -path \"*/dlls\" -o -path \"*/apps/*/img\" -o -path \"*/apps/*/video\" -o -path \"*/apps/*/font\" -o -path \"*/apps/*/content\" -o -path \"*/apps/*/favicons\" -o -path \"*/apps/*/pages.*\" -o -path \"*/.intl\" \")\" -prune -o -type f -print0")