diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2015-02-06 14:19:48 -0500 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2015-02-06 14:19:48 -0500 |
commit | f50b49ef26f5c692bda1f3f13cd38f9f4f395300 (patch) | |
tree | e96baf161374421abc8acef998ccf1651c851992 /.config | |
parent | 124367bec1d392b4ae63d4479954225445996452 (diff) |
Pre-merge
Mostly re-organize emacs stuff
Diffstat (limited to '.config')
-rw-r--r-- | .config/X11/defaults | 3 | ||||
-rw-r--r-- | .config/emacs/custom.el | 4 | ||||
-rw-r--r-- | .config/emacs/init.el | 202 |
3 files changed, 100 insertions, 109 deletions
diff --git a/.config/X11/defaults b/.config/X11/defaults index 0508928..3c958ac 100644 --- a/.config/X11/defaults +++ b/.config/X11/defaults @@ -1,8 +1,5 @@ ! -*- Mode: Conf-xdefaults -*- -Emacs.FontBackend: xft -!Emacs.font: DejaVu Sans Mono-8 - ! "native" colors !URxvt.background: #000000 !URxvt.foreground: #CCCCCC diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el index 77ed6cd..646f467 100644 --- a/.config/emacs/custom.el +++ b/.config/emacs/custom.el @@ -17,9 +17,7 @@ '(safe-local-variable-values (quote ((Nginx-indent-tabs-mode) (Nginx-indent-level . 4) (Nginx-indent-level . 8)))) '(scroll-bar-mode nil) '(scss-compile-at-save nil) - '(send-mail-function (quote smtpmail-send-it)) - '(sh-basic-offset 8) - '(sh-indent-comment t)) + '(send-mail-function (quote smtpmail-send-it))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 7645690..c21e19b 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -1,14 +1,36 @@ ;; Preliminary settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;(set-default-font "DejaVu Sans Mono-8") -(set-face-attribute 'default nil :height 93) (setq notify-method 'notify-via-libnotify) (add-to-list 'load-path "~/.emacs.d/") -(add-to-list 'load-path "~/.emacs.d/el-get/el-get") (setq server-auth-dir (locate-user-emacs-file (concat "server-" (system-name) "/"))) (setq custom-file "~/.emacs.d/custom.el") -; derived from ELPA installation -; http://tromey.com/elpa/install.html +;;;; The basics that I can't use Emacs without ;;;;;;;;;;;;;;;;;;;;;;; +(show-paren-mode 1) +(column-number-mode 1) +(line-number-mode 1) +(ido-mode 1) +(when (require 'whitespace nil t) + (setq whitespace-style '( + tab-mark + space-mark + newline-mark + empty + )) + (global-set-key "\C-cw" 'global-whitespace-mode)) +(load custom-file 'noerror) + +;;;; Early settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; This isn't particularly important, but set it before doing a whole +;; lot (loading packages), so there isn't a weird change in text size. +(set-face-attribute 'default nil :height 93) + + +;;;; Bootstrap el-get ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; This downloads and installs el-get (package management) if isn't +;; installed. + +;; Derived from ELPA installation +;; http://tromey.com/elpa/install.html (defun eval-url (url) (let ((buffer (url-retrieve-synchronously url))) (save-excursion @@ -18,20 +40,16 @@ (eval-region (point) (point-max)) (kill-buffer (current-buffer))))) - ;; ELPA stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(unless (require 'package nil t) - (eval-url "http://tromey.com/elpa/package-install.el")) - -(setq package-archives '(("ELPA" . "http://tromey.com/elpa/") - ("marmalade" . "http://marmalade-repo.org/packages/") - ("gnu" . "http://elpa.gnu.org/packages/"))) +(add-to-list 'load-path "~/.emacs.d/el-get/el-get") +(unless (require 'el-get nil t) + (let ((el-get-install-branch "master")) ;; live life on the edge + (eval-url "https://github.com/dimitri/el-get/raw/master/el-get-install.el"))) -;; el-get stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;;;; Install packages ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(setq el-get-install-branch "master") ;; live life on the edge -(unless (require 'el-get nil t) - (eval-url "https://github.com/dimitri/el-get/raw/master/el-get-install.el")) +(add-to-list 'package-archives '("ELPA" . "http://tromey.com/elpa/")) +(add-to-list 'package-archives '("marmalade" . "http://marmalade-repo.org/packages/")) (setq el-get-sources '( (:name nxhtml @@ -41,80 +59,56 @@ :load "nxhtml/autostart.el") )) -(setq my-el-get-packages - '(el-get +(el-get 'sync '(el-get ; nxhtml apel flim semi wanderlust smarttabs )) -;; Now load all of that ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; ELPA -(package-initialize) -;; el-get -(when (require 'el-get nil t) (el-get 'sync my-el-get-packages)) -;; custom -(load custom-file 'noerror) - -;; General settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;(require 'go-mode-load) -;(require 'mailcrypt) -;(mc-setversion "gpg") -(add-hook 'wl-summary-mode-hook 'mc-install-read-mode) -(add-hook 'wl-mail-setup-hook 'mc-install-write-mode) - -(defun mc-wl-verify-signature () - (interactive) - (save-window-excursion - (wl-summary-jump-to-current-message) - (mc-verify))) - -(defun mc-wl-decrypt-message () - (interactive) - (save-window-excursion - (wl-summary-jump-to-current-message) - (let ((inhibit-read-only t)) - (mc-decrypt)))) - -(eval-after-load "mailcrypt" - '(setq mc-modes-alist - (append - (quote - ((wl-draft-mode (encrypt . mc-encrypt-message) - (sign . mc-sign-message)) - (wl-summary-mode (decrypt . mc-wl-decrypt-message) - (verify . mc-wl-verify-signature)))) - mc-modes-alist))) +;; Misc. crap -;(load "mdmua") -(load "emacsutils") - -(set-default 'truncate-lines t) (tool-bar-mode -1) -(ido-mode t) -(show-paren-mode 1) -(setq org-log-done 'time) -(setq gamegrid-user-score-file-directory "/var/games/emacs/") -;(xclip-mode 1) - -(load "whitespace") -(setq whitespace-style '( - tab-mark - space-mark - newline-mark - empty -)) - - -;; 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) +;(require 'go-mode-load) + +(when (require 'mailcrypt nil t) + (mc-setversion "gpg") + (add-hook 'wl-summary-mode-hook 'mc-install-read-mode) + (add-hook 'wl-mail-setup-hook 'mc-install-write-mode) + (defun mc-wl-verify-signature () + (interactive) + (save-window-excursion + (wl-summary-jump-to-current-message) + (mc-verify))) + (defun mc-wl-decrypt-message () + (interactive) + (save-window-excursion + (wl-summary-jump-to-current-message) + (let ((inhibit-read-only t)) + (mc-decrypt)))) + (eval-after-load "mailcrypt" + '(setq mc-modes-alist + (append + (quote + ((wl-draft-mode (encrypt . mc-encrypt-message) + (sign . mc-sign-message)) + (wl-summary-mode (decrypt . mc-wl-decrypt-message) + (verify . mc-wl-verify-signature)))) + mc-modes-alist))) + ) + +;; Indent settings +(setq-default + indent-tabs-mode t + tab-width 8 + c-basic-offset 8 + sh-basic-offset 8 + sh-indent-comment t + ) + +;; Backup settings (setq backup-by-copying t ;; don't clobber symlinks backup-directory-alist '(("." . "~/.emacs.d/saves")) ;; don't litter my fs tree @@ -122,17 +116,22 @@ kept-new-versions 6 kept-old-versions 2 version-control t ;; use versioned backups -) - -(setq column-number-mode t - inhibit-startup-screen t - line-number-mode t - server-use-tcp t - show-paren-mode t) + ) -(setq browse-url-generic-program (executable-find "v-www-browser") - browse-url-browser-function 'browse-url-generic) +;; Web browser settings +(setq + browse-url-generic-program (executable-find "v-www-browser") + browse-url-browser-function 'browse-url-generic + ) +;(load "mdmua") +(load "emacsutils") +(set-default 'truncate-lines t) +(setq inhibit-startup-screen t + server-use-tcp t) +(setq org-log-done 'time) +(setq gamegrid-user-score-file-directory "/var/games/emacs/") +;(xclip-mode 1) (defun toggle-fullscreen (&optional f) (interactive) @@ -142,13 +141,18 @@ (if (boundp 'old-fullscreen) old-fullscreen nil) (progn (setq old-fullscreen current-value) 'fullboth))))) - -;; Custom keybindings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - (global-set-key [f11] 'toggle-fullscreen) -(global-set-key "\C-cw" 'global-whitespace-mode) -;; mode-hooks ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Automatically load smerge mode for merge files +(defun sm-try-smerge () + (save-excursion + (goto-char (point-min)) + (when (re-search-forward "^<<<<<<< " nil t) + (smerge-mode 1)))) +(add-hook 'find-file-hook 'sm-try-smerge t) + + +;; Al my weird mode-specific settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (add-hook 'text-mode-hook 'turn-on-auto-fill) @@ -230,11 +234,3 @@ ;; ;; use imagemagick, if available ;; (when (fboundp 'imagemagick-register-types) ;; (imagemagick-register-types)) - - -(defun sm-try-smerge () - (save-excursion - (goto-char (point-min)) - (when (re-search-forward "^<<<<<<< " nil t) - (smerge-mode 1)))) -(add-hook 'find-file-hook 'sm-try-smerge t) |