From f6ba59fca119f4decbb28818906fd063b3621413 Mon Sep 17 00:00:00 2001 From: benj Date: Fri, 11 Nov 2016 23:21:51 -0800 Subject: added magit and removed js2 in favor of web-mode --- settings/setup-clojure-mode.el | 3 --- settings/setup-web-mode.el | 1 + settings/setup-yaml-mode.el | 7 +++++++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 settings/setup-yaml-mode.el (limited to 'settings') diff --git a/settings/setup-clojure-mode.el b/settings/setup-clojure-mode.el index 2c2e9b3..109b074 100644 --- a/settings/setup-clojure-mode.el +++ b/settings/setup-clojure-mode.el @@ -5,7 +5,4 @@ (add-hook 'clojure-mode-hook 'enable-paredit-mode) (add-hook 'clojure-mode-hook 'prettify-symbols-mode) -;; This should be in it's own setup file -(add-to-list 'auto-mode-alist '("\\.el\\'" . paredit-mode)) - (provide 'setup-clojure-mode) diff --git a/settings/setup-web-mode.el b/settings/setup-web-mode.el index b3893cf..5491d6a 100644 --- a/settings/setup-web-mode.el +++ b/settings/setup-web-mode.el @@ -3,6 +3,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 '("\\.js\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode)) diff --git a/settings/setup-yaml-mode.el b/settings/setup-yaml-mode.el new file mode 100644 index 0000000..f4e8a71 --- /dev/null +++ b/settings/setup-yaml-mode.el @@ -0,0 +1,7 @@ +(require 'yaml-mode) + +(add-hook 'yaml-mode-hook + (lambda () + (define-key yaml-mode-map "\C-m" 'newline-and-indent))) + +(provide 'setup-yaml-mode) -- cgit v1.2.3 From f6c366f20c756c6f069e5c60bc9003189d31edbe Mon Sep 17 00:00:00 2001 From: benj Date: Sun, 13 Nov 2016 13:28:38 -0800 Subject: custom org mode and some ido clean up --- settings/setup-ido.el | 1 - settings/setup-org-mode.el | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 settings/setup-org-mode.el (limited to 'settings') diff --git a/settings/setup-ido.el b/settings/setup-ido.el index 6805260..f10e9fc 100644 --- a/settings/setup-ido.el +++ b/settings/setup-ido.el @@ -20,7 +20,6 @@ (defun my/ido-go-straight-home () (interactive) (cond - ((looking-back "~/") (insert "projects/")) ((looking-back "/") (insert "~/")) (:else (call-interactively 'self-insert-command)))) diff --git a/settings/setup-org-mode.el b/settings/setup-org-mode.el new file mode 100644 index 0000000..fe6f944 --- /dev/null +++ b/settings/setup-org-mode.el @@ -0,0 +1,16 @@ +;; Pretty bullets +(add-hook 'org-mode-hook (lambda() (org-bullets-mode 1))) + +(setq org-ellipsis "⤳") +(setq org-log-done 'time) +(setq org-src-fontify-natively t) +(setq org-src-tab-acts-natively t) + +(global-set-key (kbd "C-c a") 'org-agenda) + +(org-babel-do-load-languages + 'org-babel-load-languages + '((emacs-lisp . t) + (python . t))) + +(provide 'setup-org-mode) -- cgit v1.2.3 From 53853e36fa71b0c2d79d3593ebddd70b9be3b26b Mon Sep 17 00:00:00 2001 From: benj Date: Thu, 19 Jan 2017 21:34:25 -0800 Subject: added a bunch of stuff including purescript support --- settings/sane-defaults.el | 13 +++++++++++-- settings/setup-haskell-mode.el | 2 ++ settings/setup-multiple-cursors.el | 4 ++-- settings/setup-purescript-mode.el | 3 +++ settings/setup-web-mode.el | 2 +- settings/setup-yasnippet.el | 6 ++++++ 6 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 settings/setup-purescript-mode.el (limited to 'settings') 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 ") 'mc/edit-lines) -(global-set-key (kbd "C-c ") 'mc/mark-all-like-this) +(global-set-key (kbd "C-c ") 'mc/edit-lines) +(global-set-key (kbd "C-c ") 'mc/mark-all-like-this) (global-set-key (kbd "C-c ") 'mc/mark-next-like-this) (global-set-key (kbd "C-c ") '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 "") 'yas-exit-all-snippets) +(add-hook 'term-mode-hook (lambda() + (setq yas-dont-activate t))) + (provide 'setup-yasnippet) -- cgit v1.2.3