From 1e84d8bee4615c6ba54119c1c18d1c9b5f437fb1 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 6 Dec 2012 13:04:29 +0100 Subject: Change prompts for jabber This way all text is nicely alligned --- .emacs.d/init.el | 4 ++-- .emacs.d/site-lisp/oni.el | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to '.emacs.d') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 3763c4f..40bd732 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -252,8 +252,8 @@ (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) diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 2adf288..5b2cf65 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -234,8 +234,7 @@ If COUNT has been specified indent by that much, otherwise look at (visual-line-mode) (setq mode-line-format (append (cddr jabber-chat-header-line-format) '(global-mode-string)) - header-line-format nil - wrap-prefix (make-string 8 ?\ ))) + header-line-format nil)) (defun oni:jabber-roster-mode-func () "Function for `jabber-roster-mode-hook'." -- cgit v1.2.3-54-g00ecf From 777c6413a8785a2259408208a3ecd79ac5184fab Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 6 Dec 2012 16:37:27 +0100 Subject: Add sawfish feed to newsticker --- .emacs.d/site-lisp/newsticker-init.el | 3 +++ 1 file changed, 3 insertions(+) (limited to '.emacs.d') diff --git a/.emacs.d/site-lisp/newsticker-init.el b/.emacs.d/site-lisp/newsticker-init.el index da166d1..a1f5c74 100644 --- a/.emacs.d/site-lisp/newsticker-init.el +++ b/.emacs.d/site-lisp/newsticker-init.el @@ -95,6 +95,9 @@ nil nil nil) ("Recent Commits to python-django.el:master" "https://github.com/fgallina/python-django.el/commits/master.atom" + nil nil nil) + ("git.tuxfamily.org Git - sawfish.main.git/atom log" + "http://git.tuxfamily.org/sawfish/main.git?p=sawfish/main.git;a=atom" nil nil nil))) (setq newsticker-use-full-width nil) -- cgit v1.2.3-54-g00ecf From 614fcffbb7cc3d04d3ad7f4d2e0da86e452fdec2 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 6 Dec 2012 22:40:43 +0100 Subject: Send jabber message as appt reminders --- .emacs.d/init.el | 1 + .emacs.d/site-lisp/oni.el | 8 ++++++++ .emacs.d/site-lisp/org-init.el | 2 ++ 3 files changed, 11 insertions(+) (limited to '.emacs.d') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 40bd732..e62a2b0 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -140,6 +140,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 diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 5b2cf65..f636587 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -25,6 +25,7 @@ ;;; Code: (autoload 'notifications-notify "notifications") +(autoload 'jabber-send-message "jabber-chat") (defmacro oni:define-mailbox (name email &optional signature longname) "Define a mailbox function for mailbox NAME with address EMAIL. @@ -72,6 +73,13 @@ DOT are intentionally being skipped." (shell-command (concat "make -C " dom-dir " TAGS >/dev/null 2>&1"))))) +(defun oni:appt-display-window-and-jabber (min-to-app new-time appt-msg) + "Send a message to my phone jabber account." + (jabber-send-message (car jabber-connections) "phone@ryuslash.org" + nil (format "%s%s (in %s minutes)" + new-time appt-msg min-to-app) nil) + (appt-disp-window min-to-app new-time appt-msg)) + (defun oni:before-save-func () "Function for `before-save-hook'." (if (eq major-mode 'html-mode) diff --git a/.emacs.d/site-lisp/org-init.el b/.emacs.d/site-lisp/org-init.el index 3bacaad..793b453 100644 --- a/.emacs.d/site-lisp/org-init.el +++ b/.emacs.d/site-lisp/org-init.el @@ -93,6 +93,8 @@ (setq org-use-fast-todo-selection t) (setq org-use-property-inheritance '("slug")) +(add-hook 'org-agenda-mode-hook 'org-agenda-to-appt) + (add-to-list 'org-modules 'habit) (org-indent-mode t) -- cgit v1.2.3-54-g00ecf From 757a5fab184e8402cb41117da43439c877f33e8c Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 11 Dec 2012 01:44:49 +0100 Subject: Add the external yoshi-theme path to theme path --- .emacs.d/init.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.emacs.d') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index e62a2b0..3e18c11 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -20,7 +20,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) -- cgit v1.2.3-54-g00ecf From 0195a2c07cca4291b49b3ae6455b914917c4e0c6 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 11 Dec 2012 01:46:16 +0100 Subject: Emacs: Simplify window management keys Since `C-1..9' do the same as `M-1..9' and I never use the Meta ones, I seem to have a few keybindings available to me for such things as this. Now I just need to start using them... --- .emacs.d/init.el | 5 +++++ 1 file changed, 5 insertions(+) (limited to '.emacs.d') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 3e18c11..3595742 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -363,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)) -- cgit v1.2.3-54-g00ecf From b87a961130dabc2387e9ca1ff4c6b374fc27498f Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 11 Dec 2012 01:46:48 +0100 Subject: Emacs: Reset now-playing when stopping MER --- .emacs.d/site-lisp/metalexpress.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.emacs.d') diff --git a/.emacs.d/site-lisp/metalexpress.el b/.emacs.d/site-lisp/metalexpress.el index 2f77638..0c4539a 100644 --- a/.emacs.d/site-lisp/metalexpress.el +++ b/.emacs.d/site-lisp/metalexpress.el @@ -68,7 +68,8 @@ (defun metal-express-radio-stop () "Stop listening to Metal Express Radio." (interactive) - (kill-process (get-buffer-process "*Metal Express Radio*"))) + (kill-process (get-buffer-process "*Metal Express Radio*")) + (setq metal-express-radio-currently-playing nil)) (add-hook 'metal-express-radio-song-changed-hook 'metal-express-radio-echo-currently-playing) -- cgit v1.2.3-54-g00ecf From 361726f0dd35f5cebdec006cb785d9221a04c24e Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 11 Dec 2012 01:47:09 +0100 Subject: Emacs: Remove IBM developerworks feed --- .emacs.d/site-lisp/newsticker-init.el | 3 --- 1 file changed, 3 deletions(-) (limited to '.emacs.d') diff --git a/.emacs.d/site-lisp/newsticker-init.el b/.emacs.d/site-lisp/newsticker-init.el index a1f5c74..ba6eb2e 100644 --- a/.emacs.d/site-lisp/newsticker-init.el +++ b/.emacs.d/site-lisp/newsticker-init.el @@ -67,9 +67,6 @@ "http://news.ycombinator.com/rss" nil nil nil) ("HowtoForge - Linux Howtos and Tutorials -" "http://www.howtoforge.com/node/feed" nil nil nil) - ("IBM developerWorks : Linux" - "http://www.ibm.com/developerworks/views/linux/rss/libraryview.jsp" - nil nil nil) ("Linuxtoday.com" "http://linuxtoday.com/backend/biglt.rss" nil nil nil) ("Linux.com - Content Feed" -- cgit v1.2.3-54-g00ecf From 58dc871d0b99c7b99c7605418e27b628ecd5c83b Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Fri, 14 Dec 2012 00:16:57 +0100 Subject: Add type-break settings --- .emacs.d/init.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.emacs.d') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 3595742..61f14d7 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -262,7 +262,7 @@ (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")) @@ -289,6 +289,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") -- cgit v1.2.3-54-g00ecf From e124f8b7f4c44aa87edc1fab1b7a0b291d2ec181 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Fri, 14 Dec 2012 00:17:16 +0100 Subject: Add more RSS feeds --- .emacs.d/site-lisp/newsticker-init.el | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to '.emacs.d') diff --git a/.emacs.d/site-lisp/newsticker-init.el b/.emacs.d/site-lisp/newsticker-init.el index ba6eb2e..5d60850 100644 --- a/.emacs.d/site-lisp/newsticker-init.el +++ b/.emacs.d/site-lisp/newsticker-init.el @@ -95,7 +95,14 @@ nil nil nil) ("git.tuxfamily.org Git - sawfish.main.git/atom log" "http://git.tuxfamily.org/sawfish/main.git?p=sawfish/main.git;a=atom" - nil nil nil))) + nil nil nil) + ("BLABBERMOUTH.NET Latest News" + "http://feeds.feedburner.com/blabbermouth" nil nil nil) + ("QJ.NET" + "http://feeds.feedburner.com/QjGameNewsOpinionsBlogsandMore" + nil nil nil) + ("Beej's Bit Bucket" + "http://beej.us/blog/rss.xml" nil nil nil))) (setq newsticker-use-full-width nil) (provide 'newsticker-init) -- cgit v1.2.3-54-g00ecf From 86741f9a101b43e3700af56d4d74cbdf8672768f Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Fri, 14 Dec 2012 00:24:55 +0100 Subject: Update dzen code to handle weirder cases better --- .emacs.d/site-lisp/dzen.el | 49 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 13 deletions(-) (limited to '.emacs.d') diff --git a/.emacs.d/site-lisp/dzen.el b/.emacs.d/site-lisp/dzen.el index a28418b..2d43f95 100644 --- a/.emacs.d/site-lisp/dzen.el +++ b/.emacs.d/site-lisp/dzen.el @@ -27,20 +27,19 @@ (require 'newst-backend) (require 'sawfish) +(defvar dzen-process nil + "Dzen2's process.") + +(defvar dzen-timer nil + "Timer used to update the dzen line.") + (defun get-mail-count (account) (length (directory-files (concat "/home/slash/documents/mail/" account "/inbox/new") nil "^[^.]"))) -(defun dzen-start () - (interactive) - (let ((proc (start-process "dzen2" "*dzen2*" "dzen2" - "-w" "1920" - "-fn" "Monaco-12" - "-bg" "#222224" - "-fg" "#eeeeec")) - (strl (format - "%s" - (sawfish-eval-expression '(window-name (input-focus))))) +(defun dzen-update () + (let ((strl "") + (strc metal-express-radio-currently-playing) (strr (format "jabber: %s ryu: %d gm: %d aet: %d 9n: %d rss: %d\n" (oni:current-jabber-status) @@ -50,12 +49,36 @@ (get-mail-count "ninthfloor") (newsticker--stat-num-items-total 'new)))) (process-send-string - proc (format "^p(_LEFT)%s^p(_RIGHT)^p(-%d)%s" - strl (+ 9 (* 9 (length strr))) strr)))) + "dzen2" (format "%s^p(_CENTER)^p(-%d)%s^p(_RIGHT)^p(-%d)%s" + strl + (* (floor (/ (length strc) 2)) 8) strc + (+ 8 (* 8 (length strr))) strr)))) + +(defun dzen-start () + (interactive) + (if (or (null dzen-process) (not (process-live-p dzen-process))) + (progn + (setq dzen-process + (start-process "dzen2" "*dzen2*" "dzen2" + "-w" "1920" + "-fn" "Monaco-10" + "-bg" "#222224" + "-fg" "#eeeeec" + "-y" "1060")) + (dzen-update) + (setq dzen-timer (run-with-timer 1 1 #'dzen-update))) + (message "Dzen2 already running"))) (defun dzen-stop () (interactive) - (kill-process "dzen2")) + (if (and dzen-process (process-live-p dzen-process)) + (progn + (when dzen-timer + (cancel-timer dzen-timer)) + (kill-process "dzen2")) + (message "Dzen2 is not running")) + (setq dzen-process nil + dzen-timer nil)) (provide 'dzen) ;;; dzen.el ends here -- cgit v1.2.3-54-g00ecf