Skip to content
Browse files

Various stuff from the past week or so.

  • Loading branch information...
1 parent 763d9ee commit 3e113cec3705ebb48ae947ec2cf480038cccd82e @sjl committed Oct 7, 2011
Showing with 121 additions and 39 deletions.
  1. +6 −1 .gitconfig
  2. +0 −1 .hgsub
  3. +1 −2 .hgsubstate
  4. +2 −1 .zshrc
  5. +6 −6 keymando/keymandorc.rb
  6. +8 −4 vim/.vimrc
  7. +2 −0 vim/ftplugin/clojure/clojurefolding.vim
  8. +2 −2 weechat/plugins.conf
  9. +72 −0 weechat/python/autoload/zerotab.py
  10. +22 −22 weechat/weechat.conf
View
7 .gitconfig
@@ -13,6 +13,7 @@
pull = pull --ff-only
merge = merge --no-ff
+ upbranch = merge --ff-only
ci = commit
cm = commit -m
@@ -26,8 +27,12 @@
uns = reset HEAD
fo = fetch origin
+ po = push origin
+ lo = pull origin
moo = merge origin/ongoing
- poo = push origin ongoing
+
+[push]
+ default = current
[color]
branch = auto
View
1 .hgsub
@@ -28,5 +28,4 @@ vim/bundle/hammer = [git]git://github.com/robgleeson/hammer.vim.git
vim/bundle/fugitive = [git]git://github.com/tpope/vim-fugitive.git
vim/bundle/nosecompiler = [git]git://github.com/olethanh/Vim-nosecompiler.git
-keymando/Plugins/vim = [hg]http://bitbucket.org/sjl/keymando-vim/
keymando/Plugins/abbrev = [git]git://github.com/keymando/abbrev.git
View
3 .hgsubstate
@@ -1,5 +1,4 @@
c711681883f3419b85494e3b285b988e8e2dcbca keymando/Plugins/abbrev
-9d387f6dc90a8e8b1e7085d48ddbe0f8f82a348f keymando/Plugins/vim
c060c94622e92e091b2c67499fdda16d91b68c01 mercurial/templates
a41d5d52c39a31128e969e69acf800b198cb07f9 vim/bundle/ack
bfdf714f8ea10a6bcba7a1375a5700b11077dcd9 vim/bundle/command-t
@@ -14,7 +13,7 @@ ffc45dd5a59b7b62edb02641c69a163f19fd02c0 vim/bundle/hammer
2dd198c6c412b4ddd361b43586b01981e8383239 vim/bundle/nerdtree
b7889db57c90824ff5092da4fdde9e05689f24fa vim/bundle/nosecompiler
a0831b09f2026c3a3d52e253ffd139fe20a9360a vim/bundle/pydoc
-60008ab2e25b15148e45b9e9baa349c4b2a1b6c1 vim/bundle/slimv
+25de1e1969b6b5c92fec67adbd98da65533b545c vim/bundle/slimv
c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
80ec6539e4139a2e0281a0f1e36d5038d55ad980 vim/bundle/supertab
View
3 .zshrc
@@ -39,13 +39,14 @@ export PYTHONSTARTUP="$HOME/.pythonrc.py"
export WORKON_HOME="${HOME}/lib/virtualenvs"
export PATH="${PATH}:/Developer/usr/bin/"
export PATH="${PATH}:/usr/local/share/python/"
+export PATH="${PATH}:$HOME/.lein/bin"
export PYTHONPATH="$PYTHONPATH:/usr/local/Cellar/python/2.7.1/lib/python2.7/site-packages"
export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.7.1/site-packages"
export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.7/site-packages"
export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.6/site-packages"
export VEW_PATH="$HOME/lib/python/virtualenvwrapper/virtualenvwrapper.sh"
export PYTHONPATH="$HOME/lib/python/see:$PYTHONPATH"
-export NODE_PATH="$NODE_PATH:/usr/local/lib/node"
+export NODE_PATH="$NODE_PATH:/usr/local/lib/node:/usr/local/lib/node_modules"
# Mercurial variables --------------------------------------------------------
export PATH="$HOME/lib/hg/hg-stable:$PATH"
View
12 keymando/keymandorc.rb
@@ -30,9 +30,9 @@
# Abbreviations --------------------------------------------------------------------
-abbrev 'ldis' do
- pasteBoard = NSPasteboard.generalPasteboard
- pasteBoard.declareTypes([NSStringPboardType], owner: nil)
- pasteBoard.setString('ಠ_ಠ', forType: NSStringPboardType)
- send('<Cmd-v>')
-end
+# abbrev 'ldis' do
+# pasteBoard = NSPasteboard.generalPasteboard
+# pasteBoard.declareTypes([NSStringPboardType], owner: nil)
+# pasteBoard.setString('ಠ_ಠ', forType: NSStringPboardType)
+# send('<Cmd-v>')
+# end
View
12 vim/.vimrc
@@ -46,6 +46,7 @@ set notimeout
set nottimeout
set autowrite
set shiftround
+set autoread
set dictionary=/usr/share/dict/words
" Wildmenu completion {{{
@@ -345,13 +346,14 @@ augroup ft_clojure
au FileType clojure call TurnOnClojureFolding()
au FileType clojure compiler clojure
au FileType clojure setlocal report=100000
- " au FileType clojure nnoremap <buffer> o A<cr>
+ au FileType clojure nnoremap <buffer> o jI<cr><esc>kA
au FileType clojure nnoremap <buffer> O I<cr><esc>kA
au BufWinEnter Slimv.REPL.clj setlocal winfixwidth
au BufNewFile,BufRead Slimv.REPL.clj setlocal nowrap
- au BufWinEnter Slimv.REPL.clj normal! zR
- au BufNewFile,BufRead Slimv.REPL.clj nnoremap A GA
+ au BufNewFile,BufRead Slimv.REPL.clj setlocal foldlevel=99
+ au BufNewFile,BufRead Slimv.REPL.clj nnoremap <buffer> A GA
+ au BufNewFile,BufRead Slimv.REPL.clj unmap <buffer> \\\
" Fix the eval mapping.
au FileType clojure nmap <buffer> \ee \ed
@@ -574,7 +576,9 @@ augroup ft_python
au Filetype python noremap <buffer> <localleader>ri :RopeOrganizeImports<CR>
au FileType python setlocal omnifunc=pythoncomplete#Complete
+ au FileType python setlocal define=^\s*\\(def\\\\|class\\)
au FileType python compiler nose
+ au FileType man nnoremap <buffer> <cr> :q<cr>
augroup END
" }}}
@@ -941,7 +945,7 @@ let g:sparkupNextMapping = '<c-s>'
"}}}
" Supertab {{{
-let g:SuperTabDefaultCompletionType = "context"
+let g:SuperTabDefaultCompletionType = "<c-n>"
let g:SuperTabLongestHighlight = 1
"}}}
View
2 vim/ftplugin/clojure/clojurefolding.vim
@@ -19,6 +19,8 @@ function GetClojureFold()
return ">1"
elseif getline(v:lnum) =~ '^\s*(defpartial.*\s'
return ">1"
+ elseif getline(v:lnum) =~ '^\s*(deftest.*\s'
+ return ">1"
elseif getline(v:lnum) =~ '^\s*$'
let my_cljnum = v:lnum
let my_cljmax = line("$")
View
4 weechat/plugins.conf
@@ -7,8 +7,8 @@ fifo.fifo = "on"
perl.buffers.color_current = "black,green"
perl.buffers.color_default = "default"
perl.buffers.color_hotlist_highlight = "lightmagenta"
-perl.buffers.color_hotlist_low = "white"
-perl.buffers.color_hotlist_message = "yellow"
+perl.buffers.color_hotlist_low = "default"
+perl.buffers.color_hotlist_message = "green"
perl.buffers.color_hotlist_private = "lightgreen"
perl.buffers.color_number = "green"
perl.buffers.color_whitelist_buffers = ""
View
72 weechat/python/autoload/zerotab.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+#
+# Script Name: Zerotab.py
+# Script Author: Lucian Adamson <lucian.adamson@yahoo.com>
+# Script License: GPL
+# Alternate Contact: Freenode IRC nick i686
+#
+# 2011-09-20, Nils Görs <weechatter@arcor.de>:
+# version 1.4: fixed: latest nick from join/part messages were used.
+# 2010-12-04, Sebastien Helleu <flashcode@flashtux.org>:
+# version 1.3: use tag "nick_xxx" (WeeChat >= 0.3.4 only)
+# 2010-08-03, Sebastien Helleu <flashcode@flashtux.org>:
+# version 1.2: fix bug with nick prefixes (op/halfop/..)
+# 2010-08-03, Sebastien Helleu <flashcode@flashtux.org>:
+# version 1.1: fix bug with self nick
+
+
+SCRIPT_NAME='zerotab'
+SCRIPT_AUTHOR='Lucian Adamson <lucian.adamson@yahoo.com>'
+SCRIPT_VERSION='1.4'
+SCRIPT_LICENSE='GPL'
+SCRIPT_DESC='Will tab complete the last nick in channel without typing anything first. This is good for rapid conversations.'
+
+import_ok=True
+
+try:
+ import weechat, re
+except ImportError:
+ print 'This script must be run under WeeChat'
+ print 'You can obtain a copy of WeeChat, for free, at http://www.weechat.org'
+ import_ok=False
+
+latest_speaker={}
+weechat_version=0
+
+def my_completer(data, buffer, command):
+ global latest_speaker
+ str_input = weechat.buffer_get_string(weechat.current_buffer(), "input")
+ if command == "/input complete_next" and str_input == '':
+ nick = latest_speaker.get(buffer, "")
+ if nick != "":
+ weechat.command(buffer, "/input insert " + nick)
+ return weechat.WEECHAT_RC_OK
+
+def hook_print_cb(data, buffer, date, tags, displayed, highlight, prefix, message):
+ global latest_speaker
+ alltags = tags.split(',')
+ if 'notify_message' in alltags:
+ nick = None
+ if int(weechat_version) >= 0x00030400:
+ # in version >= 0.3.4, there is a tag "nick_xxx" for each message
+ for tag in alltags:
+ if tag.startswith('nick_'):
+ nick = tag[5:]
+ break
+ else:
+ # in older versions, no tag, so extract nick from printed message
+ # this is working, except for irc actions (/me ...)
+ nick = prefix
+ if re.match('^[@%+~*&!-]', nick):
+ nick = nick[1:]
+ if nick:
+ local_nick = weechat.buffer_get_string(buffer, "localvar_nick")
+ if nick != local_nick:
+ latest_speaker[buffer] = nick
+ return weechat.WEECHAT_RC_OK
+
+if __name__ == "__main__" and import_ok:
+ if weechat.register(SCRIPT_NAME, SCRIPT_AUTHOR, SCRIPT_VERSION, SCRIPT_LICENSE, SCRIPT_DESC, "", ""):
+ weechat_version = weechat.info_get("version_number", "") or 0
+ weechat.hook_print("", "", "", 1, "hook_print_cb", "")
+ weechat.hook_command_run('/input complete*', 'my_completer', '')
View
44 weechat/weechat.conf
@@ -59,8 +59,8 @@ prefix_network = "--"
prefix_quit = "<--"
prefix_suffix = "|"
read_marker = line
-read_marker_always_show = off
-read_marker_string = "- "
+read_marker_always_show = on
+read_marker_string = "-"
save_config_on_exit = on
save_layout_on_exit = none
scroll_amount = 3
@@ -72,7 +72,7 @@ time_format = "%a, %d %b %Y %T"
[palette]
[color]
-bar_more = lightmagenta
+bar_more = magenta
chat = default
chat_bg = default
chat_buffer = white
@@ -82,7 +82,7 @@ chat_highlight = lightmagenta
chat_highlight_bg = default
chat_host = cyan
chat_nick = lightcyan
-chat_nick_colors = "cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"
+chat_nick_colors = "226,202,206,081,082,099,068"
chat_nick_other = cyan
chat_nick_self = white
chat_prefix_action = white
@@ -93,34 +93,34 @@ chat_prefix_more = lightmagenta
chat_prefix_network = magenta
chat_prefix_quit = lightred
chat_prefix_suffix = green
-chat_read_marker = magenta
+chat_read_marker = green
chat_read_marker_bg = default
chat_server = brown
chat_text_found = yellow
chat_text_found_bg = lightmagenta
-chat_time = default
-chat_time_delimiters = brown
+chat_time = 238
+chat_time_delimiters = 236
chat_value = cyan
input_actions = lightgreen
input_text_not_found = red
nicklist_away = cyan
nicklist_group = green
nicklist_offline = blue
-separator = blue
+separator = green
status_count_highlight = magenta
status_count_msg = brown
-status_count_other = default
+status_count_other = 16
status_count_private = green
status_data_highlight = lightmagenta
status_data_msg = yellow
-status_data_other = default
+status_data_other = 16
status_data_private = lightgreen
status_filter = green
-status_more = yellow
-status_name = white
+status_more = 16
+status_name = *16
status_name_ssl = lightgreen
-status_number = yellow
-status_time = default
+status_number = *16
+status_time = *16
[completion]
default_template = "%(nicks)|%(irc_channels)"
@@ -137,7 +137,7 @@ partial_completion_other = off
[history]
display_default = 5
max_commands = 100
-max_lines = 4096
+max_lines = 20480
max_visited_buffers = 50
[proxy]
@@ -169,7 +169,7 @@ buffers.size = 0
buffers.size_max = 0
buffers.type = root
input.color_bg = default
-input.color_delim = cyan
+input.color_delim = green
input.color_fg = default
input.conditions = ""
input.filling_left_right = vertical
@@ -196,23 +196,23 @@ nicklist.separator = on
nicklist.size = 0
nicklist.size_max = 0
nicklist.type = window
-status.color_bg = blue
-status.color_delim = cyan
-status.color_fg = default
+status.color_bg = green
+status.color_delim = 0
+status.color_fg = 0
status.conditions = ""
status.filling_left_right = vertical
status.filling_top_bottom = horizontal
status.hidden = off
-status.items = "[time],[buffer_count],[buffer_plugin],buffer_number+:+buffer_name+{buffer_nicklist_count}+buffer_filter,[lag],[hotlist],completion,scroll"
+status.items = "[time],buffer_number+:+buffer_name"
status.position = bottom
status.priority = 500
status.separator = off
status.size = 1
status.size_max = 0
status.type = window
-title.color_bg = blue
+title.color_bg = green
title.color_delim = cyan
-title.color_fg = default
+title.color_fg = *16
title.conditions = ""
title.filling_left_right = vertical
title.filling_top_bottom = horizontal

0 comments on commit 3e113ce

Please sign in to comment.
Something went wrong with that request. Please try again.