summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKyle Meyer <meyerkya@gmail.com>2013-01-02 21:35:14 -0500
committerKyle Meyer <meyerkya@gmail.com>2013-01-02 21:35:28 -0500
commit404c901c3ad85458e4ec171782a1b5020d3f04bb (patch)
tree5a86c4c0bdeedcc445046196de5152db855ef097 /conf
parent855cf4357c91cde0f5779415ef02896adc9b1a24 (diff)
downloademacs.d-404c901c3ad85458e4ec171782a1b5020d3f04bb.tar.gz
config file cleanup
Diffstat (limited to 'conf')
-rw-r--r--conf/em.el14
-rw-r--r--conf/ev.el4
-rw-r--r--conf/ibuf.el16
-rw-r--r--conf/om.el94
-rw-r--r--conf/pkg.el2
-rw-r--r--conf/tex.el4
6 files changed, 67 insertions, 67 deletions
diff --git a/conf/em.el b/conf/em.el
index 6441ce0..b919d85 100644
--- a/conf/em.el
+++ b/conf/em.el
@@ -14,11 +14,11 @@
(add-hook 'ess-mode-hook (lambda ()
(setq ess-indent-level 4)))
-;(require 'dired+)
+;;(require 'dired+)
;; shell scripts
(add-hook 'sh-mode-hook (lambda ()
- (setq sh-basic-offset 4)))
+ (setq sh-basic-offset 4)))
;; set location of custom.el
(setq custom-file "~/.emacs.d/custom.el")
@@ -34,7 +34,7 @@
;; splash screen
(setq inhibit-splash-screen t
- initial-scratch-message nil)
+ initial-scratch-message nil)
(scroll-bar-mode -1)
(tool-bar-mode -1)
@@ -48,7 +48,7 @@
(setq-default indicate-empty-lines t)
(when (not indicate-empty-lines)
- (toggle-indicate-empty-lines))
+ (toggle-indicate-empty-lines))
(setq echo-keystrokes 0.1
@@ -58,9 +58,9 @@
;; store all backup and autosave files in the tmp dir
(setq backup-directory-alist
- `((".*" . ,temporary-file-directory)))
+ `((".*" . ,temporary-file-directory)))
(setq auto-save-file-name-transforms
- `((".*" ,temporary-file-directory t)))
+ `((".*" ,temporary-file-directory t)))
;; revert buffers automatically when underlying files are changed externally
(global-auto-revert-mode t)
@@ -85,7 +85,7 @@
recentf-max-saved-items 200
recentf-max-menu-items 15)
(recentf-mode t)
-; from prelude
+;; from prelude
(defun recentf-ido-find-file ()
"Find a recent file using ido."
(interactive)
diff --git a/conf/ev.el b/conf/ev.el
index 632cb78..4c1030d 100644
--- a/conf/ev.el
+++ b/conf/ev.el
@@ -18,7 +18,7 @@
(interactive)
(save-buffer)
(kill-this-buffer)
-)
+ )
(defun my-back-one-window ()
"Go back one windo"
@@ -37,7 +37,7 @@
(define-key evil-normal-state-map ",a" 'org-archive-subtree)
(fset 'comment-this-line ;; this depends on evil bindings
- "0v$,c")
+ "0v$,c")
(define-key evil-normal-state-map ",c" 'comment-this-line)
;; for simult keys
diff --git a/conf/ibuf.el b/conf/ibuf.el
index da71b8e..8bda6e9 100644
--- a/conf/ibuf.el
+++ b/conf/ibuf.el
@@ -34,13 +34,13 @@
(name . "\*info\*")
(name . "^\\*Completions\\*$"))))))
- (add-hook 'ibuffer-mode-hook
- '(lambda ()
- (ibuffer-auto-mode 1) ; keep buffer list up-to-date
- (ibuffer-switch-to-saved-filter-groups "home")))
+(add-hook 'ibuffer-mode-hook
+ '(lambda ()
+ (ibuffer-auto-mode 1) ; keep buffer list up-to-date
+ (ibuffer-switch-to-saved-filter-groups "home")))
- ;; do not prompt to delete unmodified buffers
- (setq ibuffer-expert t)
+;; do not prompt to delete unmodified buffers
+(setq ibuffer-expert t)
- ;; don't show empty filter groups
- (setq ibuffer-show-empty-filter-groups nil)
+;; don't show empty filter groups
+(setq ibuffer-show-empty-filter-groups nil)
diff --git a/conf/om.el b/conf/om.el
index 00cdf04..333d553 100644
--- a/conf/om.el
+++ b/conf/om.el
@@ -6,7 +6,7 @@
(setq org-todo-keywords
'((sequence "TODO" "STARTED" "|" "DONE" "NA")))
-;(setq org-agenda-files (list "~/notes/tasks.org"))
+ ;(setq org-agenda-files (list "~/notes/tasks.org"))
;; next 6 lines merged from prelude-org
(global-set-key "\C-cl" 'org-store-link)
@@ -14,22 +14,22 @@
(global-set-key "\C-cb" 'org-iswitchb)
(setq org-log-done t)
(defun prelude-org-mode-defaults ()
- (electric-indent-mode -1))
+ (electric-indent-mode -1))
;; allow for file to end in txt
(add-to-list 'auto-mode-alist '("\\.org.txt$" . org-mode))
;; set up capture
-;(setq org-default-notes-file (expand-file-name "~/notes/tasks.org"))
+;; (setq org-default-notes-file (expand-file-name "~/notes/tasks.org"))
(setq org-capture-templates
'(("c" "cal" entry (file+headline "~/notes/calendar.org" "misc")
- "* %?")
- ("t" "Todo" entry (file+headline "~/notes/tasks.org" "To file")
- "* TODO %?")
- ("m" "mail todo" entry (file+headline "~/notes/tasks.org" "mail")
- "* TODO %?\nSource: %u, %c\n%i")
- ("d" "mail date" entry (file+headline "~/notes/calendar.org" "mail")
- "* %?\nSource: %u, %c\n%i")))
+ "* %?")
+ ("t" "Todo" entry (file+headline "~/notes/tasks.org" "To file")
+ "* TODO %?")
+ ("m" "mail todo" entry (file+headline "~/notes/tasks.org" "mail")
+ "* TODO %?\nSource: %u, %c\n%i")
+ ("d" "mail date" entry (file+headline "~/notes/calendar.org" "mail")
+ "* %?\nSource: %u, %c\n%i")))
;; for mutt capture
(require 'org-protocol)
@@ -41,11 +41,11 @@
(defadvice org-capture-finalize (after delete-frame-at-end activate)
"Delete frame at capture finalization"
(progn (if my-org-protocol-flag (delete-frame))
- (setq my-org-protocol-flag nil)))
+ (setq my-org-protocol-flag nil)))
(defadvice org-capture-kill (after delete-frame-at-end activate)
"Delete frame at capture abort"
(progn (if my-org-protocol-flag (delete-frame))
- (setq my-org-protocol-flag nil)))
+ (setq my-org-protocol-flag nil)))
(defadvice org-protocol-capture (before set-org-protocol-flag activate)
(setq my-org-protocol-flag t))
@@ -53,7 +53,7 @@
'(org-agenda-files (quote ("~/notes/calendar.org" "~/notes/tasks.org")))
'(org-default-notes-file "~/notes/tasks.org")
'(org-agenda-ndays 7)
-; '(org-deadline-warning-days 14)
+;; '(org-deadline-warning-days 14)
'(org-agenda-show-all-dates t)
'(org-agenda-skip-deadline-if-done t)
'(org-agenda-skip-scheduled-if-done t)
@@ -62,19 +62,19 @@
'(org-fast-tag-selection-single-key (quote expert))
'(org-agenda-custom-commands
(quote (("d" todo "DONE" nil)
- ("s" todo "STARTED" nil)
- ("A" agenda ""
- ((org-agenda-skip-function
- (lambda nil
- (org-agenda-skip-entry-if (quote notregexp) "\\=.*\\[#A\\]")))
- (org-agenda-ndays 1)
- (org-agenda-overriding-header "Today's Priority #A tasks: ")))
- ("u" alltodo ""
- ((org-agenda-skip-function
- (lambda nil
- (org-agenda-skip-entry-if (quote scheduled) (quote deadline)
- (quote regexp) "\n]+>")))
- (org-agenda-overriding-header "Unscheduled TODO entries: ")))))))
+ ("s" todo "STARTED" nil)
+ ("A" agenda ""
+ ((org-agenda-skip-function
+ (lambda nil
+ (org-agenda-skip-entry-if (quote notregexp) "\\=.*\\[#A\\]")))
+ (org-agenda-ndays 1)
+ (org-agenda-overriding-header "Today's Priority #A tasks: ")))
+ ("u" alltodo ""
+ ((org-agenda-skip-function
+ (lambda nil
+ (org-agenda-skip-entry-if (quote scheduled) (quote deadline)
+ (quote regexp) "\n]+>")))
+ (org-agenda-overriding-header "Unscheduled TODO entries: ")))))))
;; other customization in prelude's org module
@@ -111,10 +111,10 @@
(always-insert-item)
(evil-append nil)
))
- ; mark a TODO item as DONE
- ; s - status
+ ; mark a TODO item as DONE
+ ; s - status
(evil-define-key 'normal org-mode-map ",s" 'org-todo)
- ;change bullet style
+ ;change bullet style
(evil-define-key 'normal org-mode-map "-" 'org-cycle-list-bullet)
;; (evil-define-key 'normal org-mode-map "L" 'org-shiftright)
;; (evil-define-key 'normal org-mode-map "H" 'org-shiftleft)
@@ -129,32 +129,32 @@
(evil-define-key 'normal org-mode-map (kbd "M-K") 'org-shiftmetaup)
(evil-define-key 'normal org-mode-map (kbd "M-J") 'org-shiftmetadown)
-;; ;;; org agenda -- leave in emacs mode but add j & k
-;; (define-key org-agenda-mode-map "j" 'evil-next-line)
-;; (define-key org-agenda-mode-map "k" 'evil-previous-line))
- ))
+ ;; ;;; org agenda -- leave in emacs mode but add j & k
+ ;; (define-key org-agenda-mode-map "j" 'evil-next-line)
+ ;; (define-key org-agenda-mode-map "k" 'evil-previous-line))
+ ))
-; from http://doc.norang.ca/org-mode.html
+;; from http://doc.norang.ca/org-mode.html
(setq org-refile-targets (quote ((nil :maxlevel . 5)
(org-agenda-files :maxlevel . 5))))
-; Stop using paths for refile targets - we file directly with IDO
+;; Stop using paths for refile targets - we file directly with IDO
(setq org-refile-use-outline-path nil)
-; Targets complete directly with IDO
+;; Targets complete directly with IDO
(setq org-outline-path-complete-in-steps nil)
-; Allow refile to create parent tasks with confirmation
+;; Allow refile to create parent tasks with confirmation
(setq org-refile-allow-creating-parent-nodes (quote confirm))
-; Use IDO for both buffer and file completion and ido-everywhere to t
+;; Use IDO for both buffer and file completion and ido-everywhere to t
(setq org-completion-use-ido t)
(setq ido-everywhere t)
(setq ido-max-directory-size 100000)
(ido-mode (quote both))
;;;; Refile settings
-; Exclude DONE state tasks from refile targets
+;; Exclude DONE state tasks from refile targets
(defun bh/verify-refile-target ()
"Exclude todo keywords with a done state from refile targets"
(not (member (nth 2 (org-heading-components)) org-done-keywords)))
@@ -164,14 +164,14 @@
;; set up babel languages
(org-babel-do-load-languages
'org-babel-load-languages
- '( (perl . t)
- (sh . t)
- (python . t)
- (R . t)
- (emacs-lisp . t)
- (latex . t)
- (ditaa . t)
- ))
+ '( (perl . t)
+ (sh . t)
+ (python . t)
+ (R . t)
+ (emacs-lisp . t)
+ (latex . t)
+ (ditaa . t)
+ ))
;; don't ask for confirmation before running code
(setq org-confirm-babel-evaluate nil)
diff --git a/conf/pkg.el b/conf/pkg.el
index 5519854..5599d42 100644
--- a/conf/pkg.el
+++ b/conf/pkg.el
@@ -12,7 +12,7 @@
undo-tree
org
ess
- lua-mode
+ lua-mode
)
"Default packages")
diff --git a/conf/tex.el b/conf/tex.el
index ed35fba..94886e0 100644
--- a/conf/tex.el
+++ b/conf/tex.el
@@ -9,8 +9,8 @@
;; for viewing in-frame
;;http://www.sigmafield.org/2009/10/03/using-doc-view-with-auto-revert-to-view-latex-pdf-output-in-emacs/
-;(setq TeX-PDF-mode t)
-;(add-hook 'doc-view-mode-hook 'auto-revert-mode)
+ ;(setq TeX-PDF-mode t)
+ ;(add-hook 'doc-view-mode-hook 'auto-revert-mode)
;; reftex
;; mostly from http://www.kieranhealy.org/esk/starter-kit-latex.html