Permalink
Browse files

Getting my .emacs config up to date. Been using vim for the last year.

  • Loading branch information...
1 parent f0a8baf commit e22970ab9f610fd9d6834646e8d21a775dbd7a98 @mrcsparker committed Sep 14, 2013
Showing with 53 additions and 67 deletions.
  1. +2 −0 .gitignore
  2. +0 −9 conf/ecb.el
  3. +49 −42 conf/el-get.el
  4. +2 −16 init.el
View
@@ -0,0 +1,2 @@
+el-get
+auto-save-list
View
@@ -1,9 +0,0 @@
-(setq stack-trace-on-error t)
-
-(require 'ecb)
-
-(ecb-layout-switch "left3")
-
-;(ecb-activate)
-;(ecb-byte-compile)
-
View
@@ -1,48 +1,55 @@
+(require 'package)
+(package-initialize)
+
(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
+
+(setq el-get-user-package-directory "~/.emacs.d/el-get-user/packages-init")
+
(unless (require 'el-get nil t)
(url-retrieve
- "https://github.com/ChandleWEi/el-get/raw/master/el-get-install.el"
+ "https://raw.github.com/dimitri/el-get/master/el-get-install.el"
(lambda (s)
- (end-of-buffer)
- (eval-print-last-sexp))))
+ (let (el-get-master-branch)
+ (goto-char (point-max))
+ (eval-print-last-sexp)))))
+
+(setq el-get-github-default-url-type 'git)
+(setq el-get-verbose t)
-(setq my-el-get-packages
- (append
- '(ecb
- magit
- rhtml-mode
- haml-mode
- sass-mode
- coffee-mode
- maxframe
- js2-mode
- markdown-mode
- textile-mode
- textmate
- ;; ruby set
- inf-ruby
- ruby-mode
- rspec-mode
- ruby-electric
- ruby-compilation
- rvm
- mmm-mode
- yaml-mode
- ;; common set
- color-theme
- color-theme-railscasts
- psvn
- ;;session
- auto-complete
- auto-complete-css
- auto-complete-emacs-lisp
- auto-complete-ruby
- ;; processing
- ;processing-mode
- ;; clojure
- clojure-mode
- paredit
- )
- (mapcar 'el-get-source-name el-get-sources)))
+(add-to-list 'el-get-recipe-path "~/.emacs.d/el-get-user/recipes")
-(el-get 'sync my-el-get-packages)
+(el-get 'sync
+ '(magit
+ rhtml-mode
+ haml-mode
+ sass-mode
+ coffee-mode
+ maxframe
+ js2-mode
+ markdown-mode
+ textile-mode
+ textmate
+ ;; ruby set
+ inf-ruby
+ ruby-mode
+ rspec-mode
+ ruby-electric
+ ruby-compilation
+ rvm
+ mmm-mode
+ yaml-mode
+ ;; common set
+ color-theme
+ color-theme-railscasts
+ psvn
+ ;;session
+ auto-complete
+ auto-complete-css
+ auto-complete-emacs-lisp
+ auto-complete-ruby
+ ;; processing
+ ;;processing-mode
+ ;; clojure
+ clojure-mode
+ paredit
+ ))
View
18 init.el
@@ -1,4 +1,5 @@
(add-to-list 'load-path "~/.emacs.d")
+
(load "conf/env")
(load "conf/ido")
(load "conf/el-get")
@@ -9,21 +10,6 @@
(load "conf/rhtml-mode")
(load "conf/yaml-mode")
(load "conf/css-mode")
-(load "conf/textmate")
+;(load "conf/textmate")
(load "conf/theme")
-(load "conf/ecb")
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(ecb-layout-window-sizes (quote (("left3" (0.1921182266009852 . 0.35294117647058826) (0.1921182266009852 . 0.3137254901960784) (0.1921182266009852 . 0.3137254901960784)))))
- '(ecb-options-version "2.40")
- '(ecb-tip-of-the-day nil))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )

0 comments on commit e22970a

Please sign in to comment.