From 336021fc03ee8a2ae27458087c4928b6f4f8d77c Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 16 Oct 2012 09:59:47 +0200 Subject: [PATCH 01/12] .Xdefaults --- .Xdefaults | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.Xdefaults b/.Xdefaults index a626c06..a3a896d 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -16,9 +16,8 @@ urxvt.perl-ext-common: default,matcher,searchable-scrollback urxvt.urlLauncher: conkeror urxvt.matcher.button: 1 -urxvt.font: xft:Press Start 2P-10 -! xft:Monaco:weight=medium:pixelsize=18 -! urxvt.boldFont: xft:Monaco:weight=black:pixelsize=18 +urxvt.font: xft:Monaco:weight=medium:pixelsize=18 +urxvt.boldFont: xft:Monaco:weight=black:pixelsize=18 ! urxvt.italicFont: xft:Monaco:slant=italic:pixelsize=18 urxvt.background: #111113 From e0f1cc78a219cc386c6895d4f354f378e319448a Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 16 Oct 2012 10:03:37 +0200 Subject: [PATCH 02/12] .conkerorrc/init.js --- .conkerorrc/init.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.conkerorrc/init.js b/.conkerorrc/init.js index 3d247ba..9608427 100644 --- a/.conkerorrc/init.js +++ b/.conkerorrc/init.js @@ -254,4 +254,16 @@ function read_url_github_command_handler(input) || read_url_github_repo_command_handler(input); } -read_url_handler_list = [read_url_github_command_handler]; +function read_url_local_port_handler(input) +{ + var m = /^lh (\d{1,5})$/.exec(input); + + if (m) { + return "http://localhost:" + m[1]; + } + + return null; +} + +read_url_handler_list = [read_url_local_port_handler, + read_url_github_command_handler]; From f60cb771b6ba21e04526f727dd2956543901d0ba Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 16 Oct 2012 10:04:03 +0200 Subject: [PATCH 03/12] .emacs.d/init.el --- .emacs.d/init.el | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index e6bd973..e2d6da8 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -175,14 +175,17 @@ (setq flymake-gui-warnings-enabled nil) (setq flymake-info-line-regexp (eval-when-compile - (regexp-opt '("Invalid name")))) + (regexp-opt '("Invalid name" + "Missing docstring" + "multiple imports on one line" + "expected 2 blank lines, found 1" + "TODO:")))) (setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log")) (setq flymake-log-level 0) (setq flymake-warn-line-regexp (eval-when-compile (regexp-opt '("warning" "Warning" - "Missing docstring" "String statement has no effect" "No value passed for parameter" "imported but unused")))) @@ -230,10 +233,10 @@ (oni:email ryuslash at ninthfloor dot org) (oni:email thomas at aethon dot nl))) (setq org-agenda-custom-commands - '(("b" "Bookmarks to look at." - todo "LOOKAT") - ("w" "Work todo." - tags-todo "CATEGORY=\"Work\""))) + '(("wt" "Work todo." + tags-todo "CATEGORY=\"Work\"") + ("wm" "Myaethon2 todo." + tags-todo "CATEGORY=\"myaethon2\""))) (setq org-agenda-sorting-strategy '((agenda habit-down time-up priority-down category-keep) (todo priority-down category-up) From 0c6b068a8f11345d804da3994659167ea013a06f Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 16 Oct 2012 10:04:32 +0200 Subject: [PATCH 04/12] .emacs.d/site-lisp/oni.el --- .emacs.d/site-lisp/oni.el | 1 - 1 file changed, 1 deletion(-) diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 2338ecc..4103dca 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -373,7 +373,6 @@ When dealing with braces, add another line and indent that too." (defun oni:org-mode-func () "Function for `org-mode-hook'." - (flyspell-mode) (auto-fill-mode) (yas-minor-mode)) From aaf6d4a717e3a4655e66bcfe806b4a0060132cd7 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 16 Oct 2012 10:17:11 +0200 Subject: [PATCH 05/12] .emacs.d/themes/new-theme.el --- .emacs.d/themes/new-theme.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.emacs.d/themes/new-theme.el b/.emacs.d/themes/new-theme.el index 1d5a454..da9df4a 100644 --- a/.emacs.d/themes/new-theme.el +++ b/.emacs.d/themes/new-theme.el @@ -30,9 +30,9 @@ (custom-theme-set-faces 'new '(default ((t (:background "#111113" :foreground "#eeeeec")))) - '(flymake-errline ((t (:background nil :underline (:color "#ff5555" :style wave))))) - '(flymake-infoline ((t (:background nil :underline (:color "#55ff55" :style wave))))) - '(flymake-warnline ((t (:background nil :underline (:color "#5555ff" :style wave))))) + '(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))))) '(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")))) From 567b4a61efff68eec16918393a75eb5a23794306 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 16 Oct 2012 10:17:25 +0200 Subject: [PATCH 06/12] .xinitrc --- .xinitrc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) mode change 100644 => 100755 .xinitrc diff --git a/.xinitrc b/.xinitrc old mode 100644 new mode 100755 index af2e551..d4a7db4 --- a/.xinitrc +++ b/.xinitrc @@ -1,6 +1,14 @@ - +#!/bin/bash xmodmap ~/.Xmodmap +# Source scripts in /etc/X11/xinit/xinitrc.d/ +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for f in /etc/X11/xinit/xinitrc.d/*; do + [ -x "$f" ] && . "$f" + done + unset f +fi + { emacs --daemon & } && sleep 1 pidof mpdscribble >& /dev/null @@ -9,7 +17,5 @@ then mpdscribble & fi -# rox -b Default - test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\"" exec $wm From b94d80ca40f8bfcfddc85e8df9c1272c79436e8f Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 17 Oct 2012 00:26:23 +0200 Subject: [PATCH 07/12] .Xdefaults --- .Xdefaults | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.Xdefaults b/.Xdefaults index a3a896d..754b23a 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -12,9 +12,14 @@ urxvt.termName: rxvt-256color urxvt.visualBell: true urxvt.perl-lib: /usr/lib/urxvt/perl/ -urxvt.perl-ext-common: default,matcher,searchable-scrollback +urxvt.perl-ext-common: default,url-select urxvt.urlLauncher: conkeror +urxvt.url-select.launcher: conkeror urxvt.matcher.button: 1 +urxvt.keysym.M-Escape: perl:keyboard-select:activate +urxvt.keysym.M-s: perl:keyboard-select:search + +urxvt.keysym.M-u: perl:url-select:select_next urxvt.font: xft:Monaco:weight=medium:pixelsize=18 urxvt.boldFont: xft:Monaco:weight=black:pixelsize=18 From 61a0d711cd2e2d4853070c82a2ebffa0f0338df6 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 17 Oct 2012 00:37:24 +0200 Subject: [PATCH 08/12] .Xdefaults --- .Xdefaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.Xdefaults b/.Xdefaults index 754b23a..7678eaf 100644 --- a/.Xdefaults +++ b/.Xdefaults @@ -12,7 +12,7 @@ urxvt.termName: rxvt-256color urxvt.visualBell: true urxvt.perl-lib: /usr/lib/urxvt/perl/ -urxvt.perl-ext-common: default,url-select +urxvt.perl-ext-common: default,url-select,keyboard-select urxvt.urlLauncher: conkeror urxvt.url-select.launcher: conkeror urxvt.matcher.button: 1 From e3a2616488bf57d5b8dfb4cb00cedad50f387bfa Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 17 Oct 2012 00:38:18 +0200 Subject: [PATCH 09/12] .emacs.d/site-lisp/oni.el --- .emacs.d/site-lisp/oni.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 4103dca..c483278 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -24,6 +24,8 @@ ;;; Code: +(autoload 'notifications-notify "notifications") + (defmacro oni:define-mailbox (name email &optional signature longname) "Define a mailbox function for mailbox NAME with address EMAIL. Optionally set signature to SIGNATURE and use LONGNAME as the @@ -217,6 +219,10 @@ If COUNT has been specified indent by that much, otherwise look at (setq count tab-width)) (indent-rigidly start end count))) +(defun oni:jabber-alert-message-func (from buffer text title) + (notifications-notify :title title + :body text)) + (defun oni:jabber-chat-mode-func () "Function for `jabber-chat-mode-hook'." (visual-line-mode) From 4631acd02daf4e726ce28b1c7b024789d7a12251 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 17 Oct 2012 00:38:29 +0200 Subject: [PATCH 10/12] .emacs.d/init.el --- .emacs.d/init.el | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index e2d6da8..b8963b2 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -91,6 +91,9 @@ (eval-after-load "info" '(require 'info+)) +(eval-after-load "jabber" + '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)) + (eval-after-load "org" '(progn (require 'appt) @@ -214,7 +217,7 @@ (setq jabber-history-dir "~/.emacs.d/jabber") (setq jabber-roster-show-bindings nil) (setq jit-lock-defer-time 0.2) -(setq mail-header-separator "") +(setq magit-repo-dirs '("~/var/src/")) (setq message-log-max 1000) (setq message-send-mail-function 'message-send-mail-with-sendmail) (setq mode-line-position nil) @@ -345,6 +348,7 @@ (add-hook 'go-mode-hook 'oni:go-mode-func) (add-hook 'gtags-mode-hook 'oni:gtags-mode-func) (add-hook 'html-mode-hook 'oni:html-mode-func) +(add-hook 'jabber-alert-message-hooks 'oni:jabber-alert-message-func) (add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func) (add-hook 'jabber-roster-mode-hook 'oni:jabber-roster-mode-func) (add-hook 'java-mode-hook 'oni:java-mode-func) @@ -372,6 +376,7 @@ (global-set-key (kbd "") 'oni:raise-scratch) (global-set-key (kbd "") 'oni:view-mail) (global-set-key (kbd "") 'oni:start-emms) +(global-set-key (kbd "") 'git-project-show-files) (global-set-key (kbd "") 'ext:reload-buffer) (global-set-key (kbd "") 'jabber-switch-to-roster-buffer) (global-set-key (kbd "") 'magit-status) @@ -422,6 +427,8 @@ '("^\\*.*\\*$" . ((bw-display-in-bottom-window . nil)))) (add-to-list 'display-buffer-alist '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil)))) +(add-to-list 'display-buffer-alist + '("^\\*git-project-list\\*$" . ((git-project-show-window . nil)))) (delete " " mode-line-format) From 0d9865695446e9db150c49d7d39b7f92570f6eb3 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 17 Oct 2012 00:38:47 +0200 Subject: [PATCH 11/12] .emacs.d/themes/new-theme.el --- .emacs.d/themes/new-theme.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.emacs.d/themes/new-theme.el b/.emacs.d/themes/new-theme.el index da9df4a..04f9930 100644 --- a/.emacs.d/themes/new-theme.el +++ b/.emacs.d/themes/new-theme.el @@ -44,10 +44,12 @@ '(font-lock-variable-name-face ((t (:foreground "#c39cc3")))) '(highlight ((t (:background "#171719")))) '(ido-subdir ((t (:foreground "#ff5d55")))) + '(italic ((t (:slant italic)))) '(jabber-chat-prompt-foreign ((t (:foreground "#ff5d55")))) '(jabber-chat-prompt-local ((t (:foreground "#78a2c1")))) '(jabber-roster-user-online ((t (:foreground "#769ff2")))) '(link ((t (:foreground "#ffbb56" :underline t)))) + '(magit-item-highlight ((t (:weight bold)))) '(minibuffer-prompt ((t (:foreground "#78a2c1")))) '(mode-line ((t (:background "#222224" :foreground "#eeeeec" :box nil)))) '(mode-line-inactive ((t (:background "#171719" :foreground "#999999" :box nil)))) From b74622f11bacbb696f3cba17f399b0ea77f76dbd Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 17 Oct 2012 01:01:12 +0200 Subject: [PATCH 12/12] .emacs.d/init.el --- .emacs.d/init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index b8963b2..4f78780 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -393,6 +393,7 @@ (global-set-key (kbd "C-c c") 'org-capture) (global-set-key (kbd "C-c i p") 'identica-update-status-interactive) (global-set-key (kbd "C-c p") 'oni:show-buffer-position) +(global-set-key (kbd "C-c t") 'ansi-term) (global-set-key (kbd "C-d") 'oni:kill-region-or-forward-char) (global-set-key (kbd "C-e") 'oni:move-end-of-dwim) (global-set-key (kbd "C-k") 'oni:kill-region-or-line)