Moving configs from config folder to lisp.

init.el

@@ -14,6 +14,7 @@
 (add-to-list 'load-path (concat dotfiles-dir "/elpa-to-submit"))
 (setq autoload-file (concat dotfiles-dir "loaddefs.el"))
 (setq package-user-dir (concat dotfiles-dir "elpa"))
+(setq package-user-dir (concat dotfiles-dir "system_type"))
 (setq custom-file (concat dotfiles-dir "custom.el"))
 (add-to-list 'load-path "~/.emacs.d/modes/")
 
@@ -45,41 +46,32 @@
 (require 'starter-kit-perl)
 (require 'starter-kit-ruby)
 
-(require 'config-autoinsert)
-(require 'config-erc)
-(require 'config-yasnippet)
-(require 'config-tex)
-(require 'config-colortheme)
-(require 'xscheme)
-(require 'config-columnmarker)
-(require 'config-elpy)
-(require 'config-jsmode)
-;;(require 'config-fill-line)
-(require 'config-company)
-;;(require 'config-projectile)
-(require 'config-magit)
-(require 'rainbow-delimiters)
-(require 'prelude-ruby)
-
-;; New configs
 (require 'init-auto-complete)
-(require 'init-auto-complete-clang)
+(require 'init-autoinsert)
+;;(require 'init-auto-complete-clang)
 (require 'init-cc)
 (require 'init-cedit)
+(require 'init-colortheme)
+(require 'init-columnmarker)
+(require 'init-company)
 (require 'init-elpy)
+(require 'init-erc)
 (require 'init-font)
 (require 'init-flymake-google-cpplint)
 (require 'init-iedit)
+(require 'init-jsmode)
 (require 'init-latex)
 ;;(require 'init-php)
 ;;(require 'init-python)
-(require 'init-semantic)
+;;(require 'init-semantic)
+(require 'init-rainbow-delimiters)
 (require 'init-saveplace)
 (require 'init-sql)
 (require 'init-tramp)
-(require 'init-volatile-highlights)
+;;(require 'init-volatile-highlights)
 (require 'init-whitespace)
 (require 'init-which-mode)
+(require 'init-yasnippet)
 
 (cond
  ((eq system-type 'gnu/linux)

configs/config-autoinsert.el → lisp/init-autoinsert.el

@@ -10,5 +10,4 @@
 (define-auto-insert "\\.mk$" "insert.mk")
 (define-auto-insert "\\.sh$" "insert.sh")
 
-(provide 'config-autoinsert)
-
+(provide 'init-autoinsert)

configs/config-colortheme.el → lisp/init-colortheme.el

@@ -2,9 +2,6 @@
 
 (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
 
-
-
-
 (add-to-list 'load-path
 	     "~/.emacs.d/plugins/color-theme-6.6.0/")
 
@@ -37,4 +34,4 @@
 ;;(load-theme 'zenburn t)
 (load-theme 'ample t)
 
-(provide 'config-colortheme)
+(provide 'init-colortheme)

lisp/init-columnmarker.el

@@ -0,0 +1,8 @@
+(add-to-list 'load-path
+	     "~/.emacs.d/plugins/column-marker/")
+
+(require 'column-marker)
+(add-hook 'php-mode-hook (lambda () (interactive) (column-marker-1 80)))
+
+(provide 'init-columnmarker)
+

configs/config-company.el → lisp/init-company.el

@@ -2,4 +2,4 @@
 
 (add-hook 'after-init-hook 'global-company-mode)
 
-(provide 'config-company)
+(provide 'init-company)

lisp/init-elpy.el

@@ -1,3 +1,5 @@
+;; pip install elpy rope jedi
+
 ;; Elpy
 (elpy-enable)
 ;; Fixing a key binding bug in elpy
@@ -6,3 +8,5 @@
 (define-key global-map (kbd "C-c o") 'iedit-mode)
 
 (setq python-check-command "/usr/local/bin/pyflakes")
+
+(provide 'init-elpy)

configs/config-erc.el → lisp/init-erc.el

@@ -150,4 +150,4 @@
  '(erc-server-coding-system (quote utf-8))
  )
 
-(provide 'config-erc)
+(provide 'init-erc)

lisp/init-jsmode.el

@@ -0,0 +1,15 @@
+;; temporary js config
+;; hastily copied from: http://truongtx.me/2014/02/23/set-up-javascript-development-environment-in-emacs/
+
+
+(add-to-list 'auto-mode-alist '("\\.json$" . js-mode))
+
+(add-hook 'js-mode-hook 'js2-minor-mode)
+(add-hook 'js2-mode-hook 'ac-js2-mode)
+
+(setq js2-highlight-level 3)
+
+;; (define-key js-mode-map "{" 'paredit-open-curly)
+;; (define-key js-mode-map "}" 'paredit-close-curly-and-newline)
+
+(provide 'init-jsmode)

lisp/init-latex.el

@@ -1,3 +1,13 @@
+
+;Preview TeX/LaTeX output with xdvi and telling it to
+; watch the file for changes every 3 seconds
+(setq tex-dvi-view-command "xdvi -watchfile 3 -expertmode 0")
+
+(setq TeX-auto-save t)
+(setq TeX-parse-self t)
+(setq TeX-save-query nil)
+(setq TeX-PDF-mode t)
+
 (setq tex-dvi-view-command "xdvi")
 
 (provide 'init-latex)

lisp/init-magit.el

@@ -0,0 +1,3 @@
+(require 'magit)
+
+(provide 'config-magit)

lisp/init-rainbow-delimiters.el

@@ -0,0 +1,3 @@
+(require 'rainbow-delimiters)
+
+(provide 'init-rainbow-delimiters)

lisp/init-xscheme.el

@@ -0,0 +1,2 @@
+(require 'xscheme)
+(provide 'init-xcheme)

configs/config-yasnippet.el → lisp/init-yasnippet.el

@@ -7,4 +7,4 @@
 (setq yas-snippet-dirs (append yas-snippet-dirs
                                '("~/.emacs.d/modelib/snippets")))
 
-(provide 'config-yasnippet)
+(provide 'init-yasnippet)