equal
deleted
inserted
replaced
113 ;;;; Requires and Packages ;;;; |
113 ;;;; Requires and Packages ;;;; |
114 |
114 |
115 ;;; packages |
115 ;;; packages |
116 (require 'package-require) |
116 (require 'package-require) |
117 (package-require '(company exec-path-from-shell expand-region |
117 (package-require '(company exec-path-from-shell expand-region |
118 hgignore-mode markdown-mode move-text paredit powerline |
118 hgignore-mode ido-at-point markdown-mode move-text paredit |
119 rainbow-delimiters rainbow-mode solarized-theme visual-regexp |
119 powerline rainbow-delimiters rainbow-mode solarized-theme |
120 yasnippet zencoding-mode)) |
120 visual-regexp yasnippet zencoding-mode)) |
121 |
121 |
122 ;; powerline |
122 ;; powerline |
123 (require 'powerline) |
123 (require 'powerline) |
124 (powerline-default-theme) |
124 (powerline-default-theme) |
125 |
125 |
132 ;;; custom requires |
132 ;;; custom requires |
133 (require 'haskell-init) |
133 (require 'haskell-init) |
134 (require 'javascript-init) |
134 (require 'javascript-init) |
135 (require 'c-init) ; c specific elisp |
135 (require 'c-init) ; c specific elisp |
136 |
136 |
|
137 ;;; completion |
|
138 (ido-at-point-mode) |
|
139 (global-set-key (kbd "M-/") 'completion-at-point) |
|
140 |
137 ;;; company mode |
141 ;;; company mode |
138 (add-hook 'after-init-hook 'global-company-mode) |
142 (add-hook 'after-init-hook 'global-company-mode) |
139 (global-set-key (kbd "M-/") 'company-complete) |
143 ;; (global-set-key (kbd "M-/") 'company-complete) |
140 (custom-set-variables |
144 (custom-set-variables |
141 '(company-idle-delay nil) |
145 '(company-idle-delay nil) |
142 '(company-minimum-prefix-length 2) |
146 '(company-minimum-prefix-length 2) |
143 '(company-selection-wrap-around t) |
147 '(company-selection-wrap-around t) |
144 '(company-show-numbers t) |
148 '(company-show-numbers t) |