summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs49
-rw-r--r--.emacs.d/custom.el0
2 files changed, 30 insertions, 19 deletions
diff --git a/.emacs b/.emacs
index 27d8dcc..b3d07f0 100644
--- a/.emacs
+++ b/.emacs
@@ -10,7 +10,7 @@
)
)
-(setq package-archives '(("ELPA" . "http://tromey.com/elpa/")
+(setq package-archives '(("ELPA" . "http://tromey.com/elpa/")
("marmalade" . "http://marmalade-repo.org/packages/")
("gnu" . "http://elpa.gnu.org/packages/")))
@@ -20,10 +20,11 @@
(add-to-list 'el-get-recipe-path "~/.emacs.d/el-get-recipes")
(setq el-get-sources
'(el-get
+ package
+ rainbow-delimiters
(:name color-theme
:after (lambda ()
(color-theme-tty-dark)))
- package
(:name color-theme-solarized
:after (lambda ()
(add-hook 'after-make-frame-functions
@@ -39,9 +40,8 @@
(:name identica-mode
:after (lambda ()
(load-identica-mode)))
- (:name rainbow-delimiters
- :after (lambda ()
- ))
+ (:name smarttabs
+ :url "git://gist.github.com/896190.git")
(:name autopair
:after (lambda ()
(autopair-global-mode 1)
@@ -49,33 +49,36 @@
))
(el-get)
+(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)
+
(ido-mode t)
-;(global-linum-mode)
+(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)
+p (if (boundp 'old-fullscreen) old-fullscreen nil)
(progn (setq old-fullscreen current-value)
'fullboth)))))
-
-(global-set-key [f11] 'toggle-fullscreen)
+(global-set-key [f11] 'toggle-fullscreenn)
(load "whitespace")
(global-set-key "\C-cw" 'global-whitespace-mode)
-;(setq whitespace-style '(
-; face
-; tabs tab-mark
-; spaces space-mark
-; newline newline-mark
-; empty
-;))
-
(setq whitespace-style '(
+; face
+; tabs
tab-mark
+; spaces
space-mark
+; newline
newline-mark
empty
))
@@ -83,8 +86,16 @@
(setq-default tab-width 8)
(setq-default c-basic-offset 8)
-;; (setq-defualt indent-tabs-mode nill);; no tabs
-(setq-default indent-tabs-mode t);; use tabs
+(setq-default indent-tabs-mode nil)
+
+(setq
+ backup-by-copying t ;; don't clobber symlinks
+ backup-directory-alist '(("." . "~/.saves")) ;; don't litter my fs tree
+ delete-old-versions t
+ kept-new-versions 6
+ kept-old-versions 2
+ version-control t ;; use versioned backups
+)
(setq column-number-mode t
inhibit-startup-screen t
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.emacs.d/custom.el