diff --git a/appearance.el b/appearance.el index d9276b3..1195810 100644 --- a/appearance.el +++ b/appearance.el @@ -45,6 +45,10 @@ ;; use a eval-after-load hook to set it to "dynamic". (eval-after-load "linum+" '(progn (setq linum-format 'dynamic))) +;; Display up to 20 results in when using grizzl completion. +(when (require 'grizzl nil 'noerror) + (setq *grizzl-read-max-results* 20)) + ;; meaningful names for buffers with the same name (require 'uniquify) (setq uniquify-buffer-name-style 'post-forward-angle-brackets) diff --git a/behavior.el b/behavior.el index d1e8d5c..cad2d15 100644 --- a/behavior.el +++ b/behavior.el @@ -19,10 +19,19 @@ (when (require 'autopair nil 'noerror) (autopair-global-mode)) +;; Enable Projectile global mode. +(when (require 'projectile nil 'noerror) + (projectile-global-mode)) + ;; Popwin (when (require 'popwin nil 'noerror) (setq display-buffer-function 'popwin:display-buffer)) +;; Recentf +(require 'recentf) +(recentf-mode 1) +(setq recentf-max-menu-items 50) + ;; When using autopair, ECB and delete-selection-mode there's a weird conflict ;; which disables delete-selection-mode whenever you click on a directory or ;; file in ECB's tree buffer. For that reason, and for it's neat rectangle diff --git a/custom-variables.el b/custom-variables.el index c9156dc..4e03745 100644 --- a/custom-variables.el +++ b/custom-variables.el @@ -101,6 +101,12 @@ " "~/.org-files/notes.org" "Notes")))) '(org-reverse-note-order t) '(php-mode-dot-property-warning t) + '(projectile-completion-system (quote grizzl)) + '(projectile-enable-caching nil) + '(projectile-globally-ignored-directories + (quote + (".idea" ".eunit" ".git" ".hg" ".fslckout" ".bzr" ".svn" "_darcs" "vendor/bundle" "vendor/ruby" "coverage" "docs" "doc" "log" "logs" "tmp"))) + '(projectile-globally-ignored-files (quote ("TAGS" "*.log"))) '(ruby-use-encoding-map nil) '(safe-local-variable-values (quote ((eval rainbow-mode 1)))) '(scss-compile-at-save nil) diff --git a/keybindings.el b/keybindings.el index 5bc975b..f72d035 100644 --- a/keybindings.el +++ b/keybindings.el @@ -111,18 +111,20 @@ (define-key global-map (kbd "C-x C-j") 'ace-jump-mode-pop-mark) ) +;; projectile related keybindings +(when (require 'projectile nil 'noerror) + (global-set-key (kbd "C-x C-t") 'projectile-find-file) + (global-set-key (kbd "C-x t") 'projectile-find-test-file) + (global-set-key (kbd "C-x C-v") 'projectile-switch-to-buffer)) + ;; eproject related keybindings (when (require 'eproject nil 'noerror) (global-set-key (kbd "C-c C-b") 'eproject-ibuffer) (global-set-key (kbd "C-x p b") 'eproject-ibuffer) - (global-set-key (kbd "C-x p t") 'eproject-todo) - (global-set-key (kbd "C-x p f") 'eproject-find-file) - (global-set-key (kbd "C-x p k") 'eproject-kill-project-buffers) - (global-set-key (kbd "C-x p o") 'eproject-open-all-project-files)) + (global-set-key (kbd "C-x p t") 'eproject-todo)) ;; Textmate-mode related keybindings (when (require 'textmate nil 'noerror) - (global-set-key (kbd "C-x C-t") 'textmate-goto-file) (global-set-key (kbd "C-c C-t") 'textmate-goto-symbol) (global-set-key (kbd "M-p") 'textmate-column-up) (global-set-key (kbd "M-n") 'textmate-column-down) diff --git a/mode-customizations/ruby-mode.el b/mode-customizations/ruby-mode.el index e5e237e..29c3aaf 100644 --- a/mode-customizations/ruby-mode.el +++ b/mode-customizations/ruby-mode.el @@ -33,12 +33,12 @@ (add-to-list 'ac-sources 'ac-source-rsense-constant) (define-key ruby-mode-map (kbd "C-c C-.") 'ac-complete-rsense)) + (when (require 'projectile nil 'noerror) + (define-key ruby-mode-map (kbd "C-x t") 'projectile-find-test-file)) + (when (require 'eproject nil 'noerror) (define-key ruby-mode-map (kbd "C-c C-b") 'eproject-ibuffer)) - (when (require 'textmate nil 'noerror) - (define-key ruby-mode-map (kbd "C-x C-t") 'textmate-goto-file)) - (linum-mode t) (fci-mode) (flyspell-prog-mode) diff --git a/packages.el b/packages.el index 2fc80df..62bcc1e 100644 --- a/packages.el +++ b/packages.el @@ -48,6 +48,7 @@ flymake-shell full-ack gitconfig-mode + grizzl haml-mode highlight-indentation inf-ruby @@ -57,6 +58,7 @@ markdown-mode minimap php-mode + projectile puppet-mode rainbow-mode restclient