Browse files

fix installation cmds

  • Loading branch information...
1 parent 4c7beb6 commit 2345163357943b99f86ad57fa742d87474021f41 @azer committed Oct 11, 2011
Showing with 11 additions and 15 deletions.
  1. +6 −9 Makefile
  2. +2 −2 conf/colors.el
  3. +3 −4 profiles/org.el
View
15 Makefile
@@ -1,25 +1,22 @@
all:
@echo "Pulling submodules..."
@git pull && git submodule init && git submodule update && git submodule status
- @git submodule foreach git pull
+ #@git submodule foreach git pull origin master
@echo "Building...";
@cd lib/auto-complete/dict; \
- @ln -s javascript-mode js2-mode;
+ ln -s javascript-mode js2-mode;
@cd lib/js2-mode; \
- @emacs --batch -f batch-byte-compile js2-mode.el; \
- @mv js2-mode.elc ../.;
+ emacs --batch -f batch-byte-compile js2-mode.el; \
+ mv js2-mode.elc ../.;
echo "build successful."
install:
- @mkdir bak;
- @mv -f ~/.emacs* bak/.;
- @mv -f ~/.config/emacsfiles bak/.;
- @echo "Old configuration moved into ./bak/"
+ @mkdir lib/themes
@echo "Locate your snippets in ~/.local/share/snippets"
@mkdir -p ~/.local/share/snippets;
- @ln -s init.el ~/.emacs
@echo "Copy * into ~/.config/emacsfiles/"
@mkdir -p ~/.config/emacsfiles
@cp -rf * ~/.config/emacsfiles/.
+ @ln -s ~/.config/emacsfiles/init.el ~/.emacs
@echo "Done."
View
4 conf/colors.el
@@ -5,13 +5,13 @@
(interactive)
(color-theme-install
'(theme-1
- ((background-color . "#050005")
+ (;;(background-color . "#050005")
(foreground-color . "#FFFFFF")
(background-mode . dark)
(border-color . "#323232")
(cursor-color . "#FFFFFF")
(mouse-color . "#323232"))
- (mode-line ((t (:foreground "#FFFFFF" :background "#323232"))))
+ (mode-line ((t (:foreground "#ddd" :background "#111"))))
(region ((t (:background "#323232"))))
(font-lock-comment-face ((t (:foreground "#766655"))))
View
7 profiles/org.el
@@ -1,5 +1,4 @@
-(defconst +org-files+ '((format "%s/docs/org/notes.org" +home-dir+)
- (format "%s/docs/org/personal.org" +home-dir+)
- (format "%s/docs/doc/org/work.org" +home-dir+)))
-
(load-conf-file "org.el")
+
+(find-file (format "%s/docs/org/notes.org" +home-dir+))
+(find-file (format "%s/docs/org/personal.org" +home-dir+))

0 comments on commit 2345163

Please sign in to comment.