Fiddle with emacs config (when to use -n, -c), get emacs using el-get.

1 files changed, 64 insertions, 30 deletions

diff --git a/.emacs b/.emacs
index 4e8f026..27d8dcc 100644
--- a/.emacs
+++ b/.emacs
@@ -1,26 +1,67 @@
-(add-to-list 'load-path "~/.emacs.d/")
+(set-face-attribute 'default nil :height 80)
+
+(defun load-identica-mode ()
+  (when (require 'netrc nil t)
+    (autoload 'identica-mode "identica-mode" nil t)
+    (let ((identica (netrc-machine (netrc-parse "~/.netrc") "identi.ca" t)))
+      (setq identica-password (netrc-get identica "password"))
+      (setq identica-username (netrc-get identica "login"))
+    )
+  )
+)
 
-(add-to-list 'load-path "~/.emacs.d/org-7.4/lisp")
-(add-to-list 'load-path "~/.emacs.d/org-7.4/contrib/lisp")
-(add-to-list 'load-path "~/.emacs.d/color-theme-6.6.0")
+(setq package-archives '(("ELPA" . "http://tromey.com/elpa/") 
+			 ("marmalade" . "http://marmalade-repo.org/packages/")
+			 ("gnu" . "http://elpa.gnu.org/packages/")))
 
-(require 'org-install)
-(require 'org-checklist)
+(add-to-list 'load-path "~/.emacs.d/")
+(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
+(require 'el-get)
+(add-to-list 'el-get-recipe-path "~/.emacs.d/el-get-recipes")
+(setq el-get-sources
+      '(el-get
+	(:name color-theme
+	       :after (lambda ()
+			(color-theme-tty-dark)))
+	package
+	(:name color-theme-solarized
+	       :after (lambda ()
+			(add-hook 'after-make-frame-functions
+				  (lambda (frame)
+				    (set-variable 'color-theme-is-global nil)
+				    (select-frame frame)
+				    (if window-system
+					(color-theme-solarized-dark))))))
+	(:name org-mode
+	       :url "git://orgmode.org/org-mode.git"
+	       :features org-install
+	       :after ((require 'org-checklist)))
+	(:name identica-mode
+	       :after (lambda ()
+			(load-identica-mode)))
+	(:name rainbow-delimiters
+	       :after (lambda ()
+			))
+	(:name autopair
+	       :after (lambda ()
+			(autopair-global-mode 1)
+			(setq autopair-autowrap t)))
+	))
+(el-get)
 
 (ido-mode t)
 ;(global-linum-mode)
 
-(require 'color-theme-solarized)
-(color-theme-solarized-dark)
+(defun toggle-fullscreen (&optional f)
+  (interactive)
+  (let ((current-value (frame-parameter nil 'fullscreen)))
+    (set-frame-parameter nil 'fullscreen
+			 (if (equal 'fullboth current-value)
+			     (if (boundp 'old-fullscreen) old-fullscreen nil)
+			   (progn (setq old-fullscreen current-value)
+				  'fullboth)))))
 
-(when (require 'netrc nil t)
-  (autoload 'identica-mode "identica-mode" nil t)
-  (let
-    ((identica (netrc-machine (netrc-parse "~/.netrc") "identi.ca" t)))
-    (setq identica-password (netrc-get identica "password"))
-    (setq identica-username (netrc-get identica "login"))
-  )
-)
+(global-set-key [f11] 'toggle-fullscreen)
 
 (load "whitespace")
 (global-set-key "\C-cw" 'global-whitespace-mode)
@@ -45,21 +86,14 @@
 ;; (setq-defualt indent-tabs-mode nill);; no tabs
 (setq-default indent-tabs-mode t);; use tabs
 
-(load "folding" 'nomessage 'noerror)
-(folding-mode-add-find-file-hook)
+(setq column-number-mode t
+      inhibit-startup-screen t
+      line-number-mode t
+      server-mode t
+      show-paren-mode t)
 
 (setq browse-url-generic-program (executable-find "v-www-browser")
       browse-url-browser-function 'browse-url-generic)
 
-(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.
- '(column-number-mode t)
- '(inhibit-startup-screen t)
- '(line-number-mode t)
- '(server-mode t)
- '(show-paren-mode t))
-
-(set-face-attribute 'default nil :height 80)
+(setq custom-file "~/.emacs.d/custom.el")
+(load custom-file 'noerror)