diff options
Diffstat (limited to '.config/emacs')
| -rw-r--r-- | .config/emacs/custom.el | 3 | ||||
| -rw-r--r-- | .config/emacs/init.el | 36 |
2 files changed, 22 insertions, 17 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el index ac20ba1..04c1bec 100644 --- a/.config/emacs/custom.el +++ b/.config/emacs/custom.el @@ -33,9 +33,6 @@ (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 diff --git a/.config/emacs/init.el b/.config/emacs/init.el index b7ee6df..200daad 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -2,19 +2,21 @@ ;; Hey, Emacs: -*- Indent-tabs-mode: nil -*- ;; Without (advice-add) it should work in older versions of Emacs 24. ;;;; Use XDG-ish locations ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(setq xdg-cache-home (file-name-as-directory (or (getenv "XDG_CACHE_HOME") "~/.cache"))) -(setq - package-user-dir (concat xdg-cache-home "emacs/elpa") - ido-save-directory-list-file (concat xdg-cache-home "emacs/ido.last.el") - el-get-dir (concat xdg-cache-home "emacs/el-get/") - eshell-directory-name (concat xdg-cache-home "emacs/eshell/") - wl-score-files-directory (concat xdg-cache-home "emacs/wl-score-files/") - elmo-msgdb-directory (concat xdg-cache-home "emacs/elmo-msgdb/") - elmo-cache-directory (concat xdg-cache-home "emacs/elmo-cache/") - auto-save-list-file-prefix (concat xdg-cache-home "emacs/auto-save-list/saves-") - tramp-persistency-file-name (concat xdg-cache-home "emacs/tramp-cache.el") - wl-init-file (concat user-emacs-directory "wl.el") - ) +(let ((xdg-cache-home (file-name-as-directory (or (getenv "XDG_CACHE_HOME") "~/.cache"))) + (xdg-data-home (file-name-as-directory (or (getenv "XDG_DATA_HOME") "~/.local/share")))) + (setq + wl-init-file (concat user-emacs-directory "wl.el") + eshell-directory-name (concat xdg-data-home "emacs/eshell/") ;; actually should be split between config and data + ido-save-directory-list-file (concat xdg-data-home "emacs/ido.last.el") + + package-user-dir (concat xdg-cache-home "emacs/elpa") + el-get-dir (concat xdg-cache-home "emacs/el-get/") + wl-score-files-directory (concat xdg-cache-home "emacs/wl-score-files/") + elmo-msgdb-directory (concat xdg-cache-home "emacs/elmo-msgdb/") + elmo-cache-directory (concat xdg-cache-home "emacs/elmo-cache/") + auto-save-list-file-prefix (concat xdg-cache-home "emacs/auto-save-list/saves-") + tramp-persistency-file-name (concat xdg-cache-home "emacs/tramp-cache.el") + )) (setq custom-file (concat user-emacs-directory "custom.el")) (load custom-file 'noerror) @@ -71,6 +73,7 @@ (smart-tabs-mode 1) (apply 'smart-tabs-insinuate (mapcar 'car smart-tabs-insinuate-alist)))) +(use-package editorconfig) ;; Major modes (use-package bison-mode :mode (("\\.l\\'" . bison-mode) @@ -95,7 +98,7 @@ ;; '(lambda () ;; (c-set-offset 'cpp-macro 0) ;; ))) -(use-package php-mode :mode ("\\.php[s345t]?\\'" "/\\.php_cs\\(\\.dist\\)?\\'" "\\.phtml\\'" "/Amkfile\\'" "\\.amk\\'")) +(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\\'")) @@ -103,6 +106,7 @@ (use-package less-css-mode :mode "\\.less\\'") (use-package markdown-mode :mode ("\\.markdown\\'" "\\.md\\'" "\\.ronn\\'")) (use-package nginx-mode :mode ("nginx\\.conf\\'" "/nginx/.+\\.conf\\'")) +(use-package php-mode :mode ("\\.php[s345t]?\\'" "/\\.php_cs\\(\\.dist\\)?\\'" "\\.phtml\\'" "/Amkfile\\'" "\\.amk\\'")) (use-package scss-mode :mode "\\.scss\\'") (use-package yaml-mode :mode "\\.e?ya?ml\\'") @@ -179,6 +183,10 @@ sh-script.el is broken." (if xterm-mouse-mode (xterm-mouse-mode 1)) ))) +;; Make TRAMP obey ~/.ssh/config for ControlMaster. For some reason, +;; customize doesn't correctly set this. +(setq tramp-use-ssh-controlmaster-options nil) + ;; Use mailcrypt to encrypt/decrypt email (when (require 'mailcrypt nil t) (mc-setversion "gpg") |