diff options
Diffstat (limited to '.emacs.d/init.el')
| -rw-r--r-- | .emacs.d/init.el | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 4beac7b..a30a55c 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -19,7 +19,10 @@ (let ((loaddefs (concat directory "/loaddefs.el"))) (when (file-exists-p loaddefs) (load loaddefs)))) - '("~/var/src/emacs/dispass.el" "~/var/src/emacs/mode-icons"))) + '("~/var/src/emacs/dispass.el" "~/var/src/emacs/mode-icons")) + (mapc #'(lambda (dir) + (add-to-list 'custom-theme-load-path dir)) + '("~/var/src/emacs/yoshi-theme"))) (require 'geiser-install) (require 'iso-transl) @@ -138,6 +141,7 @@ (setq-default tab-width 4) (setq-default truncate-lines t) +(setq appt-disp-window-function #'oni:appt-display-window-and-jabber) (setq appt-display-diary nil) (setq auto-mode-case-fold nil) (setq auto-save-file-name-transforms @@ -250,13 +254,13 @@ (setq jabber-chat-buffer-format "*jabber:%n*") (setq jabber-chat-buffer-show-avatar nil) (setq jabber-chat-fill-long-lines nil) -(setq jabber-chat-foreign-prompt-format "%t < ") -(setq jabber-chat-local-prompt-format "%t > ") +(setq jabber-chat-foreign-prompt-format "%t <\n") +(setq jabber-chat-local-prompt-format "%t >\n") (setq jabber-chatstates-confirm nil) (setq jabber-history-dir "~/.emacs.d/jabber") (setq jabber-roster-show-bindings nil) (setq jit-lock-defer-time 0.2) -(setq magit-repo-dirs '("~/var/src/")) +(setq magit-repo-dirs '("~/projects/" "~/var/src/")) (setq message-log-max 1000) (setq message-send-mail-function 'message-send-mail-with-sendmail) (setq message-sendmail-extra-arguments '("-a" "ryuslash")) @@ -283,6 +287,9 @@ (setq split-height-threshold 40) (setq time-stamp-active t) (setq time-stamp-format "%04y-%02m-%02d %02H:%02M:%02S (%u)") +(setq type-break-good-rest-interval (* 60 10)) +(setq type-break-interval (* 60 50)) +(setq type-break-keystroke-threshold '(nil . nil)) (setq uniquify-buffer-name-style 'post-forward) (setq use-dialog-box nil) (setq user-full-name "Tom Willemsen") @@ -356,6 +363,11 @@ (global-set-key (kbd "M-4") 'split-window-horizontally) (global-set-key (kbd "M-n") 'idomenu) (global-set-key (kbd "\"") 'oni:self-insert-dwim) +(global-set-key (kbd "M-o") 'other-window) +(global-set-key (kbd "M-1") 'delete-other-windows) +(global-set-key (kbd "M-2") 'split-window-below) +(global-set-key (kbd "M-3") 'split-window-right) +(global-set-key (kbd "M-0") 'delete-window) (if (daemonp) (global-set-key "\C-x\C-c" 'oni:close-client-window)) |