Some emacs customizations

This commit is contained in:
John Doty 2016-09-19 09:47:00 -07:00
parent 42d4cf44a4
commit 36021214b1
2 changed files with 36 additions and 3 deletions

View file

@ -47,6 +47,21 @@
(setq custom-file (concat init-dir "custom.el"))
(load custom-file)
;; =================================================================
;; FB STUFF
;; =================================================================
(defconst master-dir (getenv "LOCAL_ADMIN_SCRIPTS"))
(defconst engshare-master (getenv "ADMIN_SCRIPTS"))
(if (file-exists-p (expand-file-name "master.emacs" master-dir))
(load-library (expand-file-name "master.emacs" master-dir))
(load-library (expand-file-name "master.emacs" engshare-master)))
(if (string-match-p ".+\.prn1\.facebook\.com" (getenv "HOSTNAME"))
(setq url-proxy-services
'(("no_proxy" . "^\\(localhost\\|10.*\\)")
("http" . "fwdproxy:8080")
("https" . "fwdproxy:8080"))))
;; =================================================================
;; Common stuff that's needed once
;; =================================================================
@ -78,6 +93,7 @@
'ruby-mode ; Major mode for editing Ruby files
'color-theme ; Color themes...
'color-theme-solarized ; ...Solarized
'color-theme-monokai ; ...Monokai
'csharp-mode ; C# mode
'js2-mode ; Improved JS mode
'lua-mode ; LUA
@ -195,8 +211,8 @@
(if (display-graphic-p)
(progn
(require 'color-theme)
(require 'color-theme-solarized)
(color-theme-solarized)))
(require 'color-theme-monokai)
(color-theme-monokai)))
;; Modeline format:
(display-time-mode -1)

View file

@ -31,13 +31,29 @@
'(org-hide-leading-stars t)
'(org-odd-levels-only t)
'(rmail-mail-new-frame t)
'(safe-local-variable-values (quote ((eval ignore-errors "Write-contents-functions is a buffer-local alternative to before-save-hook" (add-hook (quote write-contents-functions) (lambda nil (delete-trailing-whitespace) nil)) (require (quote whitespace)) "Sometimes the mode needs to be toggled off and on." (whitespace-mode 0) (whitespace-mode 1)) (whitespace-line-column . 80) (whitespace-style face trailing lines-tail) (require-final-newline . t))))
'(safe-local-variable-values
(quote
((eval ignore-errors "Write-contents-functions is a buffer-local alternative to before-save-hook"
(add-hook
(quote write-contents-functions)
(lambda nil
(delete-trailing-whitespace)
nil))
(require
(quote whitespace))
"Sometimes the mode needs to be toggled off and on."
(whitespace-mode 0)
(whitespace-mode 1))
(whitespace-line-column . 80)
(whitespace-style face trailing lines-tail)
(require-final-newline . t))))
'(scroll-conservatively 1)
'(scroll-step 1)
'(sd-user-email "johndoty@microsoft.com")
'(sd-verbose nil)
'(show-paren-mode t)
'(show-paren-style (quote parenthesis))
'(solarized-termcolors 256)
'(tab-width 4)
'(tags-revert-without-query t)
'(transient-mark-mode t)
@ -45,6 +61,7 @@
'(use-dialog-box nil)
'(web-mode-code-indent-offset 2)
'(web-mode-css-indent-offset 2)
'(web-mode-enable-sql-detection t)
'(which-func-mode-global t nil (which-func))
'(widget-editable-list-gui t)
'(x-stretch-cursor nil))