Commits

David Wolever committed 0ced275

Changes

Comments (0)

Files changed (15)

 --type-set=txt=.txt
 --type-set=as=.as
 --type-set=peg=.pegjs
+--type-set=po=.po
 
 --follow
 --ignore-dir=env
 set noantialias
 highlight ColorColumn ctermbg=grey ctermfg=white guibg=#2b2d2d
 set colorcolumn=80
+imap <M-BS> <C-W>
+map <D-s> :w<cr>
+imap <D-s> <c-o>:w<cr>
 #hgext.hgk =
 progress =
 #pbranch = ~/.mercurial/extensions/hg-pbranch/hgext/pbranch.py
-hgsubversion =
+#hgsubversion =
 
 [ui]
 username = David Wolever <david@wolever.net>

inkscape/extension-errors.log

 Dependency:
   type: executable
   location: path
-  string: latex
-
-Extension "LaTeX formula" failed to load because a dependency was not met.
-Dependency:
-  type: executable
-  location: path
-  string: dvips
-
-Extension "LaTeX formula" failed to load because a dependency was not met.
-Dependency:
-  type: executable
-  location: path
   string: pstoedit
 
 Extension "XFIG Input" failed to load because a dependency was not met.

inkscape/preferences.xml

      id="window">
     <group
        id="task"
-       taskset="0" />
+       taskset="2" />
     <group
        id="menu"
        state="1" />
          id="rect"
          style="fill:blue;"
          usecurrent="1"
-         width="372.77554321289062"
-         height="13.463096618652344"
+         width="137"
+         height="102"
          rx="0"
          ry="0" />
       <eventcontext
       <eventcontext
          id="arc"
          style="fill:red;"
-         end="343.37657454328109"
-         start="0"
+         end="270.00000112387448"
+         start="180.00000265910896"
          usecurrent="1"
-         open="1" />
+         open="0" />
       <eventcontext
          id="star"
          magnitude="5"
        gradientdrag="1"
        font_sample="AaBbCcIiPpQq12369$€¢?.;/()"
        show_sample_in_list="1"
-       style="fill:black;fill-opacity:1;stroke:none;font-family:Sans;font-style:normal;font-weight:normal;font-size:20px;line-height:125%;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:Sans;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr"
+       style="fill:black;fill-opacity:1;stroke:none;font-family:Museo Slab;font-style:normal;font-weight:normal;font-size:10px;line-height:125%;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:Museo Slab;font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr"
        selcue="1" />
     <eventcontext
        id="nodes"
        live_outline="1"
        live_objects="1"
        show_helperpath="0"
-       x="122.64814733014168"
-       y="40.43096595830562"
+       x="0"
+       y="0"
        edit_clipping_paths="0"
        edit_masks="0" />
     <eventcontext
   </group>
   <group
      id="colorselector"
-     page="3" />
+     page="1" />
   <group
      id="embedded">
     <group
        id="filtereffects" />
     <group
        id="textandfont"
-       x="711"
-       y="428"
+       x="627"
+       y="266"
        w="626"
        h="273" />
     <group
        panel_ratio="100"
        panel_mode="1"
        panel_wrap="0"
-       x="620"
+       x="33"
        y="0"
        w="388"
        h="509" />
        panel_ratio="100"
        panel_mode="1"
        panel_wrap="0"
-       x="1280"
-       y="22"
+       x="484"
+       y="319"
        w="305"
-       h="140" />
+       h="110" />
     <group
        id="gradienteditor"
-       x="1360"
-       y="411"
+       x="2605"
+       y="357"
        w="233"
        h="414" />
     <group
        default=""
        append_extension="1"
        path=""
-       x="1599"
-       y="324"
+       x="219"
+       y="109"
        w="356"
        h="391">
       <group
          id="exportarea"
-         value="page" />
+         value="drawing" />
       <group
          id="defaultxdpi"
          value="90" />
        default="org.inkscape.output.svg.inkscape"
        append_extension="1"
        enable_preview="1"
-       path="/Users/wolever/Dropbox/EnSi Technical/Screen brightness picker"
+       path="/Users/wolever/code/pyconca/pyconca/assets/video-splash-screen"
        use_current_dir="1" />
     <group
        id="save_copy"
     <group
        id="open"
        enable_preview="1"
-       path="/tmp/" />
+       path="/Users/wolever/code/pyconca/pyconca/assets/logo-files/" />
     <group
        id="import"
        enable_preview="1"
        id="extension-error"
        show-on-startup="0" />
     <group
-       id="memory" />
+       id="memory"
+       panel_size="1"
+       panel_ratio="100"
+       panel_mode="1"
+       panel_wrap="0"
+       state="2"
+       x="0"
+       y="0"
+       w="389"
+       h="147" />
     <group
        id="messages" />
     <group
        panel_wrap="0"
        x="0"
        y="0"
-       w="235"
+       w="329"
        h="197"
        state="2" />
     <group
        y="0"
        w="266"
        h="239" />
+    <group
+       id="documentmetadata"
+       panel_size="1"
+       panel_ratio="100"
+       panel_mode="1"
+       panel_wrap="0"
+       state="2"
+       x="0"
+       y="0"
+       w="341"
+       h="509" />
   </group>
   <group
      id="printing">
        value="0" />
     <group
        id="stickyzoom"
-       value="0" />
+       value="1" />
     <group
        id="selcue"
        value="2" />
   </group>
   <group
      id="extensions"
-     org.inkscape.input.gdkpixbuf.png.link="embed" />
+     org.inkscape.input.gdkpixbuf.png.link="embed"
+     org.inkscape.input.gdkpixbuf.jpg.link="link" />
   <group
      id="desktop"
-     style="fill:#ffffff;stroke:#000000;stroke-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:1, 1;-inkscape-font-specification:Sans;font-family:Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:20px;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%;stroke-dashoffset:0;opacity:0.99000000000000021;fill-opacity:0.89380533">
+     style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;-inkscape-font-specification:Museo Slab;font-family:Luxi Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:18px;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%;stroke-dashoffset:0;opacity:1;fill-opacity:1;stroke-linejoin:miter">
     <group
-       width="483"
-       height="454"
-       x="1672"
-       y="397"
+       width="1280"
+       height="752"
+       x="0"
+       y="0"
        fullscreen="0"
        id="geometry"
-       maximized="1" />
+       maximized="0" />
     <group
        id="XYfront" />
     <group
 alias go="ssh wolever@wolever.net"
 alias rmorig="rmext orig"
 alias rmrej="rmext rej"
+alias fakesmtpd="python -m smtpd -n -c DebuggingServer localhost:2525"
 
 alias glog="hg glog | less"
 alias viq="vim \$(hg root)/.hg/patches/series"
-for HGCMD in tip qimport qser qpo qpop qpu qpush qfin qref qnew qrm qmv di ci qdi st rebase pull nudge sum co
+for HGCMD in tip qimport qser qpo qpop qpu qpush qfin qref qnew qrm qmv di ci qdi st rebase pull nudge sum co bm
 do
     alias $HGCMD="hg $HGCMD"
 done

profile.laptop.local

 export FLEX_HOME="/Applications/eclipse/Adobe Flex Builder 3 Plug-in/sdks/3.5/"
 export CLOSURE_HOME="/Users/wolever/code/software/closure-library/closure/"
-export PATH="/Users/wolever/.vcslog/bin:/Users/wolever/bin:/usr/local/vim73/bin/:/usr/local/bin:/usr/local/sbin:/Developer/usr/bin/:$PATH:$FLEX_HOME/bin:/usr/local/python32/bin/:/usr/local/google_appengine/:/usr/local/mysql-5.5.19-osx10.6-x86_64/bin/:$CLOSURE_HOME/bin/:$CLOSURE_HOME/bin/build/"
-export PATH="/Users/wolever/code/software/hg-crew:$PATH"
+export PATH="/Users/wolever/.vcslog/bin:/Users/wolever/bin:/usr/local/vim73/bin:/usr/local/bin:/usr/local/sbin:/Developer/usr/bin:$PATH:$FLEX_HOME/bin:/usr/local/python32/bin:/usr/local/google_appengine:/usr/local/mysql-5.5.19-osx10.6-x86_64/bin:$CLOSURE_HOME/bin:$CLOSURE_HOME/bin/build"
+#export PATH="/Users/wolever/code/software/hg-crew:$PATH"
 export MANPATH=/opt/local/share/man:$MANPATH
 export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.flac=01;35:*.mp3=01;35:*.mpc=01;35:*.ogg=01;35:*.wav=01;35:'
-export CDPATH="$CDPATH:~/EnSi/repos/:~/Verso/repos/"
-export DYLD_LIBRARY_PATH="/usr/local/mysql-5.5.19-osx10.6-x86_64/lib/"
+export CDPATH="$CDPATH:~/EnSi/repos:~/Verso/repos"
 
 # Load macports bash completion
 . ~/.config/bash_completion
     rlcompleter_ng.setup()
 
     import readline
-    histfile = os.path.join(os.environ["HOME"], ".pyhist")
+    histfile = os.path.expanduser("~/.pyhist")
     if os.path.exists(histfile):
         readline.read_history_file(histfile)
     readline.parse_and_bind("tab: complete")
     import atexit
     atexit.register(readline.write_history_file, histfile)
 
-try:
-    do_rc()
-except (ImportError,AttributeError):
-    pass
+do_rc()
 
 del do_rc

vim/.netrwhist

-let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =1
-let g:netrw_dirhist_1='/Users/wolever/EnSi/repos/backoffice/lumbo/msg_hub/tests'

vim/ftplugin/mako.vim

+so ~/.vim/ftplugin/html.vim

vim/spell/en.utf-8.add

 OpenSSL
 #resentor
 builtin
+uuid
+IM
+#ffordance
+affordance
+ie
+UIs
+import
+import
+import
+popup
+wiki
+HTML5
+inline
Add a comment to this file

vim/spell/en.utf-8.add.spl

Binary file modified.

vim/syntax/haproxy.vim

+" Vim syntax file
+" Language:    HAproxy
+" Maintainer:  Bruno Michel <brmichel@free.fr>
+" Last Change: Mar 30, 2007
+" Version:     0.3
+" URL:         http://haproxy.1wt.eu/
+" URL:         http://vim.sourceforge.net/scripts/script.php?script_id=1845
+
+" It is suggested to add the following line to $HOME/.vimrc :
+"    au BufRead,BufNewFile haproxy* set ft=haproxy
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+	syntax clear
+elseif exists("b:current_syntax")
+	finish
+endif
+
+if version >= 600
+	setlocal iskeyword=_,-,a-z,A-Z,48-57
+else
+	set iskeyword=_,-,a-z,A-Z,48-57
+endif
+
+
+" Escaped chars
+syn match   hapEscape    +\\\(\\\| \|n\|r\|t\|#\|x\x\x\)+
+
+" Comments
+syn match   hapComment   /#.*$/ contains=hapTodo
+syn keyword hapTodo      contained TODO FIXME XXX
+syn case ignore
+
+" Sections
+syn match   hapSection   /^\s*\(global\|defaults\)/
+syn match   hapSection   /^\s*\(listen\|frontend\|backend\|ruleset\)/         skipwhite nextgroup=hapSectLabel
+syn match   hapSectLabel /\S\+/                                               skipwhite nextgroup=hapIp1 contained
+syn match   hapIp1       /\(\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\)\?:\d\{1,5}/        nextgroup=hapIp2 contained
+syn match   hapIp2       /,\(\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\)\?:\d\{1,5}/hs=s+1 nextgroup=hapIp2 contained
+
+" Parameters
+syn keyword hapParam     chroot cliexp clitimeout contimeout
+syn keyword hapParam     daemon debug disabled
+syn keyword hapParam     enabled
+syn keyword hapParam     fullconn
+syn keyword hapParam     gid grace
+syn keyword hapParam     maxconn monitor-uri
+syn keyword hapParam     nbproc noepoll nopoll
+syn keyword hapParam     pidfile
+syn keyword hapParam     quiet
+syn keyword hapParam     redispatch retries
+syn keyword hapParam     reqallow  reqdel  reqdeny  reqpass  reqtarpit  skipwhite nextgroup=hapRegexp
+syn keyword hapParam     reqiallow reqidel reqideny reqipass reqitarpit skipwhite nextgroup=hapRegexp
+syn keyword hapParam     rspdel  rspdeny    skipwhite nextgroup=hapRegexp
+syn keyword hapParam     rspidel rspideny   skipwhite nextgroup=hapRegexp
+syn keyword hapParam     reqsetbe reqisetbe skipwhite nextgroup=hapRegexp2
+syn keyword hapParam     reqadd reqiadd rspadd rspiadd
+syn keyword hapParam     server source srvexp srvtimeout
+syn keyword hapParam     uid ulimit-n
+syn keyword hapParam     reqrep reqirep rsprep rspirep    skipwhite nextgroup=hapRegexp
+syn keyword hapParam     errorloc errorloc302 errorloc303 skipwhite nextgroup=hapStatus
+syn keyword hapParam     default_backend                  skipwhite nextgroup=hapSectLabel
+syn keyword hapParam     appsession  skipwhite nextgroup=hapAppSess
+syn keyword hapParam     bind        skipwhite nextgroup=hapIp1
+syn keyword hapParam     balance     skipwhite nextgroup=hapBalance
+syn keyword hapParam     cookie      skipwhite nextgroup=hapCookieNam
+syn keyword hapParam     capture     skipwhite nextgroup=hapCapture
+syn keyword hapParam     dispatch    skipwhite nextgroup=hapIpPort
+syn keyword hapParam     source      skipwhite nextgroup=hapIpPort
+syn keyword hapParam     mode        skipwhite nextgroup=hapMode
+syn keyword hapParam     monitor-net skipwhite nextgroup=hapIPv4Mask
+syn keyword hapParam     option      skipwhite nextgroup=hapOption
+syn keyword hapParam     stats       skipwhite nextgroup=hapStats
+syn keyword hapParam     server      skipwhite nextgroup=hapServerN
+syn keyword hapParam     source      skipwhite nextgroup=hapServerEOL
+syn keyword hapParam     log         skipwhite nextgroup=hapGLog,hapLogIp
+
+" Options and additional parameters
+syn keyword hapAppSess   contained len timeout
+syn keyword hapBalance   contained roundrobin source
+syn keyword hapLen       contained len
+syn keyword hapGLog      contained global
+syn keyword hapMode      contained http tcp health
+syn keyword hapOption    contained abortonclose allbackups checkcache clitcpka dontlognull forceclose forwardfor
+syn keyword hapOption    contained httpchk httpclose httplog keepalive logasap persist srvtcpka ssl-hello-chk
+syn keyword hapOption    contained tcplog tcpka tcpsplice
+syn keyword hapOption    contained except skipwhite nextgroup=hapIPv4Mask
+syn keyword hapStats     contained uri realm auth scope enable
+syn keyword hapLogFac    contained kern user mail daemon auth syslog lpr news nextgroup=hapLogLvl skipwhite
+syn keyword hapLogFac    contained uucp cron auth2 ftp ntp audit alert cron2  nextgroup=hapLogLvl skipwhite
+syn keyword hapLogFac    contained local0 local1 local2 local3 local4 local5 local6 local7 nextgroup=hapLogLvl skipwhite
+syn keyword hapLogLvl    contained emerg alert crit err warning notice info debug
+syn keyword hapCookieKey contained rewrite insert nocache postonly indirect prefix nextgroup=hapCookieKey skipwhite
+syn keyword hapCapture   contained cookie nextgroup=hapNameLen skipwhite
+syn keyword hapCapture   contained request response nextgroup=hapHeader skipwhite
+syn keyword hapHeader    contained header nextgroup=hapNameLen skipwhite
+syn keyword hapSrvKey    contained backup cookie check inter rise fall port source minconn maxconn weight usesrc
+syn match   hapStatus    contained /\d\{3}/
+syn match   hapIPv4Mask  contained /\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\(\/\d\{1,2}\)\?/
+syn match   hapLogIp     contained /\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/   nextgroup=hapLogFac skipwhite
+syn match   hapIpPort    contained /\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}:\d\{1,5}/
+syn match   hapServerAd  contained /\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\(:[+-]\?\d\{1,5}\)\?/ nextgroup=hapSrvEOL skipwhite
+syn match   hapNameLen   contained /\S\+/ nextgroup=hapLen       skipwhite
+syn match   hapCookieNam contained /\S\+/ nextgroup=hapCookieKey skipwhite
+syn match   hapServerN   contained /\S\+/ nextgroup=hapServerAd  skipwhite
+syn region  hapSrvEOL    contained start=/\S/ end=/$/ contains=hapSrvKey
+syn region  hapRegexp    contained start=/\S/ end=/\(\s\|$\)/ skip=/\\ / nextgroup=hapRegRepl skipwhite
+syn region  hapRegRepl   contained start=/\S/ end=/$/ contains=hapComment,hapEscape,hapBackRef
+syn region  hapRegexp2   contained start=/\S/ end=/\(\s\|$\)/ skip=/\\ / nextgroup=hapSectLabel skipwhite
+syn match   hapBackref   contained /\\\d/
+
+
+" Transparent is a Vim keyword, so we need a regexp to match it
+syn match   hapParam     +transparent+
+syn match   hapOption    +transparent+ contained
+
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version < 508
+	command -nargs=+ HiLink hi link <args>
+else
+	command -nargs=+ HiLink hi def link <args>
+endif
+
+HiLink      hapEscape    SpecialChar
+HiLink      hapBackRef   Special
+HiLink      hapComment   Comment
+HiLink      hapTodo      Todo
+HiLink      hapSection   Constant
+HiLink      hapSectLabel Identifier
+HiLink      hapParam     Keyword
+
+HiLink      hapRegexp    String
+HiLink      hapRegexp2   hapRegexp
+HiLink      hapIp1       Number
+HiLink      hapIp2       hapIp1
+HiLink      hapLogIp     hapIp1
+HiLink      hapIpPort    hapIp1
+HiLink      hapIPv4Mask  hapIp1
+HiLink      hapServerAd  hapIp1
+HiLink      hapStatus    Number
+
+HiLink      hapOption    Operator
+HiLink      hapAppSess   hapOption
+HiLink      hapBalance   hapOption
+HiLink      hapCapture   hapOption
+HiLink      hapCookieKey hapOption
+HiLink      hapHeader    hapOption
+HiLink      hapGLog      hapOption
+HiLink      hapLogFac    hapOption
+HiLink      hapLogLvl    hapOption
+HiLink      hapMode      hapOption
+HiLink      hapStats     hapOption
+HiLink      hapLen       hapOption
+HiLink      hapSrvKey    hapOption
+
+
+delcommand HiLink
+
+let b:current_syntax = "haproxy"
+" vim: ts=8

vim/syntax/mako.vim

 syn region makoText matchgroup=makoDelim start="<%text[^>]*>" end="</%text>"
 
 " Attribute Sublexing
-syn match makoAttributeKey containedin=makoTag contained "[a-zA-Z_][a-zA-Z0-9_]*="
-syn region makoAttributeValue containedin=makoTag contained start=/"/ skip=/\\"/ end=/"/
-syn region makoAttributeValue containedin=MakoTag contained start=/'/ skip=/\\'/ end=/'/
+syn match makoAttributeKey containedin=makoTag,makoCustomTag contained "[a-zA-Z_][a-zA-Z0-9_]*="
+syn region makoAttributeValue containedin=makoTag,makoCustomTag contained start=/"/ skip=/\\"/ end=/"/
+syn region makoAttributeValue containedin=makoTag,makoCustomTag contained start=/'/ skip=/\\'/ end=/'/
 
 " Tags
-syn region makoTag matchgroup=makoDelim start="<%\(def\|call\|page\|include\|namespace\|inherit\)\>" end="/\?>"
+syn region makoCustomTag matchgroup=makoCustomDelim start="<%[^ >]\+" end=">"
+syn match makoCustomDelim "</%[^>]\+>"
+
+syn region makoTag matchgroup=makoDelim start="<%\(def\|call\|page\|include\|namespace\|inherit\|block\)\>" end="/\?>"
 syn match makoDelim "</%\(def\|call\|namespace\)>"
 
 " Newline Escapes
 
   HiLink makoDocComment makoComment
   HiLink makoDefEnd makoDelim
+  HiLink makoDefEnd makoCustomDelim
 
   HiLink makoAttributeKey Type
   HiLink makoAttributeValue String
   HiLink makoText Normal
   HiLink makoDelim Preproc
+  HiLink makoCustomDelim Preproc
   HiLink makoEnd Keyword
   HiLink makoComment Comment
   HiLink makoEscape Special
 " Miscellaneous stuff...
 set backspace=indent,eol,start " Better backspacing
 set ruler           " Show a ruler along the bottom of the screen
-set lz              " Don't re-draw while running macros
+set lazyredraw      " Don't re-draw while running macros
 set hid             " Can hide buffers without closing them
 set shortmess=atI   " shortens messages to avoid 'press a key' prompt 
 set scrolloff=3     " Always keep three lines above or below the cursor
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.