equal
deleted
inserted
replaced
64 ;;; ido-mode |
64 ;;; ido-mode |
65 (ido-mode t) ; file/buffer selector |
65 (ido-mode t) ; file/buffer selector |
66 (setq-default |
66 (setq-default |
67 ido-enable-flex-matching t ; fuzzy matching for ido mode |
67 ido-enable-flex-matching t ; fuzzy matching for ido mode |
68 ido-create-new-buffer 'always ; create new buffer without prompt |
68 ido-create-new-buffer 'always ; create new buffer without prompt |
69 ido-everywhere t) ; use ido where possible |
69 ido-everywhere t ; use ido where possible |
|
70 ido-max-window-height 1) ; max ido window height |
70 |
71 |
71 ;;; whitespace-mode |
72 ;;; whitespace-mode |
72 (global-whitespace-mode t) ; show whitespace |
73 (global-whitespace-mode t) ; show whitespace |
73 (add-hook 'before-save-hook 'whitespace-cleanup) ; cleanup whitespace on exit |
74 (add-hook 'before-save-hook 'whitespace-cleanup) ; cleanup whitespace on exit |
74 (setq-default |
75 (setq-default |
111 |
112 |
112 ;;;; Requires and Packages ;;;; |
113 ;;;; Requires and Packages ;;;; |
113 |
114 |
114 ;;; packages |
115 ;;; packages |
115 (require 'package-require) |
116 (require 'package-require) |
116 (package-require '(exec-path-from-shell expand-region |
117 (package-require '(company exec-path-from-shell expand-region |
117 rainbow-delimiters rainbow-mode solarized-theme visual-regexp |
118 hgignore-mode markdown-mode move-text paredit powerline |
118 yasnippet zencoding-mode markdown-mode move-text powerline)) |
119 rainbow-delimiters rainbow-mode solarized-theme visual-regexp |
|
120 yasnippet zencoding-mode)) |
119 |
121 |
120 ;; powerline |
122 ;; powerline |
121 (require 'powerline) |
123 (require 'powerline) |
122 (powerline-default-theme) |
124 (powerline-default-theme) |
123 |
125 |
130 ;;; custom requires |
132 ;;; custom requires |
131 (require 'haskell-init) |
133 (require 'haskell-init) |
132 (require 'javascript-init) |
134 (require 'javascript-init) |
133 (require 'c-init) ; c specific elisp |
135 (require 'c-init) ; c specific elisp |
134 |
136 |
135 ;; ;;; company mode |
137 ;;; company mode |
136 ;; (add-hook 'after-init-hook 'global-company-mode) |
138 (add-hook 'after-init-hook 'global-company-mode) |
137 ;; (global-set-key (kbd "M-/") 'company-complete) |
139 (global-set-key (kbd "M-/") 'company-complete) |
|
140 (custom-set-variables |
|
141 '(company-idle-delay nil) |
|
142 '(company-minimum-prefix-length 2) |
|
143 '(company-selection-wrap-around t) |
|
144 '(company-show-numbers t) |
|
145 '(company-tooltip-align-annotations t)) |
138 |
146 |
139 ;;; uniquify |
147 ;;; uniquify |
140 (require 'uniquify) ; unique buffer names with dirs |
148 (require 'uniquify) ; unique buffer names with dirs |
141 (setq |
149 (setq |
142 uniquify-buffer-name-style 'post-forward |
150 uniquify-buffer-name-style 'post-forward |
155 (yas-global-mode t) |
163 (yas-global-mode t) |
156 |
164 |
157 |
165 |
158 ;;; markdown-mode |
166 ;;; markdown-mode |
159 (add-hook 'markdown-mode-hook 'flyspell-mode) |
167 (add-hook 'markdown-mode-hook 'flyspell-mode) |
|
168 (setq-default |
|
169 markdown-command "pandoc -f markdown_github") |
160 |
170 |
161 |
171 |
162 ;;; html-mode |
172 ;;; html-mode |
163 (add-to-list 'auto-mode-alist '("\\.tpl\\'" . html-mode)) |
173 (add-to-list 'auto-mode-alist '("\\.tpl\\'" . html-mode)) |
164 (add-hook |
174 (add-hook |