Emacs: Don't generate init2.el, make init.el instead

emacs/.gitignore

@@ -13,5 +13,5 @@ templates/
 rinit.*
 !rinit.org
 history
-init2.el
+init.el
 *.html

emacs/Makefile

@@ -1,11 +1,11 @@
 DESTDIR:=$(DESTDIR)/.emacs.d
-objects=init.elc init.el gnus.elc gnus.el init2.elc init2.el
+objects=init.elc init.el gnus.elc gnus.el
 modules=eshell site-lisp snippets
 
 EMACS=emacs
 
 include ../dotfiles.mk
 
-init2.el: init.org
+init.el: init.org
 	$(EMACS) -Q -batch \
 	-eval "(progn (require 'org) (require 'ob-tangle) (org-babel-tangle-file \"$^\"))"

emacs/init.el

@@ -1,13 +0,0 @@
-;;; init.el --- ryuslash's emacs init
-
-;;; Commentary:
-;; Does so much and changes so often
-
-
-;;; Code:
-
-(load (concat user-emacs-directory "init2"))
-
-(provide 'init)
-
-;;; init.el ends here

emacs/init.org

@@ -1,7 +1,7 @@
 #+TITLE: Emacs init
 #+LINK: yoshi-theme http://ryuslash.org/projects/yoshi-theme.html
 #+OPTIONS: author:nil num:nil
-#+PROPERTY: tangle init2.el
+#+PROPERTY: tangle init.el
 #+STARTUP: showall
 
 Disable the ~menu-bar-mode~, ~tool-bar-mode~ and ~scroll-bar-mode~ early on