summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
Diffstat (limited to '.emacs')
-rw-r--r--.emacs188
1 files changed, 88 insertions, 100 deletions
diff --git a/.emacs b/.emacs
index 4bc39b3..0637377 100644
--- a/.emacs
+++ b/.emacs
@@ -1,132 +1,81 @@
-(set-face-attribute 'default nil :height 80)
+;; Preliminary settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(set-face-attribute 'default nil :height 80)
+(setq notify-method 'notify-via-libnotify)
+(add-to-list 'load-path "~/.emacs.d/")
+(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
(setq custom-file "~/.emacs.d/custom.el")
-(load custom-file 'noerror)
-(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"))
- )
- )
-)
+; derived from ELPA installation
+; http://tromey.com/elpa/install.html
+(defun eval-url (url)
+ (let ((buffer (url-retrieve-synchronously url)))
+ (save-excursion
+ (set-buffer buffer)
+ (goto-char (point-min))
+ (re-search-forward "^$" nil 'move)
+ (eval-region (point) (point-max))
+ (kill-buffer (current-buffer)))))
+
+ ;; ELPA stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(unless (require 'package nil t)
+ (eval-url "http://tromey.com/elpa/package-install.el"))
(setq package-archives '(("ELPA" . "http://tromey.com/elpa/")
("marmalade" . "http://marmalade-repo.org/packages/")
("gnu" . "http://elpa.gnu.org/packages/")))
+;; el-get stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(add-to-list 'load-path "~/.emacs.d/")
-(add-to-list 'load-path "~/.emacs.d/el-get/el-get")
+(setq el-get-install-branch "master") ;; live life on the edge
(unless (require 'el-get nil t)
- (url-retrieve
- "https://github.com/dimitri/el-get/raw/master/el-get-install.el"
- (lambda (s)
- (end-of-buffer)
- (eval-print-last-sexp))))
-
-(setq el-get-sources
- '((:name scss-mode
- :url "git://github.com/antonj/scss-mode.git"
- :after (lambda ()
- (setq scss-compile-at-save nil)))
- (:name color-theme
- :after (lambda ()
- (color-theme-tty-dark)))
- (: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)
- (color-theme-tty-dark))))))
- (:name org-mode
- :after (lambda ()
- (require 'org-checklist)
- (setq org-hide-leading-stars t)
- (setq org-log-done 'time)))
- (:name identica-mode
- :type http-tar
- :options ("xzf")
- :url "http://git.savannah.gnu.org/cgit/identica-mode.git/snapshot/identica-mode-1.1.tar.gz"
- :load "identica-mode.el"
- :after (lambda ()
- (load-identica-mode)))
- (:name nginx-mode
- :description "Major mode for editing Nginx configuration files"
- :type git
- :url "git://github.com/ajc/nginx-mode.git")
- (:name autopair
- :after (lambda ()
- (autopair-global-mode 1)
- (setq autopair-autowrap t)))
- ))
+ (eval-url "https://github.com/dimitri/el-get/raw/master/el-get-install.el"))
-(setq lts-el-get-packages
+(setq el-get-sources '(
+ (:name nxhtml
+ :type http
+ :url "http://ourcomments.org/Emacs/DL/elisp/nxhtml/zip/nxhtml-2.08-100425.zip"
+ :build ("unzip nxhtml-2.08-100425.zip")
+ :load "nxhtml/autostart.el")
+ ))
+
+(setq my-el-get-packages
'(el-get
- package
- rainbow-delimiters
- php-mode-improved
- mmm-mode
- dtrt-indent
- coffee-mode
- folding
- apel flim semi wanderlust
- scss-mode
- color-theme color-theme-solarized
- org-mode
- identica-mode
+; nxhtml
smarttabs
- markdown-mode
- autopair
- nginx-mode
))
-(when (require 'el-get nil t)
- (el-get 'sync lts-el-get-packages))
+;; Now load all of that ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(add-hook 'text-mode-hook 'turn-on-auto-fill)
-(add-hook 'after-make-frame-functions
- (lambda (frame)
- (set-variable 'term-default-fg-color
- (face-foreground 'default))
- (set-variable 'term-default-bg-color
- (face-background 'default)))
- t)
+;; ELPA
+(package-initialize)
+;; el-get
+(when (require 'el-get nil t) (el-get 'sync my-el-get-packages))
+;; custom
+(load custom-file 'noerror)
+;; General settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;(load "mdmua")
(load "emacsutils")
(tool-bar-mode -1)
(ido-mode t)
(show-paren-mode 1)
-
-(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)))))
-(global-set-key [f11] 'toggle-fullscreen)
+(setq org-hide-leading-stars t)
+(setq org-log-done 'time)
+;(xclip-mode 1)
(load "whitespace")
-(global-set-key "\C-cw" 'global-whitespace-mode)
(setq whitespace-style '(
-; face
-; tabs
tab-mark
-; spaces
space-mark
-; newline
newline-mark
empty
))
+
;; These are my preferred settings; we let dtrt-indent detect when we play with other's files
(setq-default tab-width 8)
(setq-default c-basic-offset 8)
@@ -135,7 +84,7 @@
(setq
backup-by-copying t ;; don't clobber symlinks
- backup-directory-alist '(("." . "~/.saves")) ;; don't litter my fs tree
+ backup-directory-alist '(("." . "~/.emacs.d/saves")) ;; don't litter my fs tree
delete-old-versions t
kept-new-versions 6
kept-old-versions 2
@@ -152,6 +101,34 @@
(setq browse-url-generic-program (executable-find "v-www-browser")
browse-url-browser-function 'browse-url-generic)
+
+(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)))))
+
+;; Custom keybindings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(global-set-key [f11] 'toggle-fullscreen)
+(global-set-key "\C-cw" 'global-whitespace-mode)
+
+;; mode-hooks ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(add-hook 'text-mode-hook 'turn-on-auto-fill)
+
+; for term-mode
+;; (add-hook 'after-make-frame-functions
+;; (lambda (frame)
+;; (set-variable 'term-default-fg-color
+;; (face-foreground 'default))
+;; (set-variable 'term-default-bg-color
+;; (face-background 'default)))
+;; t)
+
(add-hook 'lisp-mode-hook
'(lambda ()
(set (make-local-variable 'indent-tabs-mode) nil)
@@ -179,8 +156,19 @@
(setq autopair-dont-activate t) ;; Don't let autopair break ansi-term
))
-(add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
+(add-hook 'ruby-mode-hook
+ '(lambda ()
+ (set (make-local-variable 'indent-tabs-mode) t)
+ (set (make-local-variable 'ruby-indent-level) 4)
+ (set (make-local-variable 'tab-width) 4)
+ ))
+(add-hook 'coffee-mode-hook
+ '(lambda ()
+ (set (make-local-variable 'indent-tabs-mode) nil)
+ ))
+
+(add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
;(require 'flymake)
;(add-hook 'php-mode-hook (lambda() (flymake-mode 1)))