summaryrefslogtreecommitdiff
path: root/.config/emacs
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-27 17:59:51 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-27 17:59:51 -0400
commit84c044c2442ac3ab1ea327fc77c830ac26d9d187 (patch)
treebad6564288cba69f5bd357f50c595c9846684e05 /.config/emacs
parent86b1a11dfcbab990a07a236f41deefe0aaf4ed5e (diff)
fix
Diffstat (limited to '.config/emacs')
-rw-r--r--.config/emacs/custom.el14
-rw-r--r--.config/emacs/init.el2
2 files changed, 11 insertions, 5 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index 5a3e67f..90cbcd7 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -3,19 +3,25 @@
;; 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.
- '(custom-enabled-themes (quote (wombat)))
- '(custom-safe-themes (quote ("71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
+ '(custom-enabled-themes (quote (tango-dark)))
+ '(custom-safe-themes (quote ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
'(erc-nick "lukeshu")
'(explicit-shell-file-name "/bin/bash")
+ '(global-whitespace-mode nil)
'(inhibit-startup-screen t)
'(mdmua-maildir "~/Maildir")
'(minibuffer-prompt-properties (quote (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)))
+ '(page-break-lines-char 45)
'(ruby-deep-arglist nil)
'(ruby-deep-indent-paren nil)
- '(scroll-bar-mode nil))
+ '(safe-local-variable-values (quote ((Nginx-indent-tabs-mode) (Nginx-indent-level . 4) (Nginx-indent-level . 8))))
+ '(scroll-bar-mode nil)
+ '(send-mail-function (quote smtpmail-send-it))
+ '(sh-basic-offset 8)
+ '(sh-indent-comment t))
(custom-set-faces
;; custom-set-faces 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.
- )
+)
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 836a53c..c23b03a 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -1,6 +1,6 @@
;; Preliminary settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(set-face-attribute 'default nil :height 80)
+;(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")