diff options
Diffstat (limited to '')
| -rw-r--r-- | init.el | 11 | ||||
| -rw-r--r-- | settings/sane-defaults.el | 13 | ||||
| -rw-r--r-- | settings/setup-haskell-mode.el | 2 | ||||
| -rw-r--r-- | settings/setup-multiple-cursors.el | 4 | ||||
| -rw-r--r-- | settings/setup-purescript-mode.el | 3 | ||||
| -rw-r--r-- | settings/setup-web-mode.el | 2 | ||||
| -rw-r--r-- | settings/setup-yasnippet.el | 6 |
7 files changed, 36 insertions, 5 deletions
@@ -1,4 +1,11 @@ ;; Suppress splash screen + +;; Added by Package.el. This must come before configurations of +;; installed packages. Don't delete this line. If you don't want it, +;; just comment it out by adding a semicolon to the start of the line. +;; You may delete these explanatory comments. +(package-initialize) + (setq inhibit-startup-message t) (setq settings-dir @@ -25,6 +32,7 @@ clojure-mode-extra-font-locking clojure-snippets dash + elm-mode ember-mode ensime flycheck @@ -38,6 +46,8 @@ markdown-mode multiple-cursors paredit + play-routes-mode + purescript-mode org-bullets sbt-mode scala-mode @@ -70,6 +80,7 @@ (require 'setup-markdown-mode) (require 'setup-multiple-cursors) (require 'setup-org-mode) +(require 'setup-purescript-mode) (require 'setup-scala-mode) (require 'setup-web-mode) (require 'setup-yaml-mode) diff --git a/settings/sane-defaults.el b/settings/sane-defaults.el index 9fc5532..c561381 100644 --- a/settings/sane-defaults.el +++ b/settings/sane-defaults.el @@ -61,8 +61,8 @@ (setq enable-recursive-minibuffers t) ;; More memory than even Magnars...cause the future keeps happening -;; 50 MB should be good -(setq gc-cons-threshold 50000000) +;; 100 MB should be good +(setq gc-cons-threshold 100000000) ;; warn when opening files bigger than 100MB (setq large-file-warning-threshold 100000000) @@ -89,4 +89,13 @@ (add-to-list 'find-file-not-found-functions 'my-create-non-existent-directory) +(add-hook 'before-save-hook 'delete-trailing-whitespace) +(set-default-coding-systems 'utf-8) +(set-terminal-coding-system 'utf-8) +(set-keyboard-coding-system 'utf-8) +(setq default-buffer-file-coding-system 'utf-8) +(setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT TEXT STRING)) + +(prefer-coding-system 'utf-8) + (provide 'sane-defaults) diff --git a/settings/setup-haskell-mode.el b/settings/setup-haskell-mode.el index 435387a..ea3f1f9 100644 --- a/settings/setup-haskell-mode.el +++ b/settings/setup-haskell-mode.el @@ -1,4 +1,6 @@ (require 'haskell-mode) (require 'flycheck-haskell) +(setq inferior-haskell-find-project-root nil) + (provide 'setup-haskell-mode) diff --git a/settings/setup-multiple-cursors.el b/settings/setup-multiple-cursors.el index 16852f6..4dfcdc4 100644 --- a/settings/setup-multiple-cursors.el +++ b/settings/setup-multiple-cursors.el @@ -1,5 +1,5 @@ -(global-set-key (kbd "C-c <up>") 'mc/edit-lines) -(global-set-key (kbd "C-c <down>") 'mc/mark-all-like-this) +(global-set-key (kbd "C-c <C-up>") 'mc/edit-lines) +(global-set-key (kbd "C-c <C-down>") 'mc/mark-all-like-this) (global-set-key (kbd "C-c <C-right>") 'mc/mark-next-like-this) (global-set-key (kbd "C-c <C-left>") 'mc/mark-previous-like-this) (global-set-key (kbd "M-s m") 'mc/mark-all-in-eval) diff --git a/settings/setup-purescript-mode.el b/settings/setup-purescript-mode.el new file mode 100644 index 0000000..cba4ed7 --- /dev/null +++ b/settings/setup-purescript-mode.el @@ -0,0 +1,3 @@ +(require 'purescript-mode) +;; '(purescript-mode-hook (quote (turn-on-purescript-indent))) +(provide 'setup-purescript-mode) diff --git a/settings/setup-web-mode.el b/settings/setup-web-mode.el index 5491d6a..92cfec2 100644 --- a/settings/setup-web-mode.el +++ b/settings/setup-web-mode.el @@ -2,7 +2,7 @@ (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)) -(add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.tpl\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.js\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode)) diff --git a/settings/setup-yasnippet.el b/settings/setup-yasnippet.el index fd27543..4145574 100644 --- a/settings/setup-yasnippet.el +++ b/settings/setup-yasnippet.el @@ -3,7 +3,13 @@ (setq yas-snippet-dirs '("~/.emacs.d/snippets")) (yas-global-mode 1) +(define-key yas-minor-mode-map [(tab)] nil) +(define-key yas-minor-mode-map (kbd "TAB") nil) + ;; Jump to end of snippet definition (define-key yas-keymap (kbd "<return>") 'yas-exit-all-snippets) +(add-hook 'term-mode-hook (lambda() + (setq yas-dont-activate t))) + (provide 'setup-yasnippet) |