From a945e25fffd7ae2499e1744e0309ecd4b19135a1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 15 Apr 2017 16:41:13 -0400 Subject: emacs: pull things out of custom.el --- .config/emacs/custom.el | 16 ---------------- .config/emacs/init.el | 11 ++++++++++- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el index ac20ba1..f5d9860 100644 --- a/.config/emacs/custom.el +++ b/.config/emacs/custom.el @@ -6,11 +6,7 @@ '(ansi-color-names-vector ["#212526" "#ff4b4b" "#b4fa70" "#fce94f" "#729fcf" "#e090d7" "#8cc4ff" "#eeeeec"]) '(custom-enabled-themes (quote (tsdh-dark))) - '(custom-safe-themes - (quote - ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default))) '(erc-nick "lukeshu") - '(explicit-shell-file-name "/bin/bash") '(graphviz-dot-auto-indent-on-semi nil) '(org-latex-default-packages-alist (quote @@ -32,12 +28,6 @@ '(org-latex-pdf-process (quote ("xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f"))) - '(org-src-fontify-natively t) - '(package-selected-packages - (quote - (wanderlust yaml-mode scss-mode nginx-mode markdown-mode less-css-mode haml-mode graphviz-dot-mode go-mode glsl-mode php-mode php-mode-improved coffee-mode bison-mode smart-tabs-mode page-break-lines dtrt-indent))) - '(ruby-deep-arglist nil) - '(ruby-deep-indent-paren nil) '(safe-local-variable-values (quote ((Fill-Column . 64) @@ -60,12 +50,6 @@ (Nginx-indent-level . 4) (Nginx-indent-level . 8) (c-set-style . "K&R")))) - '(scroll-bar-mode nil) - '(send-mail-function (quote smtpmail-send-it)) - '(smtpmail-smtp-server "plus.smtp.mail.yahoo.com") - '(smtpmail-smtp-service 587) - '(tramp-use-ssh-controlmaster-options nil) - '(uniquify-buffer-name-style (quote post-forward-angle-brackets) nil (uniquify)) '(use-package-verbose (quote debug))) (custom-set-faces ;; custom-set-faces was added by Custom. diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 200daad..1a5d719 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -90,6 +90,12 @@ (set (make-local-variable 'tab-width) 2) (set (make-local-variable 'indent-tabs-mode) nil) ))) +(use-package graphviz-dot-mode + :mode ("\\.dot\\'" "\\.gv\\'") + :config (add-hook 'graphviz-dot-mode-hook + '(lambda () + (set (make-local-variable 'graphviz-dot-auto-indent-on-semi) nil) + ))) ;;(use-package php-mode-improved ;; :mode (("\\.php[s34]?\\'" . php-mode) ;; ("\\.phtml\\'" . php-mode) @@ -101,7 +107,6 @@ (use-package cmake-mode :mode ("CMakeLists\\.txt\\'" "\\.cmake\\'")) (use-package glsl-mode :mode ("\\.vert\\'" "\\.frag\\'" "\\.geom\\'" "\\.glsl\\'")) (use-package go-mode :mode "\\.go\\'") -(use-package graphviz-dot-mode :mode ("\\.dot\\'" "\\.gv\\'")) (use-package haml-mode :mode "\\.haml\\'") (use-package less-css-mode :mode "\\.less\\'") (use-package markdown-mode :mode ("\\.markdown\\'" "\\.md\\'" "\\.ronn\\'")) @@ -128,6 +133,7 @@ ;; Misc. crap (when (fboundp 'tool-bar-mode) (tool-bar-mode -1)) +(when (fboundp 'scroll-bar-mode) (scroll-bar-mode -1)) (setq inhibit-startup-screen t) (setq-default truncate-lines t) @@ -311,4 +317,7 @@ sh-script.el is broken." (add-to-list 'auto-mode-alist '("\\.mak\\'" . makefile-gmake-mode)) (add-to-list 'auto-mode-alist '("\\.jad\\'" . java-mode)) + +;; Anything that gets magically appended ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (put 'downcase-region 'disabled nil) -- cgit v1.1-4-g5e80