diff options
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | init-custom.el | 2 | ||||
| -rw-r--r-- | init-functions.el | 2 | ||||
| -rw-r--r-- | init-modes.el | 5 | ||||
| -rw-r--r-- | init-settings.el | 3 | ||||
| -rw-r--r-- | init.el | 15 |
6 files changed, 24 insertions, 9 deletions
diff --git a/README.md b/README.md index ec381bcd29c5..2dd067a9101f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -dotfiles +emacs.d ======== -Various configuration files \ No newline at end of file +This contains my emacs.d folder. + +I use emacs for many things. diff --git a/init-custom.el b/init-custom.el index 8adbb800fe92..a1333954b078 100644 --- a/init-custom.el +++ b/init-custom.el @@ -7,7 +7,7 @@ '(ac-delay 0.2) '(custom-safe-themes (quote - ("2fb6fbdb644441c4ed1d47f25bed9aa7f7136271c2454ba9a29975d3cfba94c0" "466ae54a7b157ad02fd91da72b7871bccfb9bac98fdab95cf7a0d405c8572bd0" "854dc57026d3226addcc46b2b460034a74609edbd9c14e626769ac724b10fcf5" "8eaa3bce3c618cd81a318fcf2d28c1cd21278531f028feb53186f6387547dfb4" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "a234f91f9be6ed40f6ce0e94dce5cea1b9f1ccec2b9ccd42bb71c499867a3fcc" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "d6a00ef5e53adf9b6fe417d2b4404895f26210c52bb8716971be106550cea257" default))) + ("d0ff5ea54497471567ed15eb7279c37aef3465713fb97a50d46d95fe11ab4739" "2fd1c7f994649d9f879521c4634bd8eddae866db9ff50269a9127b9f93b4e582" "2fb6fbdb644441c4ed1d47f25bed9aa7f7136271c2454ba9a29975d3cfba94c0" "466ae54a7b157ad02fd91da72b7871bccfb9bac98fdab95cf7a0d405c8572bd0" "854dc57026d3226addcc46b2b460034a74609edbd9c14e626769ac724b10fcf5" "8eaa3bce3c618cd81a318fcf2d28c1cd21278531f028feb53186f6387547dfb4" "ea0c5df0f067d2e3c0f048c1f8795af7b873f5014837feb0a7c8317f34417b04" "a234f91f9be6ed40f6ce0e94dce5cea1b9f1ccec2b9ccd42bb71c499867a3fcc" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "d6a00ef5e53adf9b6fe417d2b4404895f26210c52bb8716971be106550cea257" default))) '(erc-modules (quote (autojoin button completion dcc irccontrols list log match menu move-to-prompt netsplit networks noncommands notifications readonly ring scrolltobottom stamp track))) diff --git a/init-functions.el b/init-functions.el index b461b2e6a720..033c525eb5ce 100644 --- a/init-functions.el +++ b/init-functions.el @@ -50,7 +50,7 @@ ;; if there isn't already a folder with that name (defun custom-clone-git (url foldername) "Clones a git repository to .emacs.d/foldername" - (let ((fullpath (concat "~/.emacs.d/clones/" foldername))) + (let ((fullpath (concat "~/.emacs.d/" foldername))) (unless (file-exists-p fullpath) (async-shell-command (concat "git clone " url " " fullpath))))) diff --git a/init-modes.el b/init-modes.el index 7a6a8e21b077..9c766de69d54 100644 --- a/init-modes.el +++ b/init-modes.el @@ -1,10 +1,13 @@ -(mapc 'require '(projectile hi2 ac-nrepl)) +(mapc 'require '(projectile hi2 ac-nrepl yasnippet)) ;; Initializes modes I use. (add-hook 'prog-mode-hook 'esk-pretty-lambdas) (add-hook 'prog-mode-hook 'esk-add-watchwords) (add-hook 'prog-mode-hook 'idle-highlight-mode) +;; Yasnippet everywhere + activate Clojure snippets! +(yas-global-mode 1) + ;; Configure markdown-mode (autoload 'markdown-mode "markdown-mode" "Major mode for editing Markdown files" t) diff --git a/init-settings.el b/init-settings.el index 4256ba1c0f2a..e691328e132d 100644 --- a/init-settings.el +++ b/init-settings.el @@ -1,3 +1,4 @@ +(require 'uniquify) ;; ## Generic settings ## (tool-bar-mode -1) @@ -7,6 +8,8 @@ (setq ido-use-faces nil) (setq gc-cons-threshold 20000000) +(setq uniquify-buffer-name-style 'forward) + ;;; Code: (add-to-list 'load-path "/usr/local/share/emacs/site-lisp/mu4e") diff --git a/init.el b/init.el index cb35667772c6..473a7b677789 100644 --- a/init.el +++ b/init.el @@ -25,7 +25,6 @@ idle-highlight-mode ido-ubiquitous iy-go-to-char - leuven-theme magit markdown-mode multiple-cursors @@ -37,7 +36,8 @@ rainbow-mode smex switch-window - undo-tree) + undo-tree + yasnippet) "A list of packages to install at launch.") (dolist (p my-pkgs) @@ -49,8 +49,15 @@ (add-to-list 'load-path user-emacs-directory) -(mapc 'require '(init-functions - init-settings +(require 'init-functions) + +(unless (file-exists-p "~/.emacs.d/snippets") + (make-directory "~/.emacs.d/snippets")) + +(custom-clone-git "http://github.com/swannodette/clojure-snippets" + "snippets/clojure-mode") + +(mapc 'require '(init-settings init-modes init-bindings init-eshell)) |