diff options
Diffstat (limited to '.emacs.d')
-rw-r--r-- | .emacs.d/gnus.el | 36 | ||||
-rw-r--r-- | .emacs.d/init.el | 12 | ||||
-rw-r--r-- | .emacs.d/site-lisp/oni.el | 8 | ||||
-rw-r--r-- | .emacs.d/site-lisp/org-init.el | 25 | ||||
-rw-r--r-- | .emacs.d/themes/yoshi-theme.el | 14 |
5 files changed, 57 insertions, 38 deletions
diff --git a/.emacs.d/gnus.el b/.emacs.d/gnus.el index 503aa1d..d040fd1 100644 --- a/.emacs.d/gnus.el +++ b/.emacs.d/gnus.el @@ -1,27 +1,22 @@ -(setq gnus-select-method '(nntp "news.eternal-september.org")) +(setq gnus-select-method '(nntp "news.gmane.org")) (setq gnus-secondary-select-methods '((nnmaildir "gmail" (directory "~/documents/mail/gmail/")) (nnmaildir "ninthfloor" (directory "~/documents/mail/ninthfloor/")) - (nnmaildir "arch" - (directory "~/documents/mail/arch/")) (nnmaildir "aethon" (directory "~/documents/mail/aethon/")) (nnmaildir "ryuslash" - (directory "~/documents/mail/ryuslash.org/")) - (nntp "news.gmane.org"))) - + (directory "~/documents/mail/ryuslash.org/")))) + ; (nntp "news.gmane.org")) (setq gnus-auto-subscribed-groups nil) (setq gnus-save-newsrc-file nil) (setq gnus-read-newsrc-file nil) (setq gnus-novice-user t) (setq gnus-article-truncate-lines nil) - (setq message-send-mail-function 'message-send-mail-with-sendmail) (setq sendmail-program "/usr/bin/msmtp") (setq message-sendmail-extra-arguments '("-a" "gmail")) - ;; (setq gnus-parameters ;; '(("gmail" ;; (display . all)) @@ -29,16 +24,19 @@ ;; (display . all) ;; ("arch" ;; (display . all))))) - (setq gnus-permanently-visible-groups - "\\(gmail\\|aethon\\|arch\\|ninthfloor\\|ryuslash\\):INBOX") - + (eval-when-compile + (regexp-opt '("gmail:inbox" + "aethon:inbox" + "ninthfloor:inbox" + "ryuslash:inbox")))) (setq nntp-marks-is-evil t) - (setq gnus-check-new-newsgroups nil) - (setq gnus-posting-styles '((".*" + (address "tom@ryuslash.org") + (eval (setq message-sendmail-extra-arguments '("-a" "ryuslash")))) + ("gmail:" (address "ryuslash@gmail.com") (eval (setq message-sendmail-extra-arguments '("-a" "gmail")))) ("ninthfloor:" @@ -50,18 +48,10 @@ ("aethon:" (address "thomas@aethon.nl") (signature-file "~/documents/work/aethon/signature.txt") - (eval (setq message-sendmail-extra-arguments '("-a" "aethon")))) - ("ryuslash:" - (address "tom@ryuslash.org") - (eval (setq message-sendmail-extra-arguments '("-a" "ryuslash")))))) - -(setq user-mail-address "ryuslash@gmail.com") + (eval (setq message-sendmail-extra-arguments '("-a" "aethon")))))) +(setq user-mail-address "tom@ryuslash.org") (setq user-full-name "Tom Willemsen") -(add-hook 'gnus-summary-mode-hook '(lambda () (linum-mode -1))) -(add-hook 'gnus-article-mode-hook '(lambda () (linum-mode -1))) -(add-hook 'gnus-group-mode-hook '(lambda () (linum-mode -1))) - ;-----[ BBDB ]-------------------------------------------------------- ;; (require 'bbdb) ;; (bbdb-initialize 'gnus 'message) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index d1c7355..cfe1e92 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -18,8 +18,7 @@ (add-to-list 'load-path directory) (let ((default-directory directory)) (normal-top-level-add-subdirs-to-load-path))) - '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp")) - (add-to-list 'load-path "~/.emacs.d/")) + '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))) (require 'ext) (require 'mode-icons) @@ -165,8 +164,7 @@ (vertical-scroll-bars . nil) (menu-bar-lines . nil) (tool-bar-lines . nil) - (font . "Monaco:pixelsize=16") - (left-fringe . 0))) + (font . "Monaco:pixelsize=16"))) (setq emms-source-file-default-directory "/mnt/music/") (setq erc-autojoin-channels-alist '(("freenode.net" "#ninthfloor" "#emacs" "#dispass"))) @@ -226,6 +224,7 @@ "Access to a protected member")))) (setq frame-title-format '(:eval (concat "emacs: " (buffer-name)))) (setq geiser-repl-history-filename "~/.emacs.d/geiser-history") +(setq gnus-init-file "~/.emacs.d/gnus") (setq gtags-auto-update t) (setq help-at-pt-display-when-idle t) (setq ido-auto-merge-delay-time 1000000) @@ -262,11 +261,11 @@ ("marmalade" . "http://marmalade-repo.org/packages/"))) (setq package-load-list '((htmlize "1.39") (lua-mode "20111107") - (python "0.24.2") all)) (setq php-function-call-face 'font-lock-function-name-face) (setq php-mode-force-pear t) (setq pony-tpl-indent-moves t) +(setq pretty-symbol-categories '(lambda relational logical)) (setq rainbow-delimiters-max-face-count 12) (setq redisplay-dont-pause t) (setq scroll-conservatively 101) @@ -414,8 +413,7 @@ (load "rudel-loaddefs.el") (unless (server-running-p) - (server-start) - (load "wm-init")) + (server-start)) (provide 'init) diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 32d84f4..cc16324 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -292,11 +292,13 @@ If COUNT has been specified indent by that much, otherwise look at (defun oni:markdown-mode-func () "Function for `markdown-mode-hook'." + (setq-local comment-auto-fill-only-comments nil) (auto-fill-mode) (whitespace-mode)) (defun oni:message-mode-func () "Function for `message-mode-hook'." + (setq-local comment-auto-fill-only-comments nil) (auto-fill-mode) (flyspell-mode) (ispell-change-dictionary (read-string "New dictionary: "))) @@ -561,5 +563,11 @@ for easy selection." "Function for `write-file-hooks'." (time-stamp)) +(define-skeleton html-tag + "Testing creation of an html tag" + "Tagname:" + "<" str ("Attribute: " " " str "=\"" (skeleton-read "Value: ") "\"") ">\n" + "</" str ">\n") + (provide 'oni) ;;; oni.el ends here diff --git a/.emacs.d/site-lisp/org-init.el b/.emacs.d/site-lisp/org-init.el index 7345f91..6f28432 100644 --- a/.emacs.d/site-lisp/org-init.el +++ b/.emacs.d/site-lisp/org-init.el @@ -34,13 +34,27 @@ '(org-crypt-use-before-save-magic)) (setq org-agenda-custom-commands - '(("wt" "Work todo." - tags-todo "CATEGORY=\"Work\"") - ("wm" "Myaethon2 todo." - tags-todo "CATEGORY=\"myaethon2\""))) + '(("pa" "Avandu" tags-todo "slug=\"avandu\"") + ("pb" "Blog" tags-todo "slug=\"blog\"") + ("pc" "Configuration" tags-todo "slug=\"configuration\"") + ("pd" "dispass.el" tags-todo "slug=\"dispass.el\"") + ("pD" "DVDroid" tags-todo "slug=\"dvdroid\"") + ("pe" "Eye on Manga" tags-todo "slug=\"eye-on-manga\"") + ("pG" "gDisPass" tags-todo "slug=\"gdispass\"") + ("pg" "gitto" tags-todo "slug=\"gitto\"") + ("pi" "Ideas" tags-todo "slug=\"ideas\"") + ("pM" "Maintenance" tags-todo "slug=\"maintenance\"") + ("pme" "Metal Express Radio.el" tags-todo + "slug=\"metal-express-radio.el\"") + ("pmo" "Mode Icons" tags-todo "slug=\"mode-icons\"") + ("pmy1" "myAethon" tags-todo "slug=\"myaethon\"") + ("pmy2" "myAethon2" tags-todo "slug=\"myaethon2\"") + ("ps" "Sawfish Naquadah theme" tags-todo + "slug=\"sawfish-naquadah-theme\"") + ("w" "Work todo." tags-todo "work"))) (setq org-agenda-sorting-strategy '((agenda habit-down time-up priority-down category-keep) - (todo priority-down tag-up category-up) + (todo priority-down category-keep) (tags priority-down category-keep) (search category-keep))) (setq org-agenda-tags-column -101) @@ -101,6 +115,7 @@ ("ACQUIRE" :background "red") ("IGNORED" :background "#555555"))) (setq org-use-fast-todo-selection t) +(setq org-use-property-inheritance '("slug")) (add-to-list 'org-modules 'habit) diff --git a/.emacs.d/themes/yoshi-theme.el b/.emacs.d/themes/yoshi-theme.el index 6836353..39f35f5 100644 --- a/.emacs.d/themes/yoshi-theme.el +++ b/.emacs.d/themes/yoshi-theme.el @@ -31,9 +31,11 @@ (custom-theme-set-faces 'yoshi '(default ((t (:background "#111113" :foreground "#eeeeec")))) - '(flymake-errline ((t (:background nil :underline (:color "#d16979" :style wave))))) - '(flymake-infoline ((t (:background nil :underline (:color "#4da5d1" :style wave))))) - '(flymake-warnline ((t (:background nil :underline (:color "#d19317" :style wave))))) + '(flymake-errline ((t (:background nil :underline (:color "#ff756e" :style wave))))) + '(flymake-infoline ((t (:background nil :underline (:color "#78a2c1" :style wave))))) + '(flymake-warnline ((t (:background nil :underline (:color "#ffbb56" :style wave))))) + '(flyspell-duplicate ((t (:underline (:color "#ffbb56" :style wave))))) + '(flyspell-incorrect ((t (:underline (:color "#ff756e" :style wave))))) '(font-lock-comment-delimiter-face ((t (:foreground "#a9a9a9" :slant italic :weight bold)))) '(font-lock-comment-face ((t (:foreground "#a9a9a9" :slant italic)))) '(font-lock-constant-face ((t (:foreground "#93d8d8")))) @@ -51,6 +53,12 @@ '(jabber-roster-user-online ((t (:foreground "#769ff2")))) '(link ((t (:foreground "#ffbb56" :underline t)))) '(magit-item-highlight ((t (:weight bold)))) + '(markdown-header-face-1 ((t (:height 1.5 :foreground "#78a2c1")))) + '(markdown-header-face-2 ((t (:height 1.4 :foreground "#93d8d8")))) + '(markdown-header-face-3 ((t (:height 1.3 :foreground "#9ad870")))) + '(markdown-header-face-4 ((t (:height 1.2 :foreground "#c39cc3")))) + '(markdown-header-face-5 ((t (:height 1.1 :foreground "#ff756e")))) + '(markdown-header-face-6 ((t (:height 1.0 :foreground "#a9a9a9")))) '(minibuffer-prompt ((t (:foreground "#78a2c1")))) '(mode-line ((t (:background "#222224" :foreground "#eeeeec" :box nil)))) '(mode-line-inactive ((t (:background "#171719" :foreground "#999999" :box nil)))) |