summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
Diffstat (limited to '.emacs')
-rw-r--r--.emacs33
1 files changed, 11 insertions, 22 deletions
diff --git a/.emacs b/.emacs
index 498fd4b..b52f9ad 100644
--- a/.emacs
+++ b/.emacs
@@ -36,7 +36,6 @@
:after (lambda ()
(color-theme-tty-dark)))
(:name color-theme-solarized
- :url "git://github.com/LukeShu/emacs-color-theme-solarized.git"
:after (lambda ()
(add-hook 'after-make-frame-functions
(lambda (frame)
@@ -46,8 +45,6 @@
(color-theme-solarized-dark)
(color-theme-tty-dark))))))
(:name org-mode
- :url "git://orgmode.org/org-mode.git"
- :features org-install
:after (lambda ()
(require 'org-checklist)
(setq org-hide-leading-stars t)
@@ -59,8 +56,6 @@
:load "identica-mode.el"
:after (lambda ()
(load-identica-mode)))
- (:name smarttabs
- :url "git://gist.github.com/896190.git")
(:name autopair
:after (lambda ()
(autopair-global-mode 1)
@@ -69,27 +64,21 @@
(setq lts-el-get-packages
'(el-get
- ;; 'programs'
package
- magit
- apel flim semi wanderlust
- identica-mode
-
- ;; extensions/features
rainbow-delimiters
+ php-mode-improved
mmm-mode
dtrt-indent
+ coffee-mode
folding
+ apel flim semi wanderlust
+ scss-mode
color-theme color-theme-solarized
- smarttabs
- autopair
-
- ;; modes
org-mode
- php-mode-improved
- scss-mode
- coffee-mode
+ identica-mode
+ smarttabs
markdown-mode
+ autopair
))
(when (require 'el-get nil t)
@@ -106,8 +95,6 @@
(load "emacsutils")
-;;(load "mdmua")
-
(tool-bar-mode -1)
(ido-mode t)
(show-paren-mode 1)
@@ -135,8 +122,7 @@
empty
))
-;; These are my preferred settings; we let dtrt-indent detect when we play with
-;; other's files
+;; 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)
(setq-default indent-tabs-mode t)
@@ -188,6 +174,9 @@
(setq autopair-dont-activate t) ;; Don't let autopair break ansi-term
))
+(add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
+
+
;(require 'flymake)
;(add-hook 'php-mode-hook (lambda() (flymake-mode 1)))
;(define-key php-mode-map '[M-S-up] 'flymake-goto-prev-error)