Browse Source

Resync

master
Taylor Bockman 9 years ago
parent
commit
a8f5431bb8
  1. 11
      dotfiles/emacs.d/init.el
  2. 2
      dotfiles/emacs.d/package.el

11
dotfiles/emacs.d/init.el

@ -323,12 +323,19 @@
(ivy-mode 1) (ivy-mode 1)
(setq projectile-completion-system 'ivy) ;(setq projectile-completion-system 'ivy)
(setq magit-complete-read-function 'ivy-completing-read) (setq magit-complete-read-function 'ivy-completing-read)
(setq ivy-use-virtual-buffers t) (setq ivy-use-virtual-buffers t)
;;------------------------------------------------------------------------------------- ;;-------------------------------------------------------------------------------------
;; Use Grizzl with Projectile
;;-------------------------------------------------------------------------------------
(setq projectile-completion-system 'grizzl)
;;-------------------------------------------------------------------------------------
;; Enable Autocomplete ;; Enable Autocomplete
;; ;;
;; NOTE: You can replace the 't' in (setq ac-auto-start t) with a positive integer ;; NOTE: You can replace the 't' in (setq ac-auto-start t) with a positive integer
@ -468,7 +475,7 @@
(global-set-key (kbd "RET") nil) (global-set-key (kbd "RET") nil)
;; Unbind C-c p f from projectile ;; Unbind C-c p f from projectile
(global-set-key (kbd "C-c p f") nil) ;(global-set-key (kbd "C-c p f") nil)
;; Unbind C-s from Isearch to make room for swiper ;; Unbind C-s from Isearch to make room for swiper
(global-set-key (kbd "C-s") nil) (global-set-key (kbd "C-s") nil)

2
dotfiles/emacs.d/package.el

@ -1,7 +1,7 @@
(require 'cl) (require 'cl)
(defvar my-packages '(ag auto-complete clojure-mode coffee-mode css-mode circe expand-region framemove flycheck (defvar my-packages '(ag auto-complete clojure-mode coffee-mode css-mode circe expand-region framemove flycheck
esh-help enh-ruby-mode ess flymake-ruby ruby-block robe inf-ruby ac-inf-ruby rspec-mode grizzl esh-help enh-ruby-mode flymake-ruby ruby-block robe inf-ruby ac-inf-ruby rspec-mode
fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust slim-mode feature-mode fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust slim-mode feature-mode
flycheck-pos-tip gitignore-mode golden-ratio haskell-mode swiper sass-mode linum-relative flycheck-pos-tip gitignore-mode golden-ratio haskell-mode swiper sass-mode linum-relative
js2-mode less-css-mode magit neotree paredit scala-mode2 scss-mode smex powerline toml-mode js2-mode less-css-mode magit neotree paredit scala-mode2 scss-mode smex powerline toml-mode

Loading…
Cancel
Save