Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:alandipert/alan-emacs.d

  • Loading branch information...
commit 84cc0ba958b537be836a8474dbb28741983217aa 2 parents 4517949 + 5b9ea17
@alandipert authored
Showing with 35 additions and 59 deletions.
  1. +2 −2 README.md
  2. +33 −57 init.el
View
4 README.md
@@ -13,7 +13,7 @@
### Install
-1. Clone this repository move it to `~/.emacs.d`
+1. Clone this repository into `~/.emacs.d`
2. Run Emacs. When you see the message "Congrats, el-get is installed and ready to serve!", restart Emacs.
3. Emacs will do stuff and then you'll see warning messages. Keep restarting Emacs until the messages go away.
4. Done!
@@ -24,7 +24,7 @@
* Install required packages:
- sudo apt-get install build-essentials texinfo libncurses5-dev autoconf automake shtool libgtk2.0-dev libtiff4-dev libgif-dev libjpeg62-dev libpng12-dev libxpm-dev libtool
+ sudo apt-get install build-essential texinfo libncurses5-dev autoconf automake shtool libgtk2.0-dev libtiff4-dev libgif-dev libjpeg62-dev libpng12-dev libxpm-dev libtool
* Clone emacs from its git mirror:
View
90 init.el
@@ -35,8 +35,31 @@
(add-to-list 'package-archives archive))
(package-initialize)
+;; local sources
(setq el-get-sources
- '((:name fuzzy-format
+ '(ac-slime
+ auto-complete
+ coffee-mode
+ color-theme
+ dired-details
+ durendal
+ elein
+ el-get
+ haml-mode
+ highlight-parentheses
+ hl-sexp
+ markdown-mode
+ org-mode
+ ruby-block
+ ruby-end
+ ruby-mode
+ sass-mode
+ swank-clojure
+ textile-mode
+ yaml-mode
+ yasnippet
+
+ (:name fuzzy-format
:after (lambda ()
(require 'fuzzy-format)
(setq fuzzy-format-default-indent-tabs-mode nil)
@@ -74,21 +97,6 @@
(setq slime-protocol-version 'ignore)
(setq font-lock-verbose nil)))
- (:name slime-repl :type elpa)
-
- (:name dired-details
- :after (lambda ()
- (require 'dired-details)
- (dired-details-install)))
-
- (:name haml-mode
- :type git
- :url "git://github.com/nex3/haml-mode.git")
-
- (:name sass-mode
- :type git
- :url "git://github.com/nex3/sass-mode.git")
-
(:name find-file-in-project
:type git
:url "git://github.com/dburger/find-file-in-project.git"
@@ -118,20 +126,7 @@
(global-set-key (kbd "s-t") 'find-file-in-project)
(global-set-key (kbd "s-T") 'ffip-toggle-use-project-cache))))
- (:name ruby-mode :type elpa)
-
- (:name ruby-block
- :type emacswiki
- :features ruby-block)
-
- (:name ruby-end
- :type http
- :url "https://github.com/rejeep/ruby-end/raw/master/ruby-end.el"
- :features ruby-end)
-
(:name autopair
- :type http
- :url "http://autopair.googlecode.com/svn/trunk/autopair.el"
:after (lambda ()
(require 'autopair)
(autopair-global-mode)))
@@ -140,32 +135,9 @@
:type elpa
:after (lambda ()
(load "color-theme-miami-vice")
- (color-theme-miami-vice)))
-
- (:name mvnrepl :type elpa)))
-
-(setq my-packages
- (append
- '(ac-slime
- auto-complete
- coffee-mode
- color-theme
- color-theme-miami-vice
- durendal
- el-get
- elein
- highlight-parentheses
- hl-sexp
- markdown-mode
- sass-mode
- swank-clojure
- textile-mode
- yaml-mode
- yasnippet
- org-mode)
- (mapcar 'el-get-source-name el-get-sources)))
-
-(el-get 'sync my-packages)
+ (color-theme-miami-vice)))))
+
+(el-get 'sync)
(let ((user-custom-file "~/.emacs.d/custom.el"))
(if (not (file-exists-p user-custom-file))
@@ -342,11 +314,15 @@ Goes backward if ARG is negative; error if CHAR not found."
(load (expand-file-name "~/quicklisp/slime-helper.el"))
(setq inferior-lisp-program "/usr/local/bin/sbcl"))
+(defcustom clj-dir "/home/alan/projects/opensource/clojure"
+ "Path to Clojure source directory."
+ :type 'string
+ :group 'cljrepl)
+
(defun cljrepl ()
"Launch a Clojure REPL."
(interactive)
- (let* ((clj-dir "/Users/alan/Projects/clojure/clojure/")
- (clj-jar (concat clj-dir "clojure.jar")))
+ (let* ((clj-jar (concat clj-dir "/clojure.jar")))
(if (file-exists-p clj-jar)
(inferior-lisp (concat "java -cp " clj-jar " clojure.main"))
(when (yes-or-no-p (concat "clojure.jar not found. Build?"))
Please sign in to comment.
Something went wrong with that request. Please try again.