Permalink
Browse files

vim, mostly

  • Loading branch information...
1 parent b52e930 commit fedc8eec30ee3af73310b4f1cbf6e54bb3bccf23 @novas0x2a committed Aug 15, 2009
View
@@ -1,3 +1,6 @@
[submodule ".vim/vendor/gist"]
path = .vim/vendor/gist
url = git://github.com/mattn/gist-vim.git
+[submodule ".vim/vendor/git-vim"]
+ path = .vim/vendor/git-vim
+ url = git://github.com/bartman/git-vim.git
View
@@ -17,6 +17,10 @@ HostKeyAlias vinge.mine.nu
User root
CheckHostIP no
+Host welcome.local welcome
+HostKeyAlias welcome.local
+User root
+
Host www.fluffypenguin.org
User fluffype
@@ -37,7 +41,18 @@ ForwardAgent yes
Host wow.arc.nasa.gov
ProxyCommand none
+Host m.arc.nasa.gov
+ProxyCommand none
+
+Host copernicus.arc.nasa.gov
+ProxyCommand none
+
+Host roverctl*.arc.nasa.gov
+#ProxyCommand none
+ProxyCommand ssh hal9000.arc.nasa.gov nc %h 22
+
Host k10brain*.arc.nasa.gov
+#ProxyCommand none
ProxyCommand ssh hal9000.arc.nasa.gov nc %h 22
Host *.arc.nasa.gov
View
View
@@ -33,6 +33,7 @@
:CVSWatchOn vcscommand.txt /*:CVSWatchOn*
:CVSWatchRemove vcscommand.txt /*:CVSWatchRemove*
:CVSWatchers vcscommand.txt /*:CVSWatchers*
+:GitAdd git.txt /*:GitAdd*
:MatchDebug matchit.txt /*:MatchDebug*
:TlistAddFiles taglist.txt /*:TlistAddFiles*
:TlistAddFilesRecursive taglist.txt /*:TlistAddFilesRecursive*
@@ -68,6 +69,7 @@
:VCSUpdate vcscommand.txt /*:VCSUpdate*
:VCSVimDiff vcscommand.txt /*:VCSVimDiff*
Align-copyright Align.txt /*Align-copyright*
+Git git.txt /*Git*
MatchError matchit.txt /*MatchError*
OmniCpp_DefaultNamespaces omnicppcomplete.txt /*OmniCpp_DefaultNamespaces*
OmniCpp_DisplayMode omnicppcomplete.txt /*OmniCpp_DisplayMode*
@@ -294,6 +296,23 @@ g:bufExplorerShowRelativePath bufexplorer.txt /*g:bufExplorerShowRelativePath*
g:bufExplorerShowUnlisted bufexplorer.txt /*g:bufExplorerShowUnlisted*
g:bufExplorerSortBy bufexplorer.txt /*g:bufExplorerSortBy*
g:bufExplorerSplitOutPathName bufexplorer.txt /*g:bufExplorerSplitOutPathName*
+git git.txt /*git*
+git-add git.txt /*git-add*
+git-blame git.txt /*git-blame*
+git-checkout git.txt /*git-checkout*
+git-command git.txt /*git-command*
+git-commands git.txt /*git-commands*
+git-commit git.txt /*git-commit*
+git-diff git.txt /*git-diff*
+git-keymaps git.txt /*git-keymaps*
+git-log git.txt /*git-log*
+git-pull git.txt /*git-pull*
+git-pull-rebase git.txt /*git-pull-rebase*
+git-push git.txt /*git-push*
+git-status git.txt /*git-status*
+git-vimdiff-merge git.txt /*git-vimdiff-merge*
+git-vimdiff-merge-done git.txt /*git-vimdiff-merge-done*
+git.txt git.txt /*git.txt*
global-example yankring.txt /*global-example*
matchit matchit.txt /*matchit*
matchit-% matchit.txt /*matchit-%*
View
@@ -31,6 +31,12 @@ def swap(text):
>>> swap(' a(b,c,d);')
' a(b,c,d);'
+
+ >>> swap('blah blah a(b,c);')
+ 'blah blah a(b,c);'
+
+ >>> swap('a(b,c); blah blah')
+ 'a(b,c); blah blah'
'''
result = []
@@ -39,7 +45,7 @@ def swap(text):
return '\n'.join(result)
def swapline(line):
- m = re.search('(\s*)([A-Za-z_]\w*)\(\s*(.*)\s*\);', line)
+ m = re.search('^(\s*)([A-Za-z_]\w*)\(\s*(.*)\s*\);\s*$', line)
if not m:
return line
View
View
Submodule gist updated 2 files
+15 −6 gist.vim
+9 −2 gist.vim.vimup
Submodule git-vim added at c5569b
View
@@ -8,7 +8,6 @@ set pageinfo=fgm
noremap <F2> :set usermode!<cr><Esc>
noremap <F3> :source ~/.vimperatorrc<cr>
-
"autocmd LocationChange .* js modes.passAllKeys = /(www|mail)\.google\.com/.test(buffer.URL)
autocmd LocationChange .* js modes.passAllKeys = /google\.com\/reader/.test(buffer.URL)
autocmd PageLoad .* :js modes.passAllKeys = /gmail\.com/.test(buffer.URL)
View
11 .vimrc
@@ -60,6 +60,7 @@ set statusline+=%h%m%r%w " flags
set statusline+=\[%{strlen(&ft)?&ft:'none'}, " filetype
set statusline+=%{&encoding}, " encoding
set statusline+=%{&fileformat}] " file format
+set statusline+=\ \[%{GetGitBranch()}] " git branch
set statusline+=%= " right align
set statusline+=%-14.(%l,%c%V%)\ %<%P " offset
@@ -406,7 +407,7 @@ function GetOutsideScript(name, ...)
return l:script
endfunction
-command! SwapArguments call SwapArguments()
+"command! -register -range SwapArguments call SwapArguments()
function! SwapArguments()
try
call HasOrThrow('python')
@@ -485,6 +486,10 @@ command! PrettyHTML call DoPrettyHTML()
set matchpairs+=<:>
nnoremap <m-w> :exe 'vertical belowright wincmd '.nr2char(getchar())<CR>
-set cscopetag
-set cscopeverbose
set printexpr=system('gtklp'\ .\ '\ '\ .\ v:fname_in)\ .\ delete(v:fname_in)\ +\ v:shell_error
+
+if has("cscope")
+ set cscopetag
+ set nocscopeverbose
+ set csto=0
+endif
View
@@ -1,21 +1,26 @@
-Config { font = "xft:Dejavu Sans-6"
+Config {
+ font = "-*-utopia-regular-r-normal-*-*-110-*-*-*-*-iso10646-*"
, bgColor = "#777777"
, fgColor = "black"
, position = TopW L 90
, lowerOnStart = False
, commands = [ Run Network "wlan0" ["-t", "N(<rx>, <tx>)"] 5
+ , Run Network "eth0" ["-t", "N(<rx>, <tx>)"] 5
, Run Cpu ["-t", "C(<total>, <nice>, <system>)"] 5
, Run Memory ["-t", "M(<usedratio>%,"] 10
, Run Swap ["-t","<used>)"] 10
, Run Date "%Y-%m-%d %H:%M" "date" 10
- , Run Battery ["-t", "B(<left>)"] 50
, Run CoreTemp ["-t", "T(<core0>˚)"] 10
, Run StdinReader
]
, sepChar = "%"
, alignSep = "}{"
- , template = "%StdinReader% }{ <fc=#000000,#55cc55>%cpu%</fc> <fc=#000000,#9999dd>%memory% %swap%</fc> <fc=#000000,#55aaaa>%wlan0%</fc> <fc=#000000,#ddaaaa>%battery%</fc> <fc=#000000,#bbbb66>%coretemp%</fc> <fc=#000000,#000000> </fc>%date%<fc=#000000,#000000> </fc>"
+ , template = "%StdinReader% }{ <fc=#000000,#55cc55>%cpu%</fc> <fc=#000000,#9999dd>%memory% %swap%</fc> <fc=#000000,#55aaaa>%wlan0%</fc> <fc=#000000,#bbbb66>%coretemp%</fc> <fc=#000000,#000000> </fc>%date%<fc=#000000,#000000> </fc>"
}
-- vim: set ft=haskell :
-- , position = Static {xpos = 0, ypos = 1178, width = 1740, height = 22}
+ -- , Run Battery ["-t", "B(<left>)"] 50
+ --, template = "%StdinReader% }{ <fc=#000000,#55cc55>%cpu%</fc> <fc=#000000,#9999dd>%memory% %swap%</fc> <fc=#000000,#55aaaa>%wlan0%</fc> <fc=#000000,#ddaaaa>%battery%</fc> <fc=#000000,#bbbb66>%coretemp%</fc> <fc=#000000,#000000> </fc>%date%<fc=#000000,#000000> </fc>"
+-- font = "xft:Dejavu Sans-6"
+-- font = "-*-fixed-medium-r-normal-*-14-110-*-*-*-*-iso10646-*"
View
@@ -120,7 +120,8 @@ myKeys floatNextWindows conf = mkKeymap conf $
, ("M-s n", runOrRaise "nautilus" $ pClass =? "Nautilus")
, ("M-s c", runOrRaise "prism-google-calendar" $ "Google Calendar" `isPrefixOfQ` pName)
, ("M-s r", runOrRaise "prism-google-reader" $ "Google Reader" `isPrefixOfQ` pName)
- , ("M-s f", runOrRaiseNext "firefox -P default" $ pClass =? "Firefox" <&&> pRole =? "browser")
+ , ("M-s f", runOrRaiseNext "firefox -P default" $ ((pClass =? "Firefox" <&&> pRole =? "browser")
+ <||> pClass =? "Epiphany"))
, ("M-s g", spawn "firefox -P default" )
, ("M-s i", spawn "firefox -P testing -no-remote" )
, ("M-s l", spawn "gnome-screensaver-command -l" )
@@ -0,0 +1,4 @@
+publish-dir() {
+ if [[ $# -ne 2 ]]; then echo "usage: $0 dir port"; return; fi
+ ( builtin cd $1 && python -m SimpleHTTPServer $2 )
+}

0 comments on commit fedc8ee

Please sign in to comment.