Mercurial > dotfiles
changeset 306:ae22ef7859eb
Merge.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Tue, 04 Dec 2012 11:08:15 -0600 |
| parents | d9cc862e6308 (current diff) 139f30ce463a (diff) |
| children | e37b00236907 |
| files | |
| diffstat | 12 files changed, 280 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/.elisp/settings/00.bootstrap.el +++ b/.elisp/settings/00.bootstrap.el @@ -5,6 +5,7 @@ (package-initialize) (setq package-archives '(("durin42" . "http://durin42.com/elpa/") + ("marmalade" . "http://marmalade-repo.org/packages/") ("elpa" . "http://tromey.com/elpa/"))) (defun af-bootstrap-packages () @@ -24,7 +25,9 @@ paredit smex yaml-mode - company)) + company + wgrep + )) (unless (or (member pack package-activated-list) (functionp pack)) (message "Installing %s" (symbol-name pack))
--- a/.elisp/settings/40.modes.el +++ b/.elisp/settings/40.modes.el @@ -48,7 +48,6 @@ point." (local-set-key (kbd "RET") 'reindent-then-newline-and-indent))) (defun af-python-mode-hook () - (flyspell-prog-mode) ; highlight tabs in Python (make-variable-buffer-local 'font-lock-mode-hook) (make-variable-buffer-local 'python-indent)
--- a/.elisp/settings/50.localfuncs.el +++ b/.elisp/settings/50.localfuncs.el @@ -17,20 +17,26 @@ spends an eternity in a regex if you mak ad-do-it)) ;; Generic repository differ. Requires textmate.el and mercurial.el. +;; Will use monky or magit if either one is present. (defun af-generic-diff-repo () (interactive) (let ((root (textmate-project-root))) - (cd root) - (hg-view-output - ((format "project diff for %s" root)) - (call-process (textmate-project-root-type root) nil t nil "diff") - (diff-mode) - (setq diff (not (= (point-min) (point-max)))) - (font-lock-fontify-buffer) - (cd root)))) + (cond ((and (string= (textmate-project-root-type root) "hg") (fboundp 'monky-status)) (monky-status)) + ((and (string= (textmate-project-root-type root) "git") (fboundp 'magit-status)) (magit-status root)) + (t (progn + (cd root) + (hg-view-output + ((format "project diff for %s" root)) + (call-process (textmate-project-root-type root) nil t nil "diff") + (diff-mode) + (setq diff (not (= (point-min) (point-max)))) + (font-lock-fontify-buffer) + (cd root))))))) + (global-set-key [(control c)(t)(=)] 'af-generic-diff-repo) (global-set-key [(control c)(d)] 'af-generic-diff-repo) + (defun af-rotate-list (l) "Move the head of l to the end of the list." (append (cdr l) (list (car l))))
--- a/.elisp/settings/50.preferences.el +++ b/.elisp/settings/50.preferences.el @@ -72,7 +72,17 @@ (put 'narrow-to-region 'disabled nil) ;; whitespace detection -(setq whitespace-style '(trailing tabs lines-tail indentation trailing empty)) +(setq + whitespace-line-column 78 + whitespace-style '(face + trailing + space-after-tab + space-before-tab + lines-tail + indentation + empty + tabs) + ) (global-whitespace-mode 1) ;; Disable VC plumbing since I don't really use it that much anyway
--- a/.elisp/settings/80.go.el +++ b/.elisp/settings/80.go.el @@ -2,7 +2,7 @@ (defun af-go-hook () ;; enable tabs (setq tab-width 2) - (setq-default indent-tabs-mode t) + (setq indent-tabs-mode t) (make-variable-buffer-local 'whitespace-style) (setq whitespace-style '(trailing lines-tail indentation trailing empty)) )
--- a/.elisp/settings/90.colors.el +++ b/.elisp/settings/90.colors.el @@ -4,7 +4,10 @@ (cursor-color . "white") (cursor-type . box) (foreground-color . "white") - (background-color . "black"))) + (background-color . "black") + (tool-bar-lines . 0) + ) + initial-frame-alist default-frame-alist) ;; tell ipython we have a dark background (setq py-python-command-args (quote ("-i")))
--- a/.gitconfig +++ b/.gitconfig @@ -6,3 +6,5 @@ [color] diff = auto status = auto +[alias] + glog = log --graph --all --format=format:'%h - (%ar) - %an %at %d%n%s%n' --abbrev-commit --date=iso
new file mode 120000 --- /dev/null +++ b/.irssi/scripts/autorun/tmux_away.pl @@ -0,0 +1,1 @@ +../tmux_away.pl \ No newline at end of file
new file mode 100644 --- /dev/null +++ b/.irssi/scripts/tmux_away.pl @@ -0,0 +1,230 @@ +use Irssi; +use strict; +use FileHandle; + +use vars qw($VERSION %IRSSI); + +$VERSION = "0.9.7.1"; +%IRSSI = ( + authors => 'Andreas \'ads\' Scherbaum <ads@wars-nicht.de>, Moritz Wilhelmy <crap@wzff.de>', + name => 'tmux_away', + description => 'set (un)away, if tmux is attached/detached', + license => 'GPL v2', + url => 'none', +); + +# tmux_away irssi module +# +# written by Andreas 'ads' Scherbaum <ads@ufp.de> +# +# +# changes: +# 07.02.2004 fix error with away mode +# thanks to Michael Schiansky for reporting and fixing this one +# 07.08.2004 new function for changing nick on away +# 24.08.2004 fixing bug where the away nick was not storedcorrectly +# thanks for Harald Wurpts for help debugging this one +# 17.09.2004 rewrote init part to use $ENV{'STY'} +# 05.12.2004 add patch for remember away state +# thanks to Jilles Tjoelker <jilles@stack.nl> +# change "chatnet" to "tag" +# 18.05.2007 fix '-one' for SILC networks +# 27.02.2010 changed screen_away to tmux_away and changed functionality to support tmux +# +# +# usage: +# +# put this script into your autorun directory and/or load it with +# /SCRIPT LOAD <name> +# +# there are 5 settings available: +# +# /set tmux_away_active ON/OFF/TOGGLE +# /set tmux_away_repeat <integer> +# /set tmux_away_message <string> +# /set tmux_away_window <string> +# /set tmux_away_nick <string> +# +# active means, that you will be only set away/unaway, if this +# flag is set, default is ON +# repeat is the number of seconds, after the script will check the +# screen status again, default is 5 seconds +# message is the away message sent to the server, default: not here ... +# window is a window number or name, if set, the script will switch +# to this window, if it sets you away, default is '1' +# nick is the new nick, if the script goes away +# will only be used it not empty +# +# normal you should be able to rename the script to something other +# than 'tmux_away' (as example, if you dont like the name) by simple +# changing the 'name' parameter in the %IRSSI hash at the top of this script + + +# variables +my $timer_name = undef; +my $away_status = 0; +my %old_nicks = (); +my %away = (); + +# Register formats +Irssi::theme_register( +[ + 'tmux_away_crap', + '{line_start}{hilight ' . $IRSSI{'name'} . ':} $0' +]); + +# if we are running +my $tmux_away_used = 0; + +# try to find out, if we are running in a screen +# (see, if $ENV{STY} is set +if (!defined($ENV{TMUX})) { + # just return, we will never be called again + Irssi::printformat(MSGLEVEL_CLIENTCRAP, 'tmux_away_crap', + "could not open status file for parent process (pid: " . getppid() . "): $!"); + return; +} + +my ($socket_name, $socket_path); + +# search for socket +# normal we could search the socket file, ... if we know the path +# but so we have to call one time the screen executable +# disable locale +# the quotes around C force perl 5.005_03 to use the shell +# thanks to Jilles Tjoelker <jilles@stack.nl> for pointing this out +my $socket = `LC_ALL="C" tmux ls 2>&1`; + +my $running_in_tmux = $? == 0; +# locale doesnt seems to be an problem (yet) +if ($socket !~ /^server not found: No such file or directory/s) { + # ok, should have only one socket + @_ = split /,/, $ENV{'TMUX'}; + $socket = ${_[0]}; + $tmux_away_used = 1; +} + +# last check +if ($tmux_away_used == 0) { + # we will never be called again + return; +} + +# register config variables +Irssi::settings_add_bool('misc', $IRSSI{'name'} . '_active', 1); +Irssi::settings_add_int('misc', $IRSSI{'name'} . '_repeat', 5); +Irssi::settings_add_str('misc', $IRSSI{'name'} . '_message', "not here ..."); +Irssi::settings_add_str('misc', $IRSSI{'name'} . '_window', "1"); +Irssi::settings_add_str('misc', $IRSSI{'name'} . '_nick', ""); + +# init process +tmux_away(); + +# tmux_away() +# +# check, set or reset the away status +# +# parameter: +# none +# return: +# 0 (OK) +sub tmux_away { + my ($away, @screen, $screen); + + # only run, if activated + if (Irssi::settings_get_bool($IRSSI{'name'} . '_active') == 1) { + if ($away_status == 0) { + # display init message at first time + Irssi::printformat(MSGLEVEL_CLIENTCRAP, 'tmux_away_crap', + "activating $IRSSI{'name'} (interval: " . Irssi::settings_get_int($IRSSI{'name'} . '_repeat') . " seconds)"); + } + # get actual screen status + my @screen = stat($socket); + # 00100 is the mode for "user has execute permissions", see stat.h + if (($screen[2] & 00100) == 0) { + # no execute permissions, Detached + $away = 1; + } else { + # execute permissions, Attached + $away = 2; + } + + # check if status has changed + if ($away == 1 and $away_status != 1) { + # set away + if (length(Irssi::settings_get_str($IRSSI{'name'} . '_window')) > 0) { + # if length of window is greater then 0, make this window active + Irssi::command('window goto ' . Irssi::settings_get_str($IRSSI{'name'} . '_window')); + } + Irssi::printformat(MSGLEVEL_CLIENTCRAP, 'tmux_away_crap', + "Set away"); + my $message = Irssi::settings_get_str($IRSSI{'name'} . '_message'); + if (length($message) == 0) { + # we have to set a message or we wouldnt go away + $message = "not here ..."; + } + my ($server); + foreach $server (Irssi::servers()) { + if (!$server->{usermode_away}) { + # user isnt yet away + $away{$server->{'tag'}} = 0; + $server->command("AWAY " . (($server->{chat_type} ne 'SILC') ? "-one " : "") . "$message") if (!$server->{usermode_away}); + if (length(Irssi::settings_get_str($IRSSI{'name'} . '_nick')) > 0) { + # only change, if actual nick isnt already the away nick + if (Irssi::settings_get_str($IRSSI{'name'} . '_nick') ne $server->{nick}) { + # keep old nick + $old_nicks{$server->{'tag'}} = $server->{nick}; + # set new nick + $server->command("NICK " . Irssi::settings_get_str($IRSSI{'name'} . '_nick')); + } + } + } else { + # user is already away, remember this + $away{$server->{'tag'}} = 1; + } + } + $away_status = $away; + } elsif ($away == 2 and $away_status != 2) { + # unset away + Irssi::printformat(MSGLEVEL_CLIENTCRAP, 'tmux_away_crap', + "Reset away"); + my ($server); + foreach $server (Irssi::servers()) { + if ($away{$server->{'tag'}} == 1) { + # user was already away, dont reset away + $away{$server->{'tag'}} = 0; + next; + } + $server->command("AWAY" . (($server->{chat_type} ne 'SILC') ? " -one" : "")) if ($server->{usermode_away}); + if (defined($old_nicks{$server->{'tag'}}) and length($old_nicks{$server->{'tag'}}) > 0) { + # set old nick + $server->command("NICK " . $old_nicks{$server->{'tag'}}); + $old_nicks{$server->{'tag'}} = ""; + } + } + $away_status = $away; + } + } + # but everytimes install a new timer + register_tmux_away_timer(); + return 0; +} + +# register_tmux_away_timer() +# +# remove old timer and install a new one +# +# parameter: +# none +# return: +# none +sub register_tmux_away_timer { + if (defined($timer_name)) { + # remove old timer, if defined + Irssi::timeout_remove($timer_name); + } + # add new timer with new timeout (maybe the timeout has been changed) + $timer_name = Irssi::timeout_add(Irssi::settings_get_int($IRSSI{'name'} . '_repeat') * 1000, 'tmux_away', ''); +} + +
--- a/.shell.d/50.vcs_functions.sh +++ b/.shell.d/50.vcs_functions.sh @@ -127,9 +127,14 @@ function vcs_current_branch() { fi hg branch 2> /dev/null > /dev/null if [ $? = 0 ] ; then + local bm=$(hg book | egrep ' \* ' | awk '{print $2}') local br=`hg branch | head -c 10` local rid=`hg parents --template '{node}\n' | head -n 1 | head -c 7` - echo "$br $rid" + if [ -z "$bm" ] ; then + echo "$br $rid" + else + echo "$bm $rid" + fi return 0 fi return 1
--- a/.zfun/_hg +++ b/.zfun/_hg @@ -886,6 +886,12 @@ typeset -A _hg_cmd_globals '*:patch:_hg_qapplied' } +_hg_cmd_qfinish() { + _arguments -s -w : $_hg_global_opts \ + '(--all -a)'{-a,--all}'[finish all patches]' \ + '*:patch:_hg_qapplied' +} + _hg_cmd_qfold() { _arguments -s -w : $_hg_global_opts $_h_commit_opts \ '(--keep,-k)'{-k,--keep}'[keep folded patch files]' \